109 changed files with 3168 additions and 5818 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -1,14 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble
-
-ARG NODE_MAJOR=22
-ARG ANGULAR_CLI_VERSION=21
-
-RUN curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR}.x" | bash - \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends nodejs sqlite3 \
-    && npm install -g "@angular/cli@^${ANGULAR_CLI_VERSION}" \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /data/db /data/downloads \
-    && chown -R vscode:vscode /data
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,51 +0,0 @@
-{
-  "name": "rdt-client",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "args": {
-      "NODE_MAJOR": "22"
-    }
-  },
-  "remoteUser": "vscode",
-  "runArgs": ["--init"],
-  "containerEnv": {
-    "ASPNETCORE_ENVIRONMENT": "Development",
-    "BASE_PATH": "",
-    "DOTNET_USE_POLLING_FILE_WATCHER": "1",
-    "CHOKIDAR_USEPOLLING": "true"
-  },
-  "forwardPorts": [4200, 6500],
-  "portsAttributes": {
-    "4200": {
-      "label": "Angular client",
-      "onAutoForward": "notify"
-    },
-    "6500": {
-      "label": "RdtClient backend",
-      "onAutoForward": "silent"
-    }
-  },
-  "mounts": [
-    "source=rdtclient-data-db,target=/data/db,type=volume",
-    "source=rdtclient-data-downloads,target=/data/downloads,type=volume",
-    "source=rdtclient-nuget,target=/home/vscode/.nuget,type=volume",
-    "source=rdtclient-npm-cache,target=/home/vscode/.npm,type=volume"
-  ],
-  "postCreateCommand": "/bin/bash .devcontainer/post-create.sh",
-  "postStartCommand": "/bin/bash .devcontainer/post-start.sh",
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-dotnettools.csharp",
-        "ms-dotnettools.csdevkit",
-        "Angular.ng-template",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-      ],
-      "settings": {
-        "dotnet.defaultSolution": "server/RdtClient.sln",
-        "terminal.integrated.defaultProfile.linux": "zsh"
-      }
-    }
-  }
-}
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-sudo install -d -m 0775 -o vscode -g vscode \
-  /data/db \
-  /data/downloads \
-  /home/vscode/.nuget \
-  /home/vscode/.nuget/NuGet \
-  /home/vscode/.nuget/packages \
-  /home/vscode/.npm
-
-sudo chown -R vscode:vscode /data /home/vscode/.nuget /home/vscode/.npm
-
-dotnet restore server/RdtClient.sln
-npm install --prefix client
--- a/.devcontainer/post-start.sh
+++ b/.devcontainer/post-start.sh
@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-sudo install -d -m 0775 -o vscode -g vscode \
-  /data/db \
-  /data/downloads \
-  /home/vscode/.nuget \
-  /home/vscode/.nuget/NuGet \
-  /home/vscode/.nuget/packages \
-  /home/vscode/.npm
-
-sudo chown -R vscode:vscode /data /home/vscode/.nuget /home/vscode/.npm
--- a/.gitignore
+++ b/.gitignore
@ -8,4 +8,3 @@ server/RdtClient.Web/appsettings.Development.json
 data
 Dockerfile.dev
 test.bat
-.DS_Store
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,76 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased

-## [2.0.138] - 2026-06-05
-### Fixed
- SABnzbd fixes.
-
-## [2.0.137] - 2026-06-05
-### Fixed
- Fix torbox save path mapping for single file downloads.
-
-## [2.0.136] - 2026-05-30
-### Added
- Added devcontainer development workflow.
-
-### Changed
- Upgraded torbox.net dependency.
-
-## [2.0.135] - 2026-05-27
-### Changed
- When adding a torrent through the qBittorrent endpoints, it will wait to see if the torrent gets added properly or errors out, resulting in a better experience for infringing files and Sonarr / Radarr.
- Upgraded torbox.net dependency. 
- Support SABnzbd API key auth, thanks to @ALenfant!
-
-## [2.0.134] - 2026-05-22
-### Changed
- Upgraded torbox.net dependency. 
-
-## [2.0.133] - 2026-05-17
-### Added
- Added NZB support for Premiumize, thanks to @ALenfant!
-
-## [2.0.132] - 2026-05-17
-### Changed
- Fixed for Cleanuparr
- Upgrade Torbox.NET dependency
-
-## [2.0.131] - 2026-05-14
-### Changed
- Fixes to the rate limiting.
-
-## [2.0.130] - 2026-04-28
-### Changed
- Fixes to unit tests
- Upgraded .NET and Angular dependencies
- Added better qBittorrent capabilities for Cleanuparr
- Performance fixes
-
-## [2.0.129] - 2026-04-06
-### Added
- Optimized mobile views, thanks to @sylvaindd!
-
-## [2.0.128] - 2026-04-06
-### Changed
- Fixed some qBittorrent endpoints.
-
-## [2.0.127] - 2026-03-15
-### Added
- Implement qBittorrent endpoint for counting torrents, thanks to @vinodmishra!
-
-## [2.0.126] - 2026-03-14
-### Added
- qBittorrent hash filtering on the /torrrents/info endpoint, thanks to @jfrconley!
- Category select as a dropdown when adding a new torrent, thanks to @sylvaindd!
-
-### Changed
- Rate limiting fixes, thanks to @omgbeez!
- AllDebrid Symlink fixes, thanks to @AlexandreVassard!
-
-## [2.0.125] - 2026-03-01
-### Added
- Added extra qBittorrent endpoints for Cleanuparr compatibility.
-
 ## [2.0.124] - 2026-02-23
 ### Added
 - Added /version/api for qBittorrent to support clients that still want to talk to the old API.
--- a/README.md
+++ b/README.md
@ -1,15 +1,15 @@
 # Real-Debrid Torrent & Usenet Client

-This is a web interface to manage your torrents on Real-Debrid, AllDebrid, Premiumize, TorBox or DebridLink. It supports the following features:
+This is a web interface to manage your torrents on Real-Debrid, AllDebrid, Premiumize TorBox or DebridLink. It supports the following features:

 - Add new torrents through magnets or files
- Add usenet downloads through NZB files (TorBox and Premiumize only)
+- Add usenet downloads through NZB files (TorBox only)
 - Download all files from Real-Debrid, AllDebrid, Premiumize or TorBox to your local machine automatically
 - Unpack all files when finished downloading
 - Implements a fake qBittorrent API so you can hook up other applications like Sonarr, Radarr or Couchpotato.
 - Built with Angular 21 and .NET 10

-**You will need a Premium service at Real-Debrid, AllDebrid, Premiumize, Torbox or DebridLink!**
+**You will need a Premium service at Real-Debrid, AllDebrid, Premiumize or Torbox!**

 [Click here to sign up for Real-Debrid.](https://real-debrid.com/?id=1348683)

@ -166,9 +166,7 @@ It has the following options:

 ### Connecting Sonarr/Radarr

-RdtClient emulates the qBittorrent web protocol and allows applications to use those APIs. This way you can use Sonarr and Radarr to download directly from RealDebrid.
-
-#### Torrents
+RdtClient emulates the qBittorrent web protocol and allow applications to use those APIs. This way you can use Sonarr and Radarr to download directly from RealDebrid.

 1. Login to Sonarr or Radarr and click `Settings`.
 1. Go to the `Download Client` tab and click the plus to add.
@ -185,24 +183,6 @@ When downloading files it will append the `category` setting in the Sonarr/Radar

 Notice: the progress and ETA reported in Sonarr's Activity tab will not be accurate, but it will report the torrent as completed so it can be processed after it is done downloading.

-#### Usenet/NZB
-
-RdtClient also emulates part of the SABnzbd API so Sonarr and Radarr can add NZB downloads. This requires a provider that supports Usenet/NZB downloads, currently TorBox or Premiumize.
-
-1. Login to Sonarr or Radarr and click `Settings`.
-1. Go to the `Download Client` tab and click the plus to add.
-1. Click `SABnzbd` in the list.
-1. Enter the IP or hostname of RdtClient in the `Host` field.
-1. Enter `6500` in the `Port` field.
-1. Enable `Use SSL` only if you access RdtClient through HTTPS.
-1. Leave `URL Base` empty unless RdtClient is configured with a `BasePath`, for example `/rdt`.
-1. If RdtClient authentication is enabled, leave `API Key` empty and enter your RdtClient username and password. If your client only supports an API key, enter `{username}:{password}` in `API Key`.
-1. If RdtClient authentication is disabled, enter any value in `API Key`, for example `rdtclient`, and leave username/password empty.
-1. Set the category to `sonarr` for Sonarr or `radarr` for Radarr.
-1. Hit `Test` and then `Save` if all is well.
-
-When importing completed NZB downloads, Sonarr/Radarr must be able to access the path reported by RdtClient. In Docker setups this may require a Remote Path Mapping from the RdtClient download path to the path mounted inside Sonarr/Radarr.
-
 ### Running within a folder

 By default the application runs in the root of your hosted address (i.e. https://rdt.myserver.com/), but if you want to run it as a relative folder (i.e. https://myserver.com/rdt) you will have to change the `BasePath` setting in the `appsettings.json` file. You can set the `BASE_PATH` environment variable for docker enviroments.
@ -218,17 +198,6 @@ By default the application runs in the root of your hosted address (i.e. https:/
 - Visual Studio 2025
 - (optional) Resharper

-### Dev Container
-
-The repository includes a dev container under `.devcontainer/` for the split development workflow used by this project.
-
-It installs .NET 10 and Node 22, forwards ports `4200` and `6500`, and persists `/data/db` and `/data/downloads` in named volumes so the local SQLite database, logs, and downloads survive container rebuilds.
-
-1. Open the repository in the dev container.
-1. In one terminal run `dotnet watch run --project server/RdtClient.Web`.
-1. In another terminal run `cd client && npm start`.
-1. Open `http://localhost:4200`. The Angular dev server proxies `/Api` and `/hub` to the backend running on `6500`.
-
 1. Open the client folder project in VS Code and run `npm install`.
 1. To debug run `ng serve`, to build run `ng build -c production`.
 1. Open the Visual Studio 2025 project `RdtClient.sln` and `Publish` the `RdtClient.Web` to the given `PublishFolder` target.
--- a/client/.ncurc.js
+++ b/client/.ncurc.js
@ -1,14 +1,14 @@
-const minorOnly = ["eslint", "typescript"];
+const minorOnly = ['eslint'];
 const patchOnly = [];

 module.exports = {
  target: (name) => {
    if (minorOnly.indexOf(name) > -1) {
-      return "minor";
+      return 'minor';
    }
    if (patchOnly.indexOf(name) > -1) {
-      return "patch";
+      return 'patch';
    }
-    return "latest";
-  },
+    return 'latest';
+  }
 };
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -8,47 +8,46 @@
    "watch": "ng build --watch --configuration development",
    "update": "ng update --force --allow-dirty @angular/cli @angular/core @angular/cdk",
    "lint": "ng lint",
-    "prettier": "prettier --write .",
-    "precommit": "npm run prettier && npm run lint"
+    "prettier": "prettier --write \"./**/*.{ts,html,json}\""
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^21.2.10",
-    "@angular/cdk": "^21.2.8",
-    "@angular/common": "^21.2.10",
-    "@angular/compiler": "^21.2.10",
-    "@angular/core": "^21.2.10",
-    "@angular/forms": "^21.2.10",
-    "@angular/platform-browser": "^21.2.10",
-    "@angular/platform-browser-dynamic": "^21.2.10",
-    "@angular/router": "^21.2.10",
+    "@angular/animations": "^21.1.4",
+    "@angular/cdk": "^21.1.4",
+    "@angular/common": "^21.1.4",
+    "@angular/compiler": "^21.1.4",
+    "@angular/core": "^21.1.4",
+    "@angular/forms": "^21.1.4",
+    "@angular/platform-browser": "^21.1.4",
+    "@angular/platform-browser-dynamic": "^21.1.4",
+    "@angular/router": "^21.1.4",
    "@fortawesome/fontawesome-free": "^7.2.0",
    "@microsoft/signalr": "^10.0.0",
    "bulma": "^1.0.4",
    "curray": "^1.0.12",
    "file-saver-es": "^2.0.5",
-    "filesize": "^11.0.17",
+    "filesize": "^11.0.13",
    "rxjs": "^7.8.2",
    "tslib": "^2.8.1",
-    "zone.js": "^0.16.1"
+    "zone.js": "^0.16.0"
  },
  "devDependencies": {
-    "@angular-eslint/builder": "21.3.1",
-    "@angular-eslint/eslint-plugin": "21.3.1",
-    "@angular-eslint/eslint-plugin-template": "21.3.1",
-    "@angular-eslint/schematics": "21.3.1",
-    "@angular-eslint/template-parser": "21.3.1",
-    "@angular/build": "^21.2.8",
-    "@angular/cli": "^21.2.8",
-    "@angular/compiler-cli": "^21.2.10",
-    "@angular/language-service": "^21.2.10",
+    "@angular-eslint/builder": "21.2.0",
+    "@angular-eslint/eslint-plugin": "21.2.0",
+    "@angular-eslint/eslint-plugin-template": "21.2.0",
+    "@angular-eslint/schematics": "21.2.0",
+    "@angular-eslint/template-parser": "21.2.0",
+    "@angular/build": "^21.1.4",
+    "@angular/cli": "^21.1.4",
+    "@angular/compiler-cli": "^21.1.4",
+    "@angular/language-service": "^21.1.4",
    "@types/file-saver": "^2.0.7",
    "@types/file-saver-es": "^2.0.3",
-    "@types/node": "^25.6.0",
-    "@typescript-eslint/eslint-plugin": "^8.59.1",
-    "@typescript-eslint/parser": "^8.59.1",
-    "eslint": "^9.39.4",
-    "prettier": "^3.8.3",
+    "@types/node": "^25.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
+    "eslint": "^9.39.2",
+    "prettier": "^3.8.1",
    "typescript": "5.9.3"
  }
 }
--- a/client/src/app/add-new-torrent/add-new-torrent.component.html
+++ b/client/src/app/add-new-torrent/add-new-torrent.component.html
@ -87,7 +87,7 @@
  <div class="field" style="margin-top: 10px">
    <div class="control">
      <button class="button is-success" [disabled]="saving" [ngClass]="{ 'is-loading': saving }" (click)="ok()">
-        @if (type === "torrent") {
+        @if (type === 'torrent') {
          <span>Add Torrent</span>
        } @else {
          <span>Add NZB</span>
@ -109,7 +109,9 @@
          <option [ngValue]="3">Synology DownloadStation</option>
        </select>
      </div>
-      <p class="help">Select which downloader is used to download this from the debrid provider to your host.</p>
+      <p class="help">
+        Select which downloader is used to download this from the debrid provider to your host.
+      </p>
    </div>

    <div class="field">
@ -121,8 +123,8 @@
        </select>
      </div>
      <p class="help">
-        When a download is finished on the provider, perform this action. Use this setting if you only want to add files
-        to your debrid provider but not download them to the host.
+        When a download is finished on the provider, perform this action. Use this setting if you only want
+        to add files to your debrid provider but not download them to the host.
      </p>
    </div>

@ -211,31 +213,15 @@
        <input class="input" type="number" [(ngModel)]="finishedActionDelay" />
      </div>
      <p class="help">
-        When a download is finished on the provider, perform this action. Use this setting if you only want to add files
-        to your debrid provider but not download them to the host.
+        When a download is finished on the provider, perform this action. Use this setting if you only want
+        to add files to your debrid provider but not download them to the host.
      </p>
    </div>

    <div class="field">
      <label class="label">Category</label>
-      <div class="control category-combo">
-        <input
-          class="input"
-          type="text"
-          [(ngModel)]="category"
-          (focus)="categoryDropdownOpen = true"
-          (input)="categoryDropdownOpen = true"
-          (blur)="onCategoryBlur()"
-          placeholder="Type or select a category"
-          autocomplete="off"
-        />
-        @if (categoryDropdownOpen && filteredCategories.length > 0) {
-          <div class="category-dropdown">
-            @for (cat of filteredCategories; track $index) {
-              <a class="category-option" (mousedown)="selectCategory(cat)">{{ cat }}</a>
-            }
-          </div>
-        }
+      <div class="control">
+        <input class="input" type="text" [(ngModel)]="category" />
      </div>
      <p class="help">The category becomes a sub-folder in your main download path.</p>
    </div>
@ -245,7 +231,9 @@
      <div class="control">
        <input class="input" type="number" step="1" [(ngModel)]="priority" />
      </div>
-      <p class="help">Set the priority where 1 is the highest. When empty it will be assigned the lowest priority.</p>
+      <p class="help">
+        Set the priority where 1 is the highest. When empty it will be assigned the lowest priority.
+      </p>
    </div>
  </div>
 </div>
@ -285,8 +273,8 @@
        <input class="input" type="number" max="100000" min="0" step="1" [(ngModel)]="torrentLifetime" />
      </div>
      <p class="help">
-        The maximum lifetime of a download in minutes. When this time has passed, mark it as error. If the download is
-        completed, the lifetime setting will not apply. 0 to disable.
+        The maximum lifetime of a download in minutes. When this time has passed, mark it as error. If the
+        download is completed, the lifetime setting will not apply. 0 to disable.
      </p>
    </div>
  </div>
@ -299,3 +287,4 @@
    }
  </div>
 </div>
+
--- a/client/src/app/add-new-torrent/add-new-torrent.component.scss
+++ b/client/src/app/add-new-torrent/add-new-torrent.component.scss
@ -27,29 +27,3 @@
 .separator:not(:empty)::after {
  margin-left: 0.25em;
 }
-
-.category-combo {
-  position: relative;
-}
-
-.category-dropdown {
-  position: absolute;
-  z-index: 10;
-  width: 100%;
-  background: white;
-  border: 1px solid #dbdbdb;
-  border-top: none;
-  border-radius: 0 0 4px 4px;
-  max-height: 200px;
-  overflow-y: auto;
-}
-
-.category-option {
-  display: block;
-  padding: 0.375rem 0.75rem;
-  color: #363636;
-
-  &:hover {
-    background: #f5f5f5;
-  }
-}
--- a/client/src/app/add-new-torrent/add-new-torrent.component.ts
+++ b/client/src/app/add-new-torrent/add-new-torrent.component.ts
@ -1,12 +1,11 @@
-import { Component, DestroyRef, OnInit, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { TorrentService } from 'src/app/torrent.service';
 import { DownloadType, Torrent, TorrentFileAvailability } from '../models/torrent.model';
 import { SettingsService } from '../settings.service';
 import { ActivatedRoute } from '@angular/router';
 import { FormsModule } from '@angular/forms';
 import { NgClass } from '@angular/common';
-import { TorrentService } from '../torrent.service';

@Component({
  selector: 'app-add-new-torrent',
@ -16,12 +15,6 @@ import { TorrentService } from '../torrent.service';
  standalone: true,
 })
 export class AddNewTorrentComponent implements OnInit {
-  private destroyRef = inject(DestroyRef);
-  private router = inject(Router);
-  private torrentService = inject(TorrentService);
-  private settingsService = inject(SettingsService);
-  private activatedRoute = inject(ActivatedRoute);
-
  public type: 'torrent' | 'nzb' = 'torrent';
  public fileName: string;
  public magnetLink: string;
@ -31,10 +24,7 @@ export class AddNewTorrentComponent implements OnInit {
  public provider: string;
  public downloadClient: number;

-  private _category = '';
-  public categories: string[] = [];
-  public filteredCategories: string[] = [];
-  public categoryDropdownOpen = false;
+  public category: string;
  public hostDownloadAction: number = 0;
  public downloadAction: number = 0;
  public finishedAction: number = 0;
@ -59,19 +49,17 @@ export class AddNewTorrentComponent implements OnInit {
  public excludeRegexError: string;
  public regexSelected: TorrentFileAvailability[];

-  private selectedFile: File | null = null;
+  private selectedFile: File;

-  public get category(): string {
-    return this._category;
-  }
-
-  public set category(value: string) {
-    this._category = value;
-    this.updateFilteredCategories();
-  }
+  constructor(
+    private router: Router,
+    private torrentService: TorrentService,
+    private settingsService: SettingsService,
+    private activatedRoute: ActivatedRoute,
+  ) {}

  ngOnInit(): void {
-    this.activatedRoute.queryParams.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
+    this.activatedRoute.queryParams.subscribe((params) => {
      if (params['type'] === 'nzb') {
        this.type = 'nzb';
      } else if (params['type'] === 'torrent') {
@ -87,65 +75,29 @@ export class AddNewTorrentComponent implements OnInit {
        this.type = 'nzb';
      }
    });
+    this.settingsService.get().subscribe((settings) => {
+      const providerSetting = settings.find((m) => m.key === 'Provider:Provider');
+      this.provider = providerSetting.enumValues[providerSetting.value as number];
+      this.downloadClient = settings.find((m) => m.key === 'DownloadClient:Client')?.value as number;

-    this.settingsService
-      .get()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((settings) => {
-        const providerSetting = settings.find((m) => m.key === 'Provider:Provider');
-        this.provider = providerSetting.enumValues[providerSetting.value as number];
-        this.downloadClient = settings.find((m) => m.key === 'DownloadClient:Client')?.value as number;
+      this.category = settings.find((m) => m.key === 'Gui:Default:Category')?.value as string;
+      this.hostDownloadAction = this.downloadAction = settings.find((m) => m.key === 'Gui:Default:HostDownloadAction')
+        ?.value as number;
+      this.downloadAction =
+        settings.find((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
+      this.finishedAction = settings.find((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
+      this.finishedActionDelay = settings.find((m) => m.key == 'Gui:Default:FinishedActionDelay')?.value as number;
+      this.downloadMinSize = settings.find((m) => m.key === 'Gui:Default:MinFileSize')?.value as number;
+      this.includeRegex = settings.find((m) => m.key === 'Gui:Default:IncludeRegex')?.value as string;
+      this.excludeRegex = settings.find((m) => m.key === 'Gui:Default:ExcludeRegex')?.value as string;
+      this.torrentRetryAttempts = settings.find((m) => m.key === 'Gui:Default:TorrentRetryAttempts')?.value as number;
+      this.downloadRetryAttempts = settings.find((m) => m.key === 'Gui:Default:DownloadRetryAttempts')?.value as number;
+      this.torrentDeleteOnError = settings.find((m) => m.key === 'Gui:Default:DeleteOnError')?.value as number;
+      this.torrentLifetime = settings.find((m) => m.key === 'Gui:Default:TorrentLifetime')?.value as number;
+      this.priority = settings.find((m) => m.key === 'Gui:Default:Priority')?.value as number;

-        this.category = settings.find((m) => m.key === 'Gui:Default:Category')?.value as string;
-        const categoriesSetting = settings.find((m) => m.key === 'General:Categories')?.value as string;
-        this.categories = (categoriesSetting ?? '')
-          .split(',')
-          .map((c) => c.trim())
-          .filter((c) => c.length > 0)
-          .filter((c, i, arr) => arr.findIndex((a) => a.toLowerCase() === c.toLowerCase()) === i);
-        const matchedCategory = this.categories.find((c) => c.toLowerCase() === (this.category ?? '').toLowerCase());
-        if (matchedCategory) {
-          this.category = matchedCategory;
-        } else {
-          this.updateFilteredCategories();
-        }
-        this.hostDownloadAction = this.downloadAction = settings.find((m) => m.key === 'Gui:Default:HostDownloadAction')
-          ?.value as number;
-        this.downloadAction =
-          settings.find((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
-        this.finishedAction = settings.find((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
-        this.finishedActionDelay = settings.find((m) => m.key == 'Gui:Default:FinishedActionDelay')?.value as number;
-        this.downloadMinSize = settings.find((m) => m.key === 'Gui:Default:MinFileSize')?.value as number;
-        this.includeRegex = settings.find((m) => m.key === 'Gui:Default:IncludeRegex')?.value as string;
-        this.excludeRegex = settings.find((m) => m.key === 'Gui:Default:ExcludeRegex')?.value as string;
-        this.torrentRetryAttempts = settings.find((m) => m.key === 'Gui:Default:TorrentRetryAttempts')?.value as number;
-        this.downloadRetryAttempts = settings.find((m) => m.key === 'Gui:Default:DownloadRetryAttempts')
-          ?.value as number;
-        this.torrentDeleteOnError = settings.find((m) => m.key === 'Gui:Default:DeleteOnError')?.value as number;
-        this.torrentLifetime = settings.find((m) => m.key === 'Gui:Default:TorrentLifetime')?.value as number;
-        this.priority = settings.find((m) => m.key === 'Gui:Default:Priority')?.value as number;
-
-        this.setFinishAction();
-      });
-  }
-
-  private updateFilteredCategories(): void {
-    if (!this.category) {
-      this.filteredCategories = this.categories;
-      return;
-    }
-
-    const search = this.category.toLowerCase();
-    this.filteredCategories = this.categories.filter((value) => value.toLowerCase().includes(search));
-  }
-
-  public selectCategory(cat: string): void {
-    this.category = cat;
-    this.categoryDropdownOpen = false;
-  }
-
-  public onCategoryBlur(): void {
-    setTimeout(() => (this.categoryDropdownOpen = false), 150);
+      this.setFinishAction();
+    });
  }

  public setFinishAction() {
@ -167,7 +119,7 @@ export class AddNewTorrentComponent implements OnInit {
  public pickFile(evt: Event): void {
    const files = (evt.target as HTMLInputElement).files;

-    if (files == null || files.length === 0) {
+    if (files.length === 0) {
      return;
    }

--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';

@Component({
-  selector: 'app-root',
-  template: '<router-outlet></router-outlet>',
-  styles: [],
-  imports: [RouterOutlet],
+    selector: 'app-root',
+    template: '<router-outlet></router-outlet>',
+    styles: [],
+    imports: [RouterOutlet],
 })
 export class AppComponent {}
--- a/client/src/app/auth.interceptor.ts
+++ b/client/src/app/auth.interceptor.ts
@ -1,12 +1,12 @@
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';

@Injectable()
 export class AuthInterceptor implements HttpInterceptor {
-  private router = inject(Router);
+  constructor(private router: Router) {}

  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
    return next.handle(req).pipe(
--- a/client/src/app/auth.service.ts
+++ b/client/src/app/auth.service.ts
@ -1,14 +1,16 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';

@Injectable({
  providedIn: 'root',
 })
 export class AuthService {
-  private http = inject(HttpClient);
-  private baseHref = inject(APP_BASE_HREF);
+  constructor(
+    private http: HttpClient,
+    @Inject(APP_BASE_HREF) private baseHref: string,
+  ) {}

  public isLoggedIn(): Observable<boolean> {
    return this.http.get<boolean>(`${this.baseHref}Api/Authentication/IsLoggedIn`);
--- a/client/src/app/decode-uri.pipe.ts
+++ b/client/src/app/decode-uri.pipe.ts
@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';

-@Pipe({ name: 'decodeURI' })
+@Pipe({ name: 'decodeURI', })
 export class DecodeURIPipe implements PipeTransform {
  transform(input: any) {
    return decodeURI(input);
--- a/client/src/app/download-status.pipe.ts
+++ b/client/src/app/download-status.pipe.ts
@ -1,10 +1,10 @@
-import { Pipe, PipeTransform, inject } from '@angular/core';
+import { Pipe, PipeTransform } from '@angular/core';
 import { Download } from './models/download.model';
 import { FileSizePipe } from './filesize.pipe';

@Pipe({ name: 'downloadStatus' })
 export class DownloadStatusPipe implements PipeTransform {
-  private pipe = inject(FileSizePipe);
+  constructor(private pipe: FileSizePipe) {}

  transform(value: Download): string {
    if (!value) {
--- a/client/src/app/filesize.pipe.ts
+++ b/client/src/app/filesize.pipe.ts
@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { filesize } from 'filesize';

-@Pipe({ name: 'filesize' })
+@Pipe({ name: 'filesize', })
 export class FileSizePipe implements PipeTransform {
  private static transformOne(value: number, options?: any): string {
    return filesize(value, options).toString();
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { FormsModule } from '@angular/forms';
@ -12,14 +12,16 @@ import { NgClass } from '@angular/common';
  standalone: true,
 })
 export class LoginComponent {
-  private authService = inject(AuthService);
-  private router = inject(Router);
-
  public userName: string;
  public password: string;
  public error: string;
  public loggingIn: boolean;

+  constructor(
+    private authService: AuthService,
+    private router: Router,
+  ) {}
+
  public setUserName(event: Event): void {
    this.userName = (event.target as any).value;
  }
--- a/client/src/app/models/torrent.model.ts
+++ b/client/src/app/models/torrent.model.ts
@ -44,12 +44,9 @@ export class Torrent {
  public rdSpeed: number;
  public rdSeeders: number;
  public rdFiles: string;
-  public statusText?: string;
-  public filesCount?: number;
-  public downloadsCount?: number;

-  public files?: TorrentFile[];
-  public downloads?: Download[];
+  public files: TorrentFile[];
+  public downloads: Download[];
 }

 export class TorrentFile {
--- a/client/src/app/navbar/navbar.component.scss
+++ b/client/src/app/navbar/navbar.component.scss
@ -4,4 +4,4 @@

 .notification {
  margin-top: 52px;
-}
+}
--- a/client/src/app/navbar/navbar.component.ts
+++ b/client/src/app/navbar/navbar.component.ts
@ -1,11 +1,9 @@
-import { Component, DestroyRef, OnInit, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component, OnInit } from '@angular/core';
 import { NavigationEnd, Router, RouterLink } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { Profile } from '../models/profile.model';
 import { SettingsService } from '../settings.service';
 import { NgClass, DatePipe } from '@angular/common';
-import { filter } from 'rxjs';

@Component({
  selector: 'app-navbar',
@ -15,60 +13,50 @@ import { filter } from 'rxjs';
  standalone: true,
 })
 export class NavbarComponent implements OnInit {
-  private destroyRef = inject(DestroyRef);
-  private settingsService = inject(SettingsService);
-  private authService = inject(AuthService);
-  private router = inject(Router);
-
  public showMobileMenu = false;

  public profile: Profile;
  public providerLink: string;
  public version: string;

-  constructor() {
-    this.router.events
-      .pipe(
-        filter((event): event is NavigationEnd => event instanceof NavigationEnd),
-        takeUntilDestroyed(this.destroyRef),
-      )
-      .subscribe(() => {
+  constructor(
+    private settingsService: SettingsService,
+    private authService: AuthService,
+    private router: Router,
+  ) {
+    this.router.events.subscribe((event) => {
+      if (event instanceof NavigationEnd) {
        this.showMobileMenu = false;
-      });
+      }
+    });
  }

  ngOnInit(): void {
-    this.settingsService
-      .getProfile()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((result) => {
-        this.profile = result;
+    this.settingsService.getProfile().subscribe((result) => {
+      this.profile = result;

-        switch (result.provider) {
-          case 'RealDebrid':
-            this.providerLink = 'https://real-debrid.com/?id=1348683';
-            break;
-          case 'AllDebrid':
-            this.providerLink = 'https://alldebrid.com/?uid=2v91l&lang=en';
-            break;
-          case 'Premiumize':
-            this.providerLink = 'https://www.premiumize.me/';
-            break;
-          case 'TorBox':
-            this.providerLink = 'https://torbox.app/';
-            break;
-          case 'DebridLink':
-            this.providerLink = 'https://debrid-link.com/';
-            break;
-        }
-      });
+      switch (result.provider) {
+        case 'RealDebrid':
+          this.providerLink = 'https://real-debrid.com/?id=1348683';
+          break;
+        case 'AllDebrid':
+          this.providerLink = 'https://alldebrid.com/?uid=2v91l&lang=en';
+          break;
+        case 'Premiumize':
+          this.providerLink = 'https://www.premiumize.me/';
+          break;
+        case 'TorBox':
+          this.providerLink = 'https://torbox.app/';
+          break;
+        case 'DebridLink':
+          this.providerLink = 'https://debrid-link.com/';
+          break;
+      }
+    });

-    this.settingsService
-      .getVersion()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe((result) => {
-        this.version = result.version;
-      });
+    this.settingsService.getVersion().subscribe((result) => {
+      this.version = result.version;
+    });
  }

  public logout(): void {
--- a/client/src/app/nl2br.pipe.ts
+++ b/client/src/app/nl2br.pipe.ts
@ -1,9 +1,9 @@
-import { Pipe, PipeTransform, SecurityContext, VERSION, inject } from '@angular/core';
+import { Pipe, PipeTransform, SecurityContext, VERSION } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';

-@Pipe({ name: 'nl2br' })
+@Pipe({ name: 'nl2br', })
 export class Nl2BrPipe implements PipeTransform {
-  private sanitizer = inject(DomSanitizer);
+  constructor(private sanitizer: DomSanitizer) {}

  transform(value: string, sanitizeBeforehand?: boolean): string {
    if (typeof value !== 'string') {
--- a/client/src/app/profile/profile.component.ts
+++ b/client/src/app/profile/profile.component.ts
@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { AuthService } from '../auth.service';
 import { FormsModule } from '@angular/forms';
 import { NgClass } from '@angular/common';
@ -11,7 +11,7 @@ import { NgClass } from '@angular/common';
  standalone: true,
 })
 export class ProfileComponent {
-  private authService = inject(AuthService);
+  constructor(private authService: AuthService) {}

  public username: string;
  public password: string;
--- a/client/src/app/settings.service.ts
+++ b/client/src/app/settings.service.ts
@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Profile } from './models/profile.model';
 import { Setting } from './models/setting.model';
@ -10,8 +10,10 @@ import { Version } from './models/version.model';
  providedIn: 'root',
 })
 export class SettingsService {
-  private http = inject(HttpClient);
-  private baseHref = inject(APP_BASE_HREF);
+  constructor(
+    private http: HttpClient,
+    @Inject(APP_BASE_HREF) private baseHref: string,
+  ) {}

  public get(): Observable<Setting[]> {
    return this.http.get<Setting[]>(`${this.baseHref}Api/Settings`);
--- a/client/src/app/settings/settings.component.ts
+++ b/client/src/app/settings/settings.component.ts
@ -1,10 +1,10 @@
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { SettingsService } from 'src/app/settings.service';
 import { Setting } from '../models/setting.model';
 import { NgClass, KeyValuePipe } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Nl2BrPipe } from '../nl2br.pipe';
 import { FileSizePipe } from '../filesize.pipe';
-import { SettingsService } from '../settings.service';

@Component({
  selector: 'app-settings',
@ -14,8 +14,6 @@ import { SettingsService } from '../settings.service';
  standalone: true,
 })
 export class SettingsComponent implements OnInit {
-  private settingsService = inject(SettingsService);
-
  public activeTab = 0;

  public tabs: Setting[] = [];
@ -37,6 +35,8 @@ export class SettingsComponent implements OnInit {

  public canRegisterMagnetHandler = false;

+  constructor(private settingsService: SettingsService) {}
+
  ngOnInit(): void {
    this.reset();
    this.canRegisterMagnetHandler = !!(window.isSecureContext && 'registerProtocolHandler' in navigator);
--- a/client/src/app/setup/setup.component.ts
+++ b/client/src/app/setup/setup.component.ts
@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { NgClass } from '@angular/common';
@ -12,9 +12,6 @@ import { FormsModule } from '@angular/forms';
  standalone: true,
 })
 export class SetupComponent {
-  private authService = inject(AuthService);
-  private router = inject(Router);
-
  public userName: string;
  public password: string;
  public provider = 0;
@ -25,6 +22,11 @@ export class SetupComponent {

  public step: number = 1;

+  constructor(
+    private authService: AuthService,
+    private router: Router,
+  ) {}
+
  public setup(): void {
    this.error = null;
    this.working = true;
--- a/client/src/app/sort.pipe.ts
+++ b/client/src/app/sort.pipe.ts
@ -1,78 +1,20 @@
 import { Pipe, PipeTransform } from '@angular/core';

-export type SortDirection = 'asc' | 'desc';
-
-export function getSortFieldValue(item: unknown, field: string): unknown {
-  if (item == null || !field) {
-    return undefined;
-  }
-
-  return field.split('.').reduce<unknown>((value, key) => {
-    if (value == null || typeof value !== 'object') {
-      return undefined;
-    }
-
-    return (value as Record<string, unknown>)[key];
-  }, item);
-}
-
-function compareSortValues(left: unknown, right: unknown): number {
-  if (left === right) {
-    return 0;
-  }
-
-  if (left == null) {
-    return 1;
-  }
-
-  if (right == null) {
-    return -1;
-  }
-
-  if (typeof left === 'string' && typeof right === 'string') {
-    return left.localeCompare(right, undefined, { sensitivity: 'base' });
-  }
-
-  if (left instanceof Date && right instanceof Date) {
-    return left.getTime() - right.getTime();
-  }
-
-  if (typeof left === 'boolean' && typeof right === 'boolean') {
-    return Number(left) - Number(right);
-  }
-
-  const comparableLeft = left as string | number | bigint;
-  const comparableRight = right as string | number | bigint;
-
-  if (comparableLeft < comparableRight) {
-    return -1;
-  }
-
-  if (comparableLeft > comparableRight) {
-    return 1;
-  }
-
-  return 0;
-}
-
-export function sortItems<T>(
-  array: readonly T[],
-  field: string,
-  order: SortDirection = 'asc',
-  accessor: (item: T, field: string) => unknown = getSortFieldValue,
-): T[] {
-  if (!Array.isArray(array)) {
-    return [];
-  }
-
-  const direction = order === 'asc' ? 1 : -1;
-
-  return [...array].sort((left, right) => compareSortValues(accessor(left, field), accessor(right, field)) * direction);
-}
-
-@Pipe({ name: 'sort' })
+@Pipe({ name: 'sort', })
 export class SortPipe implements PipeTransform {
-  transform(array: unknown[], field: string, order: SortDirection = 'asc'): unknown[] {
-    return sortItems(array, field, order);
+  transform(array: any[], field: string, order: 'asc' | 'desc' = 'asc'): any[] {
+    if (!Array.isArray(array)) {
+      return [];
+    }
+    const sortedArray = array.sort((a, b) => {
+      if (a[field] < b[field]) {
+        return -1;
+      } else if (a[field] > b[field]) {
+        return 1;
+      } else {
+        return 0;
+      }
+    });
+    return order === 'asc' ? sortedArray : sortedArray.reverse();
  }
 }
--- a/client/src/app/torrent-status.pipe.ts
+++ b/client/src/app/torrent-status.pipe.ts
@ -2,131 +2,98 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { RealDebridStatus, Torrent } from './models/torrent.model';
 import { FileSizePipe } from './filesize.pipe';

-const fileSizePipe = new FileSizePipe();
+@Pipe({ name: 'status' })
+export class TorrentStatusPipe implements PipeTransform {
+  constructor(private pipe: FileSizePipe) {}

-export function getTorrentStatus(torrent: Torrent): string {
-  if (torrent.error) {
-    return torrent.error;
-  }
+  transform(torrent: Torrent): string {
+    if (torrent.error) {
+      return torrent.error;
+    }

-  const downloads = torrent.downloads ?? [];
+    if (torrent.downloads.length > 0) {
+      const allFinished = torrent.downloads.every((m) => m.completed != null);

-  if (downloads.length > 0) {
-    let allFinished = true;
-    let downloadingCount = 0;
-    let downloadedCount = 0;
-    let downloadingBytesDone = 0;
-    let downloadingBytesTotal = 0;
-    let downloadingSpeed = 0;
-    let unpackingCount = 0;
-    let unpackedCount = 0;
-    let unpackingBytesDone = 0;
-    let unpackingBytesTotal = 0;
-    let queuedForUnpackingCount = 0;
-    let queuedForDownloadingCount = 0;
-
-    for (const download of downloads) {
-      if (download.completed == null) {
-        allFinished = false;
+      if (allFinished) {
+        return 'Finished';
      }

-      if (download.downloadFinished != null) {
-        downloadedCount += 1;
+      const downloading = torrent.downloads.filter((m) => m.downloadStarted && !m.downloadFinished && m.bytesDone > 0);
+      const downloaded = torrent.downloads.filter((m) => m.downloadFinished != null);
+
+      if (downloading.length > 0) {
+        const bytesDone = downloading.reduce((sum, m) => sum + m.bytesDone, 0);
+        const bytesTotal = downloading.reduce((sum, m) => sum + m.bytesTotal, 0);
+        const progress = (bytesDone / bytesTotal || 0) * 100;
+
+        const allSpeeds = downloading.reduce((sum, m) => sum + m.speed, 0);
+
+        const speed: string | string[] = this.pipe.transform(allSpeeds, 'filesize');
+
+        return `Downloading file ${downloading.length + downloaded.length}/${
+          torrent.downloads.length
+        } (${progress.toFixed(2)}% - ${speed}/s)`;
      }

-      if (download.downloadStarted && !download.downloadFinished && download.bytesDone > 0) {
-        downloadingCount += 1;
-        downloadingBytesDone += download.bytesDone;
-        downloadingBytesTotal += download.bytesTotal;
-        downloadingSpeed += download.speed;
+      const unpacking = torrent.downloads.filter((m) => m.unpackingStarted && !m.unpackingFinished && m.bytesDone > 0);
+      const unpacked = torrent.downloads.filter((m) => m.unpackingFinished != null);
+
+      if (unpacking.length > 0) {
+        const bytesDone = unpacking.reduce((sum, m) => sum + m.bytesDone, 0);
+        const bytesTotal = unpacking.reduce((sum, m) => sum + m.bytesTotal, 0);
+        const progress = (bytesDone / bytesTotal || 0) * 100;
+
+        return `Extracting file ${unpacking.length + unpacked.length}/${torrent.downloads.length} (${progress.toFixed(
+          2,
+        )}%)`;
      }

-      if (download.unpackingFinished != null) {
-        unpackedCount += 1;
+      const queuedForUnpacking = torrent.downloads.filter((m) => m.unpackingQueued && !m.unpackingStarted);
+
+      if (queuedForUnpacking.length > 0) {
+        return `Queued for unpacking`;
      }

-      if (download.unpackingStarted && !download.unpackingFinished && download.bytesDone > 0) {
-        unpackingCount += 1;
-        unpackingBytesDone += download.bytesDone;
-        unpackingBytesTotal += download.bytesTotal;
+      const queuedForDownload = torrent.downloads.filter((m) => !m.downloadStarted && !m.downloadFinished);
+
+      if (queuedForDownload.length > 0) {
+        return `Queued for downloading`;
      }

-      if (download.unpackingQueued && !download.unpackingStarted) {
-        queuedForUnpackingCount += 1;
+      if (unpacked.length > 0) {
+        return `Files unpacked`;
      }

-      if (!download.downloadStarted && !download.downloadFinished) {
-        queuedForDownloadingCount += 1;
+      if (downloaded.length > 0) {
+        return `Files downloaded to host`;
      }
    }

-    if (allFinished) {
+    if (torrent.completed) {
      return 'Finished';
    }

-    if (downloadingCount > 0) {
-      const progress = ((downloadingBytesDone / downloadingBytesTotal) || 0) * 100;
-      const speed = fileSizePipe.transform(downloadingSpeed, 'filesize') as string;
-
-      return `Downloading file ${downloadingCount + downloadedCount}/${downloads.length} (${progress.toFixed(2)}% - ${speed}/s)`;
+    switch (torrent.rdStatus) {
+      case RealDebridStatus.Queued:
+        return 'Not Yet Added to Provider';
+      case RealDebridStatus.Downloading:
+        if (torrent.rdSeeders < 1 && torrent.type !== 1) {
+          return `Torrent stalled`;
+        }
+        const speed = this.pipe.transform(torrent.rdSpeed, 'filesize');
+        return `Torrent downloading (${torrent.rdProgress}% - ${speed}/s)`;
+      case RealDebridStatus.Processing:
+        return `Torrent processing`;
+      case RealDebridStatus.WaitingForFileSelection:
+        return `Torrent waiting for file selection`;
+      case RealDebridStatus.Error:
+        return `Torrent error: ${torrent.rdStatusRaw}`;
+      case RealDebridStatus.Finished:
+        return `Torrent finished, waiting for download links`;
+      case RealDebridStatus.Uploading:
+        return `Torrent uploading`;
+      default:
+        return 'Unknown status';
    }
-
-    if (unpackingCount > 0) {
-      const progress = ((unpackingBytesDone / unpackingBytesTotal) || 0) * 100;
-
-      return `Extracting file ${unpackingCount + unpackedCount}/${downloads.length} (${progress.toFixed(2)}%)`;
-    }
-
-    if (queuedForUnpackingCount > 0) {
-      return 'Queued for unpacking';
-    }
-
-    if (queuedForDownloadingCount > 0) {
-      return 'Queued for downloading';
-    }
-
-    if (unpackedCount > 0) {
-      return 'Files unpacked';
-    }
-
-    if (downloadedCount > 0) {
-      return 'Files downloaded to host';
-    }
-  }
-
-  if (torrent.completed) {
-    return 'Finished';
-  }
-
-  const prefix = torrent.type === 1 ? 'NZB' : 'Torrent';
-
-  switch (torrent.rdStatus) {
-    case RealDebridStatus.Queued:
-      return 'Not Yet Added to Provider';
-    case RealDebridStatus.Downloading:
-      if (torrent.rdSeeders < 1 && torrent.type !== 1) {
-        return 'Torrent stalled';
-      }
-
-      return `${prefix} downloading (${torrent.rdProgress}% - ${fileSizePipe.transform(torrent.rdSpeed, 'filesize') as string}/s)`;
-    case RealDebridStatus.Processing:
-      return `${prefix} processing`;
-    case RealDebridStatus.WaitingForFileSelection:
-      return `${prefix} waiting for file selection`;
-    case RealDebridStatus.Error:
-      return `${prefix} error: ${torrent.rdStatusRaw}`;
-    case RealDebridStatus.Finished:
-      return `${prefix} finished, waiting for download links`;
-    case RealDebridStatus.Uploading:
-      return `${prefix} uploading`;
-    default:
-      return 'Unknown status';
-  }
-}
-
-@Pipe({ name: 'status' })
-export class TorrentStatusPipe implements PipeTransform {
-  transform(torrent: Torrent): string {
-    return getTorrentStatus(torrent);
  }
 }
--- a/client/src/app/torrent-table/torrent-table.component.html
+++ b/client/src/app/torrent-table/torrent-table.component.html
@ -10,115 +10,79 @@
    <br />
    Available: {{ diskSpaceStatus.availableSpaceGB }} GB | Resume at: {{ diskSpaceStatus.thresholdGB * 2 }} GB
    <br />
-    <small>Last check: {{ diskSpaceStatus.lastCheckTime | date: "short" }}</small>
+    <small>Last check: {{ diskSpaceStatus.lastCheckTime | date: 'short' }}</small>
  </div>
 }
@if (rateLimitStatus?.nextDequeueTime) {
  <div class="notification is-warning">
    <strong>Debrid provider rate limit reached</strong>
    <br />
-    Processing paused until {{ rateLimitStatus.nextDequeueTime | date: "medium" }}
-    @if (rateLimitStatus.secondsRemaining > 0) {
-      ({{ rateLimitStatus.secondsRemaining | number: "1.0-0" }} seconds remaining)
-    }
+    New torrents will not be added until {{ rateLimitStatus.nextDequeueTime | date: 'medium' }}
  </div>
 }
 <div class="table-container">
-  @if (!isMobile) {
-    <table class="table is-fullwidth is-hoverable">
-      <thead>
+  <table class="table is-fullwidth is-hoverable">
+    <thead>
+      <tr>
+        <th>
+          <input
+            type="checkbox"
+            (click)="toggleDeleteSelectAll($event)"
+            [checked]="selectedTorrents.length > 0 && selectedTorrents.length === torrents.length"
+          />
+        </th>
+        <th (click)="sort('rdName')">Name</th>
+        <th (click)="sort('category')">Category</th>
+        <th (click)="sort('priority')">Priority</th>
+        <th (click)="sort('rdSeeders')">Seeders</th>
+        <th (click)="sort('files.length')">Files</th>
+        <th (click)="sort('downloads.length')">Downloads</th>
+        <th (click)="sort('rdSize')">Size</th>
+        <th (click)="sort('added')">Requested</th>
+        <th (click)="sort('status')">Status</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (torrent of torrents | sort: sortProperty : sortDirection; track torrent.torrentId) {
        <tr>
-          <th>
-            <input
-              type="checkbox"
-              (click)="toggleDeleteSelectAll($event)"
-              [checked]="selectedTorrents.length > 0 && selectedTorrents.length === torrents.length"
-            />
-          </th>
-          <th (click)="sort('rdName')">Name</th>
-          <th (click)="sort('category')">Category</th>
-          <th (click)="sort('priority')">Priority</th>
-          <th (click)="sort('rdSeeders')">Seeders</th>
-          <th (click)="sort('files.length')">Files</th>
-          <th (click)="sort('downloads.length')">Downloads</th>
-          <th (click)="sort('rdSize')">Size</th>
-          <th (click)="sort('added')">Requested</th>
-          <th (click)="sort('status')">Status</th>
-        </tr>
-      </thead>
-      <tbody>
-        @for (torrent of sortedTorrents; track torrent.torrentId) {
-          <tr>
-            <td>
-              <input type="checkbox" (click)="toggleSelect(torrent.torrentId)" [checked]="isSelected(torrent.torrentId)" />
-            </td>
-            <td (click)="openTorrent(torrent.torrentId)" class="break-all">
-              {{ torrent.rdName }}
-            </td>
-            <td>
-              {{ torrent.category }}
-            </td>
-            <td>
-              {{ torrent.priority }}
-            </td>
-            <td>
-              {{ torrent.rdSeeders }}
-            </td>
-            <td>
-              {{ (torrent.filesCount ?? torrent.files?.length ?? 0) | number }}
-            </td>
-            <td>
-              {{ (torrent.downloadsCount ?? torrent.downloads?.length ?? 0) | number }}
-            </td>
-            <td>
-              {{ torrent.rdSize | filesize }}
-            </td>
-            <td>
-              {{ torrent.added | date: "medium" }}
-            </td>
-            <td>
-              {{ torrent.statusText ?? (torrent | status) }}
-            </td>
-          </tr>
-        }
-      </tbody>
-    </table>
-  } @else {
-    <div class="mobile-cards">
-      @for (torrent of sortedTorrents; track torrent.torrentId) {
-        <div class="box mobile-card" [class.is-selected]="isSelected(torrent.torrentId)">
-          <div class="mobile-card-checkbox">
+          <td>
            <input
              type="checkbox"
              (click)="toggleSelect(torrent.torrentId)"
-              [checked]="isSelected(torrent.torrentId)"
+              [checked]="selectedTorrents.includes(torrent.torrentId)"
            />
-          </div>
-          <div class="mobile-card-body" (click)="openTorrent(torrent.torrentId)">
-            <p class="mobile-card-name">{{ torrent.rdName }}</p>
-            <div class="tags mb-2">
-              <span class="tag is-info is-light">{{ torrent.statusText ?? (torrent | status) }}</span>
-              @if (torrent.category) {
-                <span class="tag is-light">{{ torrent.category }}</span>
-              }
-            </div>
-            <div class="mobile-card-details">
-              <span class="mobile-card-detail"
-                ><span class="detail-label">Size</span> {{ torrent.rdSize | filesize }}</span
-              >
-              <span class="mobile-card-detail"><span class="detail-label">Seeders</span> {{ torrent.rdSeeders }}</span>
-              <span class="mobile-card-detail"
-                ><span class="detail-label">Files</span> {{ (torrent.filesCount ?? torrent.files?.length ?? 0) | number }}</span
-              >
-              <span class="mobile-card-detail"
-                ><span class="detail-label">Downloads</span> {{ (torrent.downloadsCount ?? torrent.downloads?.length ?? 0) | number }}</span
-              >
-            </div>
-          </div>
-        </div>
+          </td>
+          <td (click)="openTorrent(torrent.torrentId)" class="break-all">
+            {{ torrent.rdName }}
+          </td>
+          <td>
+            {{ torrent.category }}
+          </td>
+          <td>
+            {{ torrent.priority }}
+          </td>
+          <td>
+            {{ torrent.rdSeeders }}
+          </td>
+          <td>
+            {{ torrent.files.length | number }}
+          </td>
+          <td>
+            {{ torrent.downloads.length | number }}
+          </td>
+          <td>
+            {{ torrent.rdSize | filesize }}
+          </td>
+          <td>
+            {{ torrent.added | date: "medium" }}
+          </td>
+          <td>
+            {{ torrent | status }}
+          </td>
+        </tr>
      }
-    </div>
-  }
+    </tbody>
+  </table>

  <div class="flex-container">
    @if (torrents.length > 0) {
--- a/client/src/app/torrent-table/torrent-table.component.scss
+++ b/client/src/app/torrent-table/torrent-table.component.scss
@ -5,74 +5,12 @@ table {
      word-break: break-all;
    }
  }
-}
-
-.mobile-cards {
-  display: block;
-}
-
-.mobile-card {
-  display: flex;
-  align-items: flex-start;
-  gap: 0.75rem;
-  padding: 0.875rem 0.75rem !important;
-  margin-bottom: 0.5rem !important;
-  cursor: pointer;
-
-  &.is-selected {
-    border-left: 3px solid hsl(217, 71%, 53%);
-  }
-
-  &:active {
-    background-color: hsl(0, 0%, 96%);
-  }
-}
-
-.mobile-card-checkbox {
-  flex-shrink: 0;
-  padding-top: 0.125rem;
-
-  input[type="checkbox"] {
-    width: 1.1rem;
-    height: 1.1rem;
-    cursor: pointer;
-  }
-}
-
-.mobile-card-body {
-  flex: 1;
-  min-width: 0;
-}
-
-.mobile-card-name {
-  font-weight: 600;
-  font-size: 0.9rem;
-  line-height: 1.3;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  margin-bottom: 0.375rem;
-  color: hsl(0, 0%, 21%);
-}
-
-.mobile-card-details {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.25rem 1rem;
-}
-
-.mobile-card-detail {
-  font-size: 0.8rem;
-  color: hsl(0, 0%, 29%);
-  white-space: nowrap;
-
-  .detail-label {
-    color: hsl(0, 0%, 48%);
-    font-size: 0.72rem;
-    text-transform: uppercase;
-    letter-spacing: 0.03em;
-    margin-right: 0.2em;
-  }
+    // Make table horizontally scrollable on small screens
+    @media screen and (max-width: 768px) {
+      display: block;
+      overflow-x: auto;
+      white-space: nowrap;
+    }
 }

 .flex-container {
@ -80,17 +18,8 @@ table {
  flex: 1 1 0;
  gap: 20px;
  flex-direction: row;
-  margin-top: 1rem;

  @media screen and (max-width: 1279px) {
    flex-direction: column;
  }
-
-  @media screen and (max-width: 768px) {
-    gap: 0.5rem;
-
-    .button {
-      width: 100%;
-    }
-  }
 }
--- a/client/src/app/torrent-table/torrent-table.component.ts
+++ b/client/src/app/torrent-table/torrent-table.component.ts
@ -1,5 +1,4 @@
-import { Component, DestroyRef, OnDestroy, OnInit, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { Torrent } from '../models/torrent.model';
 import { DiskSpaceStatus } from '../models/disk-space-status.model';
@ -8,29 +7,23 @@ import { TorrentService } from '../torrent.service';
 import { forkJoin, Observable } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 import { NgClass, DecimalPipe, DatePipe } from '@angular/common';
-import { getTorrentStatus, TorrentStatusPipe } from '../torrent-status.pipe';
-import { SortDirection, getSortFieldValue, sortItems } from '../sort.pipe';
+import { TorrentStatusPipe } from '../torrent-status.pipe';
+import { SortPipe } from '../sort.pipe';
 import { FileSizePipe } from '../filesize.pipe';

@Component({
  selector: 'app-torrent-table',
  templateUrl: './torrent-table.component.html',
  styleUrls: ['./torrent-table.component.scss'],
-  imports: [FormsModule, NgClass, DecimalPipe, DatePipe, TorrentStatusPipe, FileSizePipe],
+  imports: [FormsModule, NgClass, DecimalPipe, DatePipe, TorrentStatusPipe, SortPipe, FileSizePipe],
  standalone: true,
 })
-export class TorrentTableComponent implements OnInit, OnDestroy {
-  private destroyRef = inject(DestroyRef);
-  private router = inject(Router);
-  private torrentService = inject(TorrentService);
-  private selectedTorrentIds = new Set<string>();
-
+export class TorrentTableComponent implements OnInit {
  public torrents: Torrent[] = [];
-  public sortedTorrents: Torrent[] = [];
  public selectedTorrents: string[] = [];
  public error: string;
  public sortProperty = 'added';
-  public sortDirection: SortDirection = 'desc';
+  public sortDirection: 'asc' | 'desc' = 'desc';

  public isDeleteModalActive: boolean;
  public deleteError: string;
@ -60,18 +53,12 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
  public diskSpaceStatus: DiskSpaceStatus | null = null;
  public rateLimitStatus: RateLimitStatus | null = null;

-  public isMobile = false;
-  private mobileQuery: MediaQueryList;
-  private mobileQueryListener: (e: MediaQueryListEvent) => void;
+  constructor(
+    private router: Router,
+    private torrentService: TorrentService,
+  ) {}

  ngOnInit(): void {
-    this.mobileQuery = window.matchMedia('(max-width: 768px)');
-    this.isMobile = this.mobileQuery.matches;
-    this.mobileQueryListener = (e: MediaQueryListEvent) => {
-      this.isMobile = e.matches;
-    };
-    this.mobileQuery.addEventListener('change', this.mobileQueryListener);
-
    // Load persisted sort settings (if any)
    try {
      const sp = localStorage.getItem('torrentTable.sortProperty');
@ -86,47 +73,38 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
      // Ignore storage errors (e.g., disabled storage)
    }

-    this.torrentService
-      .getDiskSpaceStatus()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe({
-        next: (status) => {
-          this.diskSpaceStatus = status;
-        },
-      });
+    this.torrentService.getDiskSpaceStatus().subscribe({
+      next: (status) => {
+        this.diskSpaceStatus = status;
+      },
+    });

-    this.torrentService.diskSpaceStatus$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((status) => {
+    this.torrentService.diskSpaceStatus$.subscribe((status) => {
      this.diskSpaceStatus = status;
    });

-    this.torrentService
-      .getRateLimitStatus()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe({
-        next: (status) => {
-          this.rateLimitStatus = status;
-        },
-      });
+    this.torrentService.getRateLimitStatus().subscribe({
+      next: (status) => {
+        this.rateLimitStatus = status;
+      },
+    });

-    this.torrentService.rateLimitStatus$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((status) => {
+    this.torrentService.rateLimitStatus$.subscribe((status) => {
      this.rateLimitStatus = status;
    });

-    this.torrentService.update$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((result) => {
-      this.setTorrents(result);
+    this.torrentService.update$.subscribe((result) => {
+      this.torrents = result;
    });

-    this.torrentService
-      .getList()
-      .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe({
-        next: (result) => {
-          this.setTorrents(result);
-        },
-        error: (err) => {
-          this.error = err.error;
-        },
-      });
+    this.torrentService.getList().subscribe({
+      next: (result) => {
+        this.torrents = result;
+      },
+      error: (err) => {
+        this.error = err.error;
+      },
+    });
  }

  public sort(property: string): void {
@ -144,33 +122,30 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
    } catch (_) {
      // Ignore storage errors
    }
-
-    this.applySorting();
  }

  public openTorrent(torrentId: string): void {
    this.router.navigate([`/torrent/${torrentId}`]);
  }

-  public toggleDeleteSelectAll(event: Event) {
-    const checked = (event.target as HTMLInputElement).checked;
+  public toggleDeleteSelectAll(event: any) {
+    this.selectedTorrents = [];

-    this.selectedTorrentIds = checked ? new Set(this.torrents.map((torrent) => torrent.torrentId)) : new Set<string>();
-    this.syncSelectedTorrents();
+    if (event.target.checked) {
+      this.torrents.map((torrent) => {
+        this.selectedTorrents.push(torrent.torrentId);
+      });
+    }
  }

  public toggleSelect(torrentId: string) {
-    if (this.selectedTorrentIds.has(torrentId)) {
-      this.selectedTorrentIds.delete(torrentId);
+    const index = this.selectedTorrents.indexOf(torrentId);
+
+    if (index > -1) {
+      this.selectedTorrents.splice(index, 1);
    } else {
-      this.selectedTorrentIds.add(torrentId);
+      this.selectedTorrents.push(torrentId);
    }
-
-    this.syncSelectedTorrents();
-  }
-
-  public isSelected(torrentId: string): boolean {
-    return this.selectedTorrentIds.has(torrentId);
  }

  public showDeleteModal(): void {
@ -200,7 +175,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
        this.isDeleteModalActive = false;
        this.deleting = false;

-        this.clearSelectedTorrents();
+        this.selectedTorrents = [];
      },
      error: (err) => {
        this.deleteError = err.error;
@ -233,7 +208,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
        this.isRetryModalActive = false;
        this.retrying = false;

-        this.clearSelectedTorrents();
+        this.selectedTorrents = [];
      },
      error: (err) => {
        this.retryError = err.error;
@ -245,7 +220,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
  public changeSettingsModal(): void {
    this.changeSettingsError = null;

-    const selectedTorrents = this.getSelectedTorrentModels();
+    const selectedTorrents = this.torrents.filter((m) => this.selectedTorrents.indexOf(m.torrentId) > -1);

    this.updateSettingsDownloadClient = selectedTorrents.every(
      (m, _, arr) => m.downloadClient === arr[0].downloadClient,
@ -292,7 +267,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {

    const calls: Observable<void>[] = [];

-    const selectedTorrents = this.getSelectedTorrentModels();
+    const selectedTorrents = this.torrents.filter((m) => this.selectedTorrents.indexOf(m.torrentId) > -1);

    selectedTorrents.forEach((torrent) => {
      if (this.updateSettingsDownloadClient != null) {
@ -308,7 +283,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
        torrent.priority = this.updateSettingsPriority;
      }
      if (this.updateSettingsDownloadRetryAttempts != null) {
-        torrent.downloadRetryAttempts = this.updateSettingsDownloadRetryAttempts;
+        torrent.retryCount = this.updateSettingsDownloadRetryAttempts;
      }
      if (this.updateSettingsTorrentRetryAttempts != null) {
        torrent.torrentRetryAttempts = this.updateSettingsTorrentRetryAttempts;
@ -328,7 +303,7 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
        this.isChangeSettingsModalActive = false;
        this.changingSettings = false;

-        this.clearSelectedTorrents();
+        this.selectedTorrents = [];
      },
      error: (err) => {
        this.changeSettingsError = err.error;
@ -345,56 +320,4 @@ export class TorrentTableComponent implements OnInit, OnDestroy {
  updateDeleteSelectAll() {
    this.deleteSelectAll = this.deleteData && this.deleteRdTorrent && this.deleteLocalFiles;
  }
-
-  ngOnDestroy(): void {
-    this.mobileQuery?.removeEventListener('change', this.mobileQueryListener);
-  }
-
-  private setTorrents(torrents: Torrent[]): void {
-    this.torrents = torrents;
-    this.pruneSelectedTorrents();
-    this.applySorting();
-  }
-
-  private applySorting(): void {
-    this.sortedTorrents = sortItems(this.torrents, this.sortProperty, this.sortDirection, (torrent, field) => {
-      switch (field) {
-        case 'files.length':
-          return torrent.filesCount ?? torrent.files?.length ?? 0;
-        case 'downloads.length':
-          return torrent.downloadsCount ?? torrent.downloads?.length ?? 0;
-        case 'status':
-          return torrent.statusText ?? getTorrentStatus(torrent);
-        default:
-          return getSortFieldValue(torrent, field);
-      }
-    });
-  }
-
-  private getSelectedTorrentModels(): Torrent[] {
-    return this.torrents.filter((torrent) => this.selectedTorrentIds.has(torrent.torrentId));
-  }
-
-  private pruneSelectedTorrents(): void {
-    const torrentIds = new Set(this.torrents.map((torrent) => torrent.torrentId));
-
-    for (const torrentId of this.selectedTorrentIds) {
-      if (!torrentIds.has(torrentId)) {
-        this.selectedTorrentIds.delete(torrentId);
-      }
-    }
-
-    this.syncSelectedTorrents();
-  }
-
-  private clearSelectedTorrents(): void {
-    this.selectedTorrentIds.clear();
-    this.syncSelectedTorrents();
-  }
-
-  private syncSelectedTorrents(): void {
-    this.selectedTorrents = this.torrents
-      .filter((torrent) => this.selectedTorrentIds.has(torrent.torrentId))
-      .map((torrent) => torrent.torrentId);
-  }
 }
--- a/client/src/app/torrent.service.ts
+++ b/client/src/app/torrent.service.ts
@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import * as signalR from '@microsoft/signalr';
 import { Observable, Subject } from 'rxjs';
 import { Torrent, TorrentFileAvailability } from './models/torrent.model';
@ -11,16 +11,16 @@ import { APP_BASE_HREF } from '@angular/common';
  providedIn: 'root',
 })
 export class TorrentService {
-  private http = inject(HttpClient);
-  private baseHref = inject(APP_BASE_HREF);
-
  public update$: Subject<Torrent[]> = new Subject();
  public diskSpaceStatus$: Subject<DiskSpaceStatus> = new Subject();
  public rateLimitStatus$: Subject<RateLimitStatus> = new Subject();

  private connection: signalR.HubConnection;

-  constructor() {
+  constructor(
+    private http: HttpClient,
+    @Inject(APP_BASE_HREF) private baseHref: string,
+  ) {
    this.connect();
  }

--- a/client/src/app/torrent/torrent.component.html
+++ b/client/src/app/torrent/torrent.component.html
@ -23,7 +23,7 @@
    @if (activeTab === 0) {
      <div class="flex-container">
        <div style="flex: 1 1 0">
-          <div class="field is-grouped is-grouped-multiline action-buttons">
+          <div class="field is-grouped">
            <div class="control">
              <button class="button is-danger" (click)="showDeleteModal()">Delete Torrent</button>
            </div>
@ -44,7 +44,7 @@
          </div>
          <div class="field">
            <label class="label">Hash</label>
-            <span class="break-all">{{ torrent.hash }}</span>
+            {{ torrent.hash }}
          </div>
          <div class="field">
            <label class="label">Priority</label>
@ -240,75 +240,72 @@
    @if (activeTab === 1) {
      <div>
        <div class="field">
-          <div class="table-container">
-            <table class="table is-fullwidth">
-              <thead>
+          <table class="table is-fullwidth">
+            <thead>
+              <tr>
+                <th>ID</th>
+                <th>Path</th>
+                <th>Size</th>
+                <th>Selected</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (file of torrent.files; track file.id) {
                <tr>
-                  <th>ID</th>
-                  <th>Path</th>
-                  <th>Size</th>
-                  <th>Selected</th>
+                  <td>
+                    {{ file.id }}
+                  </td>
+                  <td>
+                    {{ file.path }}
+                  </td>
+                  <td>
+                    {{ file.bytes | filesize }}
+                  </td>
+                  <td>
+                    @if (file.selected) {
+                      <i class="fas fa-check" style="color: green"></i>
+                    } @else {
+                      <i class="fas fa-times" style="color: red"></i>
+                    }
+                  </td>
                </tr>
-              </thead>
-              <tbody>
-                @for (file of torrent.files; track file.id) {
-                  <tr>
-                    <td>
-                      {{ file.id }}
-                    </td>
-                    <td class="break-all">
-                      {{ file.path }}
-                    </td>
-                    <td>
-                      {{ file.bytes | filesize }}
-                    </td>
-                    <td>
-                      @if (file.selected) {
-                        <i class="fas fa-check" style="color: green"></i>
-                      } @else {
-                        <i class="fas fa-times" style="color: red"></i>
-                      }
-                    </td>
-                  </tr>
-                }
-              </tbody>
-            </table>
-          </div>
+              }
+            </tbody>
+          </table>
        </div>
      </div>
    }
    @if (activeTab === 2) {
      <div>
        <div class="field">
-          <div class="table-container">
-            <table class="table is-fullwidth is-hoverable">
-              <thead>
-                <tr>
-                  <th style="width: 35px"></th>
-                  <th>Link</th>
-                  <th>Size</th>
-                  <th>Status</th>
-                </tr>
-              </thead>
-              <tbody>
-                @for (download of torrent.downloads; track download.downloadId) {
-                  @let expanded = downloadExpanded[download.downloadId];
-                  <tr (click)="downloadExpanded[download.downloadId] = !expanded">
-                    <td style="width: 35px">
-                      @if (!expanded) {
-                        <i class="fas fa-caret-right"></i>
-                      } @else {
-                        <i class="fas fa-caret-down"></i>
-                      }
-                    </td>
-                    <td class="break-all">
-                      @if (download.link) {
-                        {{ download.link | decodeURI }}
-                      }
-                      @if (!download.link) {
-                        {{ download.path }}
-                      }
-                    </td>
+          <table class="table is-fullwidth is-hoverable">
+            <thead>
+              <tr>
+                <th style="width: 35px"></th>
+                <th>Link</th>
+                <th>Size</th>
+                <th>Status</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (download of torrent.downloads; track download.downloadId) {
+                @let expanded = downloadExpanded[download.downloadId];
+                <tr (click)="downloadExpanded[download.downloadId] = !expanded">
+                  <td style="width: 35px">
+                    @if (!expanded) {
+                      <i class="fas fa-caret-right"></i>
+                    } @else {
+                      <i class="fas fa-caret-down"></i>
+                    }
+                  </td>
+                  <td>
+                    @if (download.link) {
+                      {{ download.link | decodeURI }}
+                    }
+                    @if (!download.link) {
+                      {{ download.path }}
+                    }
+                  </td>
                  <td>
                    {{ download.bytesTotal | filesize }}
                  </td>
@ -338,10 +335,10 @@
                          <div class="field">
                            <label class="label">Real-Debrid Unrestricted Link</label>
                            @if (download.link) {
-                              <a class="break-all" href="{{ download.link }}" target="_blank"> {{ download.link | decodeURI }}</a>
+                              <a href="{{ download.link }}" target="_blank"> {{ download.link | decodeURI }}</a>
                            }
                          </div>
-                          <div class="field break-all">
+                          <div class="field">
                            <label class="label">Real-Debrid Link</label>
                            {{ download.path }}
                          </div>
@ -434,9 +431,8 @@
                  </tr>
                }
              }
-              </tbody>
-            </table>
-          </div>
+            </tbody>
+          </table>
        </div>
      </div>
    }
--- a/client/src/app/torrent/torrent.component.scss
+++ b/client/src/app/torrent/torrent.component.scss
@ -8,10 +8,6 @@ table {
  }
 }

-.break-all {
-  word-break: break-all;
-}
-
 .flex-container {
  display: flex;
  flex: 1 1 0;
@ -22,24 +18,3 @@ table {
    flex-direction: column;
  }
 }
-
-@media screen and (max-width: 768px) {
-  .action-buttons {
-    .control {
-      width: 100%;
-
-      .button {
-        width: 100%;
-      }
-    }
-  }
-
-  .tabs ul {
-    flex-wrap: wrap;
-
-    li {
-      flex-grow: 1;
-      text-align: center;
-    }
-  }
-}
--- a/client/src/app/torrent/torrent.component.ts
+++ b/client/src/app/torrent/torrent.component.ts
@ -1,5 +1,4 @@
-import { Component, DestroyRef, OnInit, inject } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { saveAs } from 'file-saver-es';
 import { Torrent } from '../models/torrent.model';
@ -11,7 +10,6 @@ import { TorrentStatusPipe } from '../torrent-status.pipe';
 import { DownloadStatusPipe } from '../download-status.pipe';
 import { DecodeURIPipe } from '../decode-uri.pipe';
 import { FileSizePipe } from '../filesize.pipe';
-import { EMPTY, distinctUntilChanged, map, switchMap, tap, catchError } from 'rxjs';

@Component({
  selector: 'app-torrent',
@ -30,12 +28,6 @@ import { EMPTY, distinctUntilChanged, map, switchMap, tap, catchError } from 'rx
  standalone: true,
 })
 export class TorrentComponent implements OnInit {
-  private destroyRef = inject(DestroyRef);
-  private activatedRoute = inject(ActivatedRoute);
-  private router = inject(Router);
-  private torrentService = inject(TorrentService);
-  private currentTorrentId: string | null = null;
-
  public torrent: Torrent;

  public activeTab: number = 0;
@ -74,66 +66,48 @@ export class TorrentComponent implements OnInit {

  public updating: boolean;

-  ngOnInit(): void {
-    this.activatedRoute.params
-      .pipe(
-        map((params) => params['id'] as string),
-        distinctUntilChanged(),
-        tap((torrentId) => {
-          this.currentTorrentId = torrentId;
-        }),
-        switchMap((torrentId) =>
-          this.torrentService.get(torrentId).pipe(
-            catchError(() => {
-              this.router.navigate(['/']);
-              return EMPTY;
-            }),
-          ),
-        ),
-        takeUntilDestroyed(this.destroyRef),
-      )
-      .subscribe((torrent) => {
-        this.torrent = torrent;
-        this.currentTorrentId = torrent.torrentId;
-      });
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private torrentService: TorrentService,
+  ) {}

-    this.torrentService.update$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((result) => {
-      this.update(result);
+  ngOnInit(): void {
+    this.activatedRoute.params.subscribe((params) => {
+      const torrentId = params['id'];
+
+      this.torrentService.get(torrentId).subscribe({
+        next: (torrent) => {
+          this.torrent = torrent;
+
+          this.torrentService.update$.subscribe((result) => {
+            this.update(result);
+          });
+        },
+        error: () => this.router.navigate(['/']),
+      });
    });
  }

  public update(torrents: Torrent[]): void {
-    const torrentId = this.currentTorrentId ?? this.torrent?.torrentId;
-
-    if (!torrentId) {
-      return;
-    }
-
-    const updatedTorrent = torrents.find((m) => m.torrentId === torrentId);
+    const updatedTorrent = torrents.find((m) => m.torrentId === this.torrent.torrentId);

    if (updatedTorrent == null) {
      return;
    }

-    const currentTorrent = this.torrent;
-    const hasIncomingFiles = Array.isArray(updatedTorrent.files) && updatedTorrent.files.length > 0;
-
-    this.torrent = {
-      ...currentTorrent,
-      ...updatedTorrent,
-      fileOrMagnet: updatedTorrent.fileOrMagnet ?? currentTorrent?.fileOrMagnet,
-      files: hasIncomingFiles ? updatedTorrent.files : currentTorrent?.files ?? [],
-      downloads: updatedTorrent.downloads ?? currentTorrent?.downloads ?? [],
-    };
+    this.torrent = updatedTorrent;
  }

  public download(): void {
-    const binaryString = window.atob(this.torrent.fileOrMagnet);
-    const byteArray = new Uint8Array(binaryString.length);
-
-    for (let index = 0; index < binaryString.length; index += 1) {
-      byteArray[index] = binaryString.charCodeAt(index);
-    }
+    const byteArray = new Uint8Array(
+      window
+        .atob(this.torrent.fileOrMagnet)
+        .split('')
+        .map(function (c) {
+          return c.charCodeAt(0);
+        }),
+    );

    const blob = new Blob([byteArray], { type: 'application/x-bittorrent' });
    saveAs(blob, `${this.torrent.rdName}.torrent`);
--- a/client/src/main.ts
+++ b/client/src/main.ts
@ -1,6 +1,7 @@
 import { enableProdMode, importProvidersFrom, provideZoneChangeDetection } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

+
 import { environment } from './environments/environment';
 import { FileSizePipe } from './app/filesize.pipe';
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
@ -17,12 +18,12 @@ if (environment.production) {
 }

 bootstrapApplication(AppComponent, {
-  providers: [
-    provideZoneChangeDetection(),
-    importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ClipboardModule),
-    FileSizePipe,
-    { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
-    { provide: APP_BASE_HREF, useValue: (window as any)['_app_base'] || '/' },
-    provideHttpClient(withInterceptorsFromDi()),
-  ],
-}).catch((err) => console.error(err));
+    providers: [
+        provideZoneChangeDetection(),importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ClipboardModule),
+        FileSizePipe,
+        { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
+        { provide: APP_BASE_HREF, useValue: (window as any)['_app_base'] || '/' },
+        provideHttpClient(withInterceptorsFromDi()),
+    ]
+})
+  .catch((err) => console.error(err));
--- a/server/RdtClient.Data/Data/DataContext.cs
+++ b/server/RdtClient.Data/Data/DataContext.cs
@ -16,14 +16,6 @@ public class DataContext(DbContextOptions options) : IdentityDbContext(options)
    {
        base.OnModelCreating(builder);

-        builder.Entity<Download>()
-               .HasIndex(m => new
-               {
-                   m.TorrentId,
-                   m.Path
-               })
-               .IsUnique();
-
        var cascadeFKs = builder.Model.GetEntityTypes()
                                .SelectMany(t => t.GetForeignKeys())
                                .Where(fk => !fk.IsOwnership && fk.DeleteBehavior == DeleteBehavior.Cascade);
--- a/server/RdtClient.Data/Data/DownloadAddResult.cs
+++ b/server/RdtClient.Data/Data/DownloadAddResult.cs
@ -1,9 +0,0 @@
-namespace RdtClient.Data.Data;
-
-public enum DownloadAddResult
-{
-    Added,
-    AlreadyExists,
-    TorrentMissing,
-    InvalidInput
-}
--- a/server/RdtClient.Data/Data/DownloadData.cs
+++ b/server/RdtClient.Data/Data/DownloadData.cs
@ -1,12 +1,10 @@
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
 using RdtClient.Data.Models.Data;
 using Download = RdtClient.Data.Models.Data.Download;

 namespace RdtClient.Data.Data;

-public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger = null)
+public class DownloadData(DataContext dataContext)
 {
    public async Task<List<Download>> GetForTorrent(Guid torrentId)
    {
@ -32,29 +30,8 @@ public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger
                                .FirstOrDefaultAsync(m => m.TorrentId == torrentId && m.Path == path);
    }

-    public async Task<DownloadAddResult> TryAddForTorrent(Guid torrentId, DownloadInfo downloadInfo)
+    public async Task<Download> Add(Guid torrentId, DownloadInfo downloadInfo)
    {
-        if (String.IsNullOrWhiteSpace(downloadInfo.RestrictedLink))
-        {
-            logger?.LogDebug("Skipped download creation because the restricted link was blank. TorrentId: {torrentId}", torrentId);
-
-            return DownloadAddResult.InvalidInput;
-        }
-
-        if (!await dataContext.Torrents.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId))
-        {
-            logger?.LogDebug("Skipped download creation because the torrent no longer exists. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
-
-            return DownloadAddResult.TorrentMissing;
-        }
-
-        if (await dataContext.Downloads.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId && m.Path == downloadInfo.RestrictedLink))
-        {
-            logger?.LogDebug("Skipped download creation because it already exists. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
-
-            return DownloadAddResult.AlreadyExists;
-        }
-
        var download = new Download
        {
            DownloadId = Guid.NewGuid(),
@ -68,36 +45,9 @@ public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger

        await dataContext.Downloads.AddAsync(download);

-        try
-        {
-            await dataContext.SaveChangesAsync();
+        await dataContext.SaveChangesAsync();

-            return DownloadAddResult.Added;
-        }
-
-        // These shouldn't be possible any longer, but added for safety and until confirmed.
-        catch (DbUpdateException ex)
-        {
-            dataContext.Entry(download).State = EntityState.Detached;
-
-            if (IsDuplicateDownloadViolation(ex))
-            {
-                logger?.LogDebug("Skipped download creation after a concurrent duplicate insert. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
-
-                return DownloadAddResult.AlreadyExists;
-            }
-
-            if (IsForeignKeyViolation(ex) && !await dataContext.Torrents.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId))
-            {
-                logger?.LogDebug("Skipped download creation after the torrent was deleted concurrently. TorrentId: {torrentId}, Path: {path}",
-                                 torrentId,
-                                 downloadInfo.RestrictedLink);
-
-                return DownloadAddResult.TorrentMissing;
-            }
-
-            throw;
-        }
+        return download;
    }

    public async Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink)
@ -276,7 +226,7 @@ public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger
        await dataContext.SaveChangesAsync();
    }

-    public async Task Reset(Guid downloadId, DateTimeOffset? downloadQueued = null)
+    public async Task Reset(Guid downloadId)
    {
        var dbDownload = await dataContext.Downloads
                                          .FirstOrDefaultAsync(m => m.DownloadId == downloadId)
@ -285,7 +235,7 @@ public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger
        dbDownload.RetryCount = 0;
        dbDownload.Link = null;
        dbDownload.Added = DateTimeOffset.UtcNow;
-        dbDownload.DownloadQueued = downloadQueued ?? DateTimeOffset.UtcNow;
+        dbDownload.DownloadQueued = DateTimeOffset.UtcNow;
        dbDownload.DownloadStarted = null;
        dbDownload.DownloadFinished = null;
        dbDownload.UnpackingQueued = null;
@ -296,20 +246,4 @@ public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger

        await dataContext.SaveChangesAsync();
    }
-
-    private static Boolean IsDuplicateDownloadViolation(DbUpdateException exception)
-    {
-        var sqliteException = exception.InnerException as SqliteException;
-
-        return sqliteException?.SqliteExtendedErrorCode == 2067
-               || sqliteException?.Message.Contains("UNIQUE constraint failed: Downloads.TorrentId, Downloads.Path", StringComparison.Ordinal) == true;
-    }
-
-    private static Boolean IsForeignKeyViolation(DbUpdateException exception)
-    {
-        var sqliteException = exception.InnerException as SqliteException;
-
-        return sqliteException?.SqliteExtendedErrorCode == 787
-               || sqliteException?.Message.Contains("FOREIGN KEY constraint failed", StringComparison.Ordinal) == true;
-    }
 }
--- a/server/RdtClient.Data/Data/TorrentData.cs
+++ b/server/RdtClient.Data/Data/TorrentData.cs
@ -1,11 +1,10 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;

 namespace RdtClient.Data.Data;

-public class TorrentData(DataContext dataContext, ILogger<TorrentData>? logger = null) : ITorrentData
+public class TorrentData(DataContext dataContext) : ITorrentData
 {
    public async Task<IList<Torrent>> Get()
    {
@ -13,7 +12,6 @@ public class TorrentData(DataContext dataContext, ILogger<TorrentData>? logger =
                                        .AsNoTracking()
                                        .AsSplitQuery()
                                        .Include(m => m.Downloads)
-                                        .OrderBy(m => m.Priority ?? 9999)
                                        .ToListAsync();

        return torrents.OrderBy(m => m.Priority ?? 9999)
@ -288,23 +286,15 @@ public class TorrentData(DataContext dataContext, ILogger<TorrentData>? logger =

    public async Task Delete(Guid torrentId)
    {
-        await using var transaction = await dataContext.Database.BeginTransactionAsync();
+        var dbTorrent = await dataContext.Torrents.FirstOrDefaultAsync(m => m.TorrentId == torrentId);

-        await dataContext.Downloads
-                         .Where(m => m.TorrentId == torrentId)
-                         .ExecuteDeleteAsync();
-
-        var deletedTorrents = await dataContext.Torrents
-                                               .Where(m => m.TorrentId == torrentId)
-                                               .ExecuteDeleteAsync();
-
-        await transaction.CommitAsync();
-
-        if (deletedTorrents == 0)
+        if (dbTorrent == null)
        {
-            logger?.LogDebug("Skipped torrent graph deletion because the torrent was not found. TorrentId: {torrentId}", torrentId);
-
            return;
        }
+
+        dataContext.Torrents.Remove(dbTorrent);
+
+        await dataContext.SaveChangesAsync();
    }
 }
--- a/server/RdtClient.Data/Migrations/20260423031719_Downloads_Add_TorrentIdPath_Unique.cs
+++ b/server/RdtClient.Data/Migrations/20260423031719_Downloads_Add_TorrentIdPath_Unique.cs
@ -1,48 +0,0 @@
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using RdtClient.Data.Data;
-
-#nullable disable
-
-namespace RdtClient.Data.Migrations;
-
-[DbContext(typeof(DataContext))]
-[Migration("20260423031719_Downloads_Add_TorrentIdPath_Unique")]
-public partial class Downloads_Add_TorrentIdPath_Unique : Migration
-{
-    protected override void Up(MigrationBuilder migrationBuilder)
-    {
-        // Orphaned downloads from previous failures.
-        migrationBuilder.Sql("""
-                             DELETE FROM Downloads
-                             WHERE rowid NOT IN (
-                                 SELECT MIN(rowid)
-                                 FROM Downloads
-                                 GROUP BY TorrentId, Path
-                             );
-                             """);
-
-        migrationBuilder.DropIndex(
-            name: "IX_Downloads_TorrentId",
-            table: "Downloads");
-
-        // Prevent accidental duplicates, provides idempotency at the DB level for downloads
-        migrationBuilder.CreateIndex(
-            name: "IX_Downloads_TorrentId_Path",
-            table: "Downloads",
-            columns: ["TorrentId", "Path"],
-            unique: true);
-    }
-
-    protected override void Down(MigrationBuilder migrationBuilder)
-    {
-        migrationBuilder.DropIndex(
-            name: "IX_Downloads_TorrentId_Path",
-            table: "Downloads");
-
-        migrationBuilder.CreateIndex(
-            name: "IX_Downloads_TorrentId",
-            table: "Downloads",
-            column: "TorrentId");
-    }
-}
--- a/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs
+++ b/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs
@ -15,7 +15,7 @@ namespace RdtClient.Data.Migrations
        protected override void BuildModel(ModelBuilder modelBuilder)
        {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.5");
+            modelBuilder.HasAnnotation("ProductVersion", "9.0.9");

            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                {
@ -263,8 +263,7 @@ namespace RdtClient.Data.Migrations

                    b.HasKey("DownloadId");

-                    b.HasIndex("TorrentId", "Path")
-                        .IsUnique();
+                    b.HasIndex("TorrentId");

                    b.ToTable("Downloads");
                });
--- a/server/RdtClient.Data/Models/Data/Torrent.cs
+++ b/server/RdtClient.Data/Models/Data/Torrent.cs
@ -8,10 +8,6 @@ namespace RdtClient.Data.Models.Data;

 public class Torrent
 {
-    private String? _rdFiles;
-    private IList<DebridClientFile> _filesCache = [];
-    private Boolean _filesCacheInitialized;
-
    [Key]
    public Guid TorrentId { get; set; }

@ -63,52 +59,26 @@ public class Torrent
    public DateTimeOffset? RdEnded { get; set; }
    public Int64? RdSpeed { get; set; }
    public Int64? RdSeeders { get; set; }
-
-    public String? RdFiles
-    {
-        get => _rdFiles;
-        set
-        {
-            if (_rdFiles == value)
-            {
-                return;
-            }
-
-            _rdFiles = value;
-            _filesCache = [];
-            _filesCacheInitialized = false;
-        }
-    }
+    public String? RdFiles { get; set; }

    [NotMapped]
    public IList<DebridClientFile> Files
    {
        get
        {
-            if (_filesCacheInitialized)
-            {
-                return _filesCache;
-            }
-
-            _filesCacheInitialized = true;
-
            if (String.IsNullOrWhiteSpace(RdFiles))
            {
-                _filesCache = [];
-
-                return _filesCache;
+                return [];
            }

            try
            {
-                _filesCache = JsonSerializer.Deserialize<List<DebridClientFile>>(RdFiles) ?? [];
+                return JsonSerializer.Deserialize<List<DebridClientFile>>(RdFiles) ?? [];
            }
            catch
            {
-                _filesCache = [];
+                return [];
            }
-
-            return _filesCache;
        }
    }

--- a/server/RdtClient.Data/Models/Internal/TorrentDto.cs
+++ b/server/RdtClient.Data/Models/Internal/TorrentDto.cs
@ -21,7 +21,6 @@ public class TorrentDto
    public DateTimeOffset? FilesSelected { get; set; }
    public DateTimeOffset? Completed { get; set; }
    public DownloadType Type { get; set; }
-    public String? FileOrMagnet { get; set; }
    public Boolean IsFile { get; set; }
    public Int32? Priority { get; set; }
    public Int32 RetryCount { get; set; }
@ -42,9 +41,6 @@ public class TorrentDto
    public DateTimeOffset? RdEnded { get; set; }
    public Int64? RdSpeed { get; set; }
    public Int64? RdSeeders { get; set; }
-    public String StatusText { get; set; } = null!;
-    public Int32 FilesCount { get; set; }
-    public Int32 DownloadsCount { get; set; }
    public IList<DebridClientFile> Files { get; set; } = [];
    public IList<DownloadDto> Downloads { get; set; } = [];
 }
--- a/server/RdtClient.Data/Models/QBittorrent/TorrentFileItem.cs
+++ b/server/RdtClient.Data/Models/QBittorrent/TorrentFileItem.cs
@ -4,21 +4,6 @@ namespace RdtClient.Data.Models.QBittorrent;

 public class TorrentFileItem
 {
-    [JsonPropertyName("index")]
-    public Int32 Index { get; set; }
-
    [JsonPropertyName("name")]
    public String? Name { get; set; }
-
-    [JsonPropertyName("size")]
-    public Int64 Size { get; set; }
-
-    [JsonPropertyName("progress")]
-    public Single Progress { get; set; }
-
-    [JsonPropertyName("priority")]
-    public Int32 Priority { get; set; }
-
-    [JsonPropertyName("is_seed")]
-    public Boolean IsSeed { get; set; }
 }
--- a/server/RdtClient.Data/Models/QBittorrent/TorrentProperties.cs
+++ b/server/RdtClient.Data/Models/QBittorrent/TorrentProperties.cs
@ -13,9 +13,6 @@ public class TorrentProperties
    [JsonPropertyName("completion_date")]
    public Int64? CompletionDate { get; set; }

-    [JsonPropertyName("is_private")]
-    public Boolean IsPrivate { get; set; }
-
    [JsonPropertyName("created_by")]
    public String? CreatedBy { get; set; }

--- a/server/RdtClient.Data/Models/QBittorrent/Tracker.cs
+++ b/server/RdtClient.Data/Models/QBittorrent/Tracker.cs
@ -1,18 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace RdtClient.Data.Models.QBittorrent;
-
-public class Tracker
-{
-    [JsonPropertyName("url")]
-    public required String Url { get; set; }
-
-    [JsonPropertyName("status")]
-    public required String Status { get; set; }
-
-    [JsonPropertyName("num_peers")]
-    public required Int64 NumPeers { get; set; }
-
-    [JsonPropertyName("msg")]
-    public required String Msg { get; set; }
-}
--- a/server/RdtClient.Data/RdtClient.Data.csproj
+++ b/server/RdtClient.Data/RdtClient.Data.csproj
@ -8,11 +8,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs
+++ b/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs
@ -2,7 +2,9 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
+using RdtClient.Data.Data;
 using RdtClient.Data.Models.Data;
+using RdtClient.Data.Models.Internal;
 using RdtClient.Service.BackgroundServices;
 using RdtClient.Service.Services;

@ -15,7 +17,6 @@ public class WatchFolderCheckerTests : IDisposable
    private readonly Mock<IServiceProvider> _serviceProviderMock;
    private readonly Mock<IServiceScope> _serviceScopeMock;
    private readonly String _testPath;
-    private readonly TestSettings _settings;
    private readonly Mock<Torrents> _torrentsServiceMock;

    public WatchFolderCheckerTests()
@ -24,18 +25,7 @@ public class WatchFolderCheckerTests : IDisposable
        _serviceProviderMock = new();
        _serviceScopeMock = new();
        _scopeServiceProviderMock = new();
-
-        _settings = new(new()
-        {
-            Watch = new()
-            {
-                Interval = 0,
-                Default = new()
-            },
-            DownloadClient = new()
-        });
-
-        _torrentsServiceMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
+        _torrentsServiceMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);

        _serviceProviderMock
            .Setup(x => x.GetService(typeof(IServiceScopeFactory)))
@ -52,8 +42,10 @@ public class WatchFolderCheckerTests : IDisposable
        _testPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
        Directory.CreateDirectory(_testPath);

+        // Reset Settings and Startup
        SetStartupReady(true);
-        _settings.Current.Watch.Path = _testPath;
+        ResetSettings();
+        Settings.Get.Watch.Path = _testPath;
    }

    public void Dispose()
@ -70,6 +62,22 @@ public class WatchFolderCheckerTests : IDisposable
        property?.SetValue(null, ready);
    }

+    private static void ResetSettings()
+    {
+        var settings = new DbSettings
+        {
+            Watch = new()
+            {
+                Interval = 0,
+                Default = new()
+            },
+            DownloadClient = new()
+        };
+
+        var property = typeof(SettingData).GetProperty("Get", BindingFlags.Public | BindingFlags.Static);
+        property?.SetValue(null, settings);
+    }
+
    private static void ResetPrevCheck(WatchFolderChecker checker)
    {
        var field = typeof(WatchFolderChecker).GetField("_prevCheck", BindingFlags.NonPublic | BindingFlags.Instance);
@ -84,7 +92,7 @@ public class WatchFolderCheckerTests : IDisposable
        var content = "torrent content"u8.ToArray();
        await File.WriteAllBytesAsync(filePath, content);

-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
        ResetPrevCheck(checker);

        var cts = new CancellationTokenSource();
@ -123,7 +131,7 @@ public class WatchFolderCheckerTests : IDisposable
        var content = "magnet:?xt=urn:btih:123";
        await File.WriteAllTextAsync(filePath, content);

-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
        ResetPrevCheck(checker);

        var cts = new CancellationTokenSource();
@ -162,7 +170,7 @@ public class WatchFolderCheckerTests : IDisposable
        var content = "nzb content"u8.ToArray();
        await File.WriteAllBytesAsync(filePath, content);

-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
        ResetPrevCheck(checker);

        var cts = new CancellationTokenSource();
@ -201,7 +209,7 @@ public class WatchFolderCheckerTests : IDisposable
        var filePath = Path.Combine(_testPath, "test.txt");
        await File.WriteAllTextAsync(filePath, "ignore me");

-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
        ResetPrevCheck(checker);

        var cts = new CancellationTokenSource();
--- a/server/RdtClient.Service.Test/GlobalTestConfig.cs
+++ b/server/RdtClient.Service.Test/GlobalTestConfig.cs
@ -1 +0,0 @@
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
--- a/server/RdtClient.Service.Test/Helpers/DownloadHelperTest.cs
+++ b/server/RdtClient.Service.Test/Helpers/DownloadHelperTest.cs
@ -181,7 +181,16 @@ public class DownloadHelperTest
            FileName = "file.txt"
        };

-        var fileRelativePath = Path.Combine("inside", "lots", "of", "subdirectories", "file.txt");
+        String fileRelativePath;
+
+        if (OSHelper.IsLinux)
+        {
+            fileRelativePath = "inside/lots/of/subdirectories/file.txt";
+        }
+        else
+        {
+            fileRelativePath = @"inside\lots\of\subdirectories\file.txt";
+        }

        IList<DebridClientFile> files =
        [
@ -203,7 +212,7 @@ public class DownloadHelperTest
        var path = DownloadHelper.GetDownloadPath("/data/downloads", torrent, download, fileSystem);

        // Assert
-        var expectedPath = Path.Combine("/data/downloads", torrent.RdName, "inside", "lots", "of", "subdirectories", "file.txt");
+        var expectedPath = Path.Combine("/data/downloads", torrent.RdName, fileRelativePath);
        Assert.Equal(expectedPath, path);
    }

@ -217,7 +226,16 @@ public class DownloadHelperTest
            FileName = "file.txt"
        };

-        var fileRelativePath = Path.Combine("inside", "lots", "of", "subdirectories", "file.txt");
+        String fileRelativePath;
+
+        if (OSHelper.IsLinux)
+        {
+            fileRelativePath = "inside/lots/of/subdirectories/file.txt";
+        }
+        else
+        {
+            fileRelativePath = @"inside\lots\of\subdirectories\file.txt";
+        }

        IList<DebridClientFile> files =
        [
@ -237,78 +255,7 @@ public class DownloadHelperTest
        var path = DownloadHelper.GetDownloadPath(torrent, download);

        // Assert
-        var expectedPath = Path.Combine(torrent.RdName, "inside", "lots", "of", "subdirectories", "file.txt");
-        Assert.Equal(expectedPath, path);
-    }
-
-    [Fact]
-    public void GetDownloadPath_WithPath_WhenFilePathStartsWithTorrentName_StripsPrefix()
-    {
-        // Arrange
-        var download = new Download
-        {
-            Link = "https://fake.url/file.txt",
-            FileName = "file.txt"
-        };
-
-        var fileRelativePath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
-
-        IList<DebridClientFile> files =
-        [
-            new()
-            {
-                Path = fileRelativePath
-            }
-        ];
-
-        var torrent = new Torrent
-        {
-            RdName = "Torrent Name",
-            RdFiles = JsonSerializer.Serialize(files)
-        };
-
-        var fileSystem = new MockFileSystem();
-
-        // Act
-        var path = DownloadHelper.GetDownloadPath("/data/downloads", torrent, download, fileSystem);
-
-        // Assert
-        // The torrent name prefix in the file path should not duplicate the torrent name in the base dir
-        var expectedPath = Path.Combine("/data/downloads", "Torrent Name", "Saison 1", "file.txt");
-        Assert.Equal(expectedPath, path);
-    }
-
-    [Fact]
-    public void GetDownloadPath_WithoutPath_WhenFilePathStartsWithTorrentName_StripsPrefix()
-    {
-        // Arrange
-        var download = new Download
-        {
-            Link = "https://fake.url/file.txt",
-            FileName = "file.txt"
-        };
-
-        var fileRelativePath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
-
-        IList<DebridClientFile> files =
-        [
-            new()
-            {
-                Path = fileRelativePath
-            }
-        ];
-
-        var torrent = new Torrent
-        {
-            RdName = "Torrent Name",
-            RdFiles = JsonSerializer.Serialize(files)
-        };
-
-        // Act
-        var path = DownloadHelper.GetDownloadPath(torrent, download);
-
-        // Assert
-        var expectedPath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
+        var expectedPath = Path.Combine(torrent.RdName, fileRelativePath);
        Assert.Equal(expectedPath, path);
    }

--- a/server/RdtClient.Service.Test/Helpers/OSHelper.cs
+++ b/server/RdtClient.Service.Test/Helpers/OSHelper.cs
@ -0,0 +1,8 @@
+using System.Runtime.InteropServices;
+
+namespace RdtClient.Service.Test.Helpers;
+
+public static class OSHelper
+{
+    public static Boolean IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+}
--- a/server/RdtClient.Service.Test/Helpers/RateLimitCoordinatorTest.cs
+++ b/server/RdtClient.Service.Test/Helpers/RateLimitCoordinatorTest.cs
@ -1,68 +0,0 @@
-using RdtClient.Service.Helpers;
-
-namespace RdtClient.Service.Test.Helpers;
-
-public class RateLimitCoordinatorTest
-{
-    [Fact]
-    public void UpdateCooldown_SetsCooldown()
-    {
-        // Arrange
-        var coordinator = new RateLimitCoordinator();
-        var key = "test.host";
-        var delay = TimeSpan.FromMinutes(5);
-
-        // Act
-        coordinator.UpdateCooldown(key, delay);
-        var remaining = coordinator.GetRemainingCooldown(key);
-
-        // Assert
-        Assert.True(remaining > TimeSpan.FromMinutes(4) && remaining <= TimeSpan.FromMinutes(5));
-    }
-
-    [Fact]
-    public void GetRemainingCooldown_ReturnsZero_WhenNoCooldown()
-    {
-        // Arrange
-        var coordinator = new RateLimitCoordinator();
-        var key = "test.host";
-
-        // Act
-        var remaining = coordinator.GetRemainingCooldown(key);
-
-        // Assert
-        Assert.Equal(TimeSpan.Zero, remaining);
-    }
-
-    [Fact]
-    public void GetMaxNextAllowedAt_ReturnsMax()
-    {
-        // Arrange
-        var coordinator = new RateLimitCoordinator();
-        var now = DateTimeOffset.UtcNow;
-        coordinator.UpdateCooldown("host1", TimeSpan.FromMinutes(10));
-        coordinator.UpdateCooldown("host2", TimeSpan.FromMinutes(20));
-
-        // Act
-        var maxNext = coordinator.GetMaxNextAllowedAt();
-
-        // Assert
-        Assert.NotNull(maxNext);
-        Assert.True(maxNext > now.AddMinutes(19));
-        Assert.True(maxNext < now.AddMinutes(21));
-    }
-
-    [Fact]
-    public void GetMaxNextAllowedAt_ReturnsNull_WhenAllExpired()
-    {
-        // Arrange
-        var coordinator = new RateLimitCoordinator();
-        coordinator.UpdateCooldown("host1", TimeSpan.FromSeconds(-10));
-
-        // Act
-        var maxNext = coordinator.GetMaxNextAllowedAt();
-
-        // Assert
-        Assert.Null(maxNext);
-    }
-}
--- a/server/RdtClient.Service.Test/Helpers/RateLimitHandlerTest.cs
+++ b/server/RdtClient.Service.Test/Helpers/RateLimitHandlerTest.cs
@ -1,5 +1,4 @@
 using System.Net;
-using Moq;
 using RdtClient.Data.Models.Internal;
 using RdtClient.Service.Helpers;

@ -7,13 +6,11 @@ namespace RdtClient.Service.Test.Helpers;

 public class RateLimitHandlerTest
 {
-    private readonly Mock<IRateLimitCoordinator> _coordinatorMock = new();
-
    [Fact]
    public async Task SendAsync_ThrowsRateLimitException_On429WithRetryAfter()
    {
        // Arrange
-        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        var handler = new RateLimitHandler
        {
            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.TooManyRequests, 3600)
        };
@ -23,16 +20,14 @@ public class RateLimitHandlerTest
        // Act & Assert
        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.GetAsync("http://example.com"));
        Assert.Equal(TimeSpan.FromSeconds(3600), ex.RetryAfter);
-        Assert.Contains("rate limit exceeded", ex.Message);
-
-        _coordinatorMock.Verify(m => m.UpdateCooldown("example.com", TimeSpan.FromSeconds(3600)), Times.Once);
+        Assert.Equal("TorBox rate limit exceeded", ex.Message);
    }

    [Fact]
    public async Task SendAsync_ThrowsRateLimitException_On429WithoutRetryAfter()
    {
        // Arrange
-        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        var handler = new RateLimitHandler
        {
            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.TooManyRequests, null)
        };
@ -44,40 +39,6 @@ public class RateLimitHandlerTest
        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
    }

-    [Fact]
-    public async Task SendAsync_ThrowsRateLimitException_WhenCooldownActive()
-    {
-        // Arrange
-        _coordinatorMock.Setup(m => m.GetRemainingCooldown("example.com")).Returns(TimeSpan.FromMinutes(5));
-
-        var handler = new RateLimitHandler(_coordinatorMock.Object)
-        {
-            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.OK, null)
-        };
-
-        var client = new HttpClient(handler);
-
-        // Act & Assert
-        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.GetAsync("http://example.com"));
-        Assert.Equal(TimeSpan.FromMinutes(5), ex.RetryAfter);
-        Assert.Contains("cooldown active", ex.Message);
-    }
-
-    [Fact]
-    public async Task SendAsync_DoesNotCatchTimeoutException()
-    {
-        // Arrange
-        var handler = new RateLimitHandler(_coordinatorMock.Object)
-        {
-            InnerHandler = new MockExceptionHandler(new TimeoutException())
-        };
-
-        var client = new HttpClient(handler);
-
-        // Act & Assert
-        await Assert.ThrowsAsync<TimeoutException>(() => client.GetAsync("http://example.com"));
-    }
-
    private class MockHttpMessageHandler(HttpStatusCode statusCode, Int32? retryAfterSeconds) : HttpMessageHandler
    {
        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
@ -92,12 +53,4 @@ public class RateLimitHandlerTest
            return Task.FromResult(response);
        }
    }
-
-    private class MockExceptionHandler(Exception ex) : HttpMessageHandler
-    {
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            throw ex;
-        }
-    }
 }
--- a/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj
+++ b/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj
@ -5,24 +5,23 @@
        <ImplicitUsings>enable</ImplicitUsings>
        <Nullable>enable</Nullable>
        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
        <AssemblyName>RdtClient.Service.Test</AssemblyName>
        <RootNamespace>RdtClient.Service.Test</RootNamespace>
    </PropertyGroup>

    <ItemGroup>
        <PackageReference Include="AllDebrid.NET" Version="1.0.18" />
-        <PackageReference Include="coverlet.collector" Version="10.0.1">
+        <PackageReference Include="coverlet.collector" Version="8.0.0">
          <PrivateAssets>all</PrivateAssets>
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
        <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="SharpCompress" Version="[0.42.1]" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.1" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.1" />
-        <PackageReference Include="TorBox.NET" Version="2.1.0" />
+        <PackageReference Include="SharpCompress" Version="0.42.1" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.0" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
+        <PackageReference Include="TorBox.NET" Version="1.6.2" />
        <PackageReference Include="xunit" Version="2.9.3" />
        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
          <PrivateAssets>all</PrivateAssets>
@ -38,4 +37,10 @@
      <ProjectReference Include="..\RdtClient.Service\RdtClient.Service.csproj" />
    </ItemGroup>

+    <ItemGroup>
+      <Reference Include="TorBoxNET">
+        <HintPath>..\..\..\torbox-net\TorBoxNET\bin\Release\netstandard2.0\TorBoxNET.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
 </Project>
--- a/server/RdtClient.Service.Test/Regression/TorrentDownloadRaceTests.cs
+++ b/server/RdtClient.Service.Test/Regression/TorrentDownloadRaceTests.cs
@ -1,186 +0,0 @@
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using RdtClient.Data.Data;
-using RdtClient.Data.Models.Data;
-
-namespace RdtClient.Service.Test.Regression;
-
-public class TorrentDownloadRaceTests : IAsyncLifetime
-{
-    private readonly String _databasePath = Path.Combine(Path.GetTempPath(), $"rdt-client-race-{Guid.NewGuid():N}.sqlite");
-
-    [Fact]
-    public async Task Add_WhenTorrentIsDeletedAfterItWasRead_DoesNotThrowAndDoesNotInsertDownload()
-    {
-        var torrentId = await SeedTorrentAsync();
-
-        await using (var readerContext = CreateContext())
-        {
-            var torrentData = new TorrentData(readerContext);
-            var torrent = await torrentData.GetById(torrentId);
-
-            Assert.NotNull(torrent);
-        }
-
-        await using (var deleteContext = CreateContext())
-        {
-            var torrentData = new TorrentData(deleteContext);
-            await torrentData.Delete(torrentId);
-        }
-
-        DownloadAddResult result;
-
-        await using (var addContext = CreateContext())
-        {
-            var downloadData = new DownloadData(addContext);
-            result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-a"));
-        }
-
-        Assert.Equal(DownloadAddResult.TorrentMissing, result);
-
-        await using var verifyContext = CreateContext();
-        Assert.False(await verifyContext.Torrents.AnyAsync(m => m.TorrentId == torrentId));
-        Assert.False(await verifyContext.Downloads.AnyAsync());
-    }
-
-    [Fact]
-    public async Task Delete_WhenDownloadIsInsertedBetweenChildAndParentDelete_DoesNotThrowAndRemovesTorrentGraph()
-    {
-        var torrentId = await SeedTorrentAsync();
-
-        await using (var deleteChildrenContext = CreateContext())
-        {
-            var downloadData = new DownloadData(deleteChildrenContext);
-            await downloadData.DeleteForTorrent(torrentId);
-        }
-
-        await using (var addContext = CreateContext())
-        {
-            var downloadData = new DownloadData(addContext);
-            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-b"));
-            Assert.Equal(DownloadAddResult.Added, result);
-        }
-
-        Exception? exception;
-
-        await using (var deleteParentContext = CreateContext())
-        {
-            var torrentData = new TorrentData(deleteParentContext);
-            exception = await Record.ExceptionAsync(() => torrentData.Delete(torrentId));
-        }
-
-        Assert.Null(exception);
-
-        await using var verifyContext = CreateContext();
-        Assert.False(await verifyContext.Torrents.AnyAsync(m => m.TorrentId == torrentId));
-        Assert.False(await verifyContext.Downloads.AnyAsync(m => m.TorrentId == torrentId));
-    }
-
-    [Fact]
-    public async Task TryAddForTorrent_WhenDownloadAlreadyExists_DoesNotInsertDuplicate()
-    {
-        var torrentId = await SeedTorrentAsync();
-
-        await using (var firstContext = CreateContext())
-        {
-            var downloadData = new DownloadData(firstContext);
-            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-c"));
-
-            Assert.Equal(DownloadAddResult.Added, result);
-        }
-
-        await using (var secondContext = CreateContext())
-        {
-            var downloadData = new DownloadData(secondContext);
-            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-c"));
-
-            Assert.Equal(DownloadAddResult.AlreadyExists, result);
-        }
-
-        await using var verifyContext = CreateContext();
-        Assert.Equal(1, await verifyContext.Downloads.CountAsync(m => m.TorrentId == torrentId));
-    }
-
-    [Fact]
-    public async Task Delete_WhenTorrentWasAlreadyDeleted_DoesNotThrow()
-    {
-        var torrentId = await SeedTorrentAsync();
-
-        await using (var firstDeleteContext = CreateContext())
-        {
-            var torrentData = new TorrentData(firstDeleteContext);
-            await torrentData.Delete(torrentId);
-        }
-
-        Exception? exception;
-
-        await using (var secondDeleteContext = CreateContext())
-        {
-            var torrentData = new TorrentData(secondDeleteContext);
-            exception = await Record.ExceptionAsync(() => torrentData.Delete(torrentId));
-        }
-
-        Assert.Null(exception);
-    }
-
-    public async Task InitializeAsync()
-    {
-        await using var context = CreateContext();
-        await context.Database.EnsureDeletedAsync();
-        await context.Database.EnsureCreatedAsync();
-    }
-
-    public Task DisposeAsync()
-    {
-        SqliteConnection.ClearAllPools();
-
-        if (File.Exists(_databasePath))
-        {
-            File.Delete(_databasePath);
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private DataContext CreateContext()
-    {
-        var connectionString = new SqliteConnectionStringBuilder
-        {
-            DataSource = _databasePath,
-            ForeignKeys = true
-        }.ToString();
-
-        var options = new DbContextOptionsBuilder<DataContext>()
-                      .UseSqlite(connectionString)
-                      .Options;
-
-        return new(options);
-    }
-
-    private async Task<Guid> SeedTorrentAsync()
-    {
-        var torrentId = Guid.NewGuid();
-
-        await using var context = CreateContext();
-
-        context.Torrents.Add(new()
-        {
-            TorrentId = torrentId,
-            Hash = Guid.NewGuid().ToString("N"),
-            Added = DateTimeOffset.UtcNow
-        });
-
-        await context.SaveChangesAsync();
-
-        return torrentId;
-    }
-
-    private static DownloadInfo CreateDownloadInfo(String suffix)
-    {
-        return new()
-        {
-            FileName = $"download-{suffix}.bin",
-            RestrictedLink = $"https://example.invalid/{suffix}"
-        };
-    }
-}
--- a/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs
+++ b/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs
@ -3,7 +3,6 @@ using System.Text;
 using Moq;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
-using TorrentRunnerState = RdtClient.Service.Services.TorrentRunnerState;
 using TorrentsService = RdtClient.Service.Services.Torrents;

 namespace RdtClient.Service.Test.Services;
@ -29,9 +28,7 @@ public class NzbTorrentsTest
                        null!,
                        null!,
                        null!,
-                        null!,
-                        new TestSettings(),
-                        new TorrentRunnerState());
+                        null!);
    }

    [Fact]
--- a/server/RdtClient.Service.Test/Services/QBittorrentTest.cs
+++ b/server/RdtClient.Service.Test/Services/QBittorrentTest.cs
@ -1,9 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Moq;
-using System.Text.Json;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
-using RdtClient.Data.Models.DebridClient;
 using RdtClient.Service.Services;

 namespace RdtClient.Service.Test.Services;
@ -13,19 +11,15 @@ public class QBittorrentTest
    private readonly Mock<Authentication> _authenticationMock;
    private readonly Mock<ILogger<QBittorrent>> _loggerMock;
    private readonly QBittorrent _qBittorrent;
-    private readonly TestSettings _settings;
-    private readonly TorrentRunnerState _runnerState;
    private readonly Mock<Torrents> _torrentsMock;

    public QBittorrentTest()
    {
        _loggerMock = new();
-        _settings = new();
-        _runnerState = new();
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, _runnerState);
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
        _authenticationMock = new(null!, null!, null!);

-        _qBittorrent = new(_loggerMock.Object, _settings, _authenticationMock.Object, _torrentsMock.Object, null!, _runnerState);
+        _qBittorrent = new(_loggerMock.Object, null!, _authenticationMock.Object, _torrentsMock.Object, null!);
    }

    [Fact]
@ -142,268 +136,4 @@ public class QBittorrentTest
        // Current behavior is (1.0 + 0.8) / 2 = 0.9
        Assert.Equal(0.9f, result[0].Progress);
    }
-
-    [Fact]
-    public async Task TorrentFileContents_ShouldReturnAllFiles_WithIndexesAndPriority()
-    {
-        // Arrange
-        var torrent = new Torrent
-        {
-            Hash = "hash1",
-            Type = DownloadType.Torrent,
-            RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
-            {
-                new()
-                {
-                    Id = 1,
-                    Path = "good.mkv",
-                    Bytes = 1000,
-                    Selected = true
-                },
-                new()
-                {
-                    Id = 2,
-                    Path = "dangerous.exe",
-                    Bytes = 10,
-                    Selected = false
-                }
-            })
-        };
-
-        _torrentsMock.Setup(m => m.GetByHash("hash1")).ReturnsAsync(torrent);
-
-        // Act
-        var result = await _qBittorrent.TorrentFileContents("hash1");
-
-        // Assert
-        Assert.NotNull(result);
-
-        Assert.Collection(result!,
-                          first =>
-                          {
-                              Assert.Equal(0, first.Index);
-                              Assert.Equal("good.mkv", first.Name);
-                              Assert.Equal(1, first.Priority);
-                          },
-                          second =>
-                          {
-                              Assert.Equal(1, second.Index);
-                              Assert.Equal("dangerous.exe", second.Name);
-                              Assert.Equal(0, second.Priority);
-                          });
-    }
-
-    [Fact]
-    public async Task TorrentProperties_ShouldExposePublicTorrentFlag()
-    {
-        // Arrange
-        var torrent = new Torrent
-        {
-            Hash = "hash1",
-            Type = DownloadType.Torrent,
-            Added = DateTimeOffset.UtcNow
-        };
-
-        _torrentsMock.Setup(m => m.GetByHash("hash1")).ReturnsAsync(torrent);
-
-        // Act
-        var result = await _qBittorrent.TorrentProperties("hash1");
-
-        // Assert
-        Assert.NotNull(result);
-        Assert.False(result!.IsPrivate);
-    }
-
-    [Fact]
-    public async Task TorrentInfo_ShouldUseSelectedTopLevelFileName_WhenRootFileAddsOnlyTheExtension()
-    {
-        // Arrange
-        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
-        _settings.Current.DownloadClient.MappedPath = "/data/downloads";
-
-        try
-        {
-            var torrentRootName = "Sample.Show.S01E01.1080p.WEB-DL-GROUP";
-            var selectedFileName = $"{torrentRootName}.mkv";
-
-            var torrent = new Torrent
-            {
-                Hash = "hash1",
-                Category = "tv",
-                Completed = DateTimeOffset.UtcNow,
-                RdName = torrentRootName,
-                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
-                {
-                    new()
-                    {
-                        Id = 1,
-                        Path = $"/{selectedFileName}",
-                        Bytes = 1000,
-                        Selected = true
-                    },
-                    new()
-                    {
-                        Id = 2,
-                        Path = $"/{torrentRootName}.nfo",
-                        Bytes = 10,
-                        Selected = false
-                    }
-                }),
-                Type = DownloadType.Torrent
-            };
-
-            _torrentsMock.Setup(m => m.Get())
-                         .ReturnsAsync(new List<Torrent>
-                         {
-                             torrent
-                         });
-
-            // Act
-            var result = await _qBittorrent.TorrentInfo();
-
-            // Assert
-            Assert.Single(result);
-            Assert.Equal(Path.Combine("/data/downloads", "tv", selectedFileName) + Path.DirectorySeparatorChar, result[0].ContentPath);
-            Assert.Equal(torrentRootName, result[0].Name);
-        }
-        finally
-        {
-            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
-        }
-    }
-
-    [Fact]
-    public async Task TorrentInfo_ShouldUseExistingCompletedContentRoot_WhenSingleFileDirectoryDiffersFromRdName()
-    {
-        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
-        var mappedPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
-        _settings.Current.DownloadClient.MappedPath = mappedPath;
-
-        try
-        {
-            var category = "tv";
-            var selectedFileName = "Sample.Show.S01E02.1080p.WEB-DL-GROUP.mkv";
-            var contentRoot = Path.Combine(mappedPath, category, selectedFileName);
-            Directory.CreateDirectory(contentRoot);
-            await File.WriteAllTextAsync(Path.Combine(contentRoot, selectedFileName), "test");
-
-            var torrent = new Torrent
-            {
-                Hash = "hash1",
-                Category = category,
-                Completed = DateTimeOffset.UtcNow,
-                Downloads = new List<Download>
-                {
-                    new()
-                    {
-                        DownloadId = Guid.NewGuid(),
-                        FileName = selectedFileName,
-                        Link = "https://fake.url/Sample.Show.S01E02.1080p.WEB-DL-GROUP.mkv",
-                        Completed = DateTimeOffset.UtcNow
-                    }
-                },
-                RdName = "tracker.example    -    Sample.Show.S01E02.1080p.WEB-DL-GROUP",
-                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
-                {
-                    new()
-                    {
-                        Id = 1,
-                        Path = $"/{selectedFileName}",
-                        Bytes = 1000,
-                        Selected = true
-                    }
-                }),
-                Type = DownloadType.Torrent
-            };
-
-            _torrentsMock.Setup(m => m.Get())
-                         .ReturnsAsync(new List<Torrent>
-                         {
-                             torrent
-                         });
-
-            var result = await _qBittorrent.TorrentInfo();
-
-            Assert.Single(result);
-            Assert.Equal(contentRoot + Path.DirectorySeparatorChar, result[0].ContentPath);
-        }
-        finally
-        {
-            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
-
-            if (Directory.Exists(mappedPath))
-            {
-                Directory.Delete(mappedPath, true);
-            }
-        }
-    }
-
-    [Fact]
-    public async Task TorrentInfo_ShouldUseExistingCompletedContentRoot_WhenSelectedFileIsNestedUnderDifferentRoot()
-    {
-        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
-        var mappedPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
-        _settings.Current.DownloadClient.MappedPath = mappedPath;
-
-        try
-        {
-            var category = "tv";
-            var rootDirectoryName = "tracker.example - Sample.Show.S01E03.1080p.x265-GROUP.mkv";
-            var nestedDirectoryName = "Sample.Show.S01E03.1080p.x265-GROUP";
-            var fileName = "Sample.Show.S01E03.1080p.x265-GROUP.mkv";
-            var contentRoot = Path.Combine(mappedPath, category, rootDirectoryName);
-            var nestedDirectory = Path.Combine(contentRoot, nestedDirectoryName);
-            Directory.CreateDirectory(nestedDirectory);
-            await File.WriteAllTextAsync(Path.Combine(nestedDirectory, fileName), "test");
-
-            var torrent = new Torrent
-            {
-                Hash = "hash1",
-                Category = category,
-                Completed = DateTimeOffset.UtcNow,
-                Downloads = new List<Download>
-                {
-                    new()
-                    {
-                        DownloadId = Guid.NewGuid(),
-                        FileName = fileName,
-                        Link = "https://fake.url/Sample.Show.S01E03.1080p.x265-GROUP.mkv",
-                        Completed = DateTimeOffset.UtcNow
-                    }
-                },
-                RdName = "tracker.example    -    Sample.Show.S01E03.1080p.x265-GROUP",
-                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
-                {
-                    new()
-                    {
-                        Id = 1,
-                        Path = $"/{nestedDirectoryName}/{fileName}",
-                        Bytes = 1000,
-                        Selected = true
-                    }
-                }),
-                Type = DownloadType.Torrent
-            };
-
-            _torrentsMock.Setup(m => m.Get())
-                         .ReturnsAsync(new List<Torrent>
-                         {
-                             torrent
-                         });
-
-            var result = await _qBittorrent.TorrentInfo();
-
-            Assert.Single(result);
-            Assert.Equal(contentRoot + Path.DirectorySeparatorChar, result[0].ContentPath);
-        }
-        finally
-        {
-            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
-
-            if (Directory.Exists(mappedPath))
-            {
-                Directory.Delete(mappedPath, true);
-            }
-        }
-    }
 }
--- a/server/RdtClient.Service.Test/Services/SabnzbdTest.cs
+++ b/server/RdtClient.Service.Test/Services/SabnzbdTest.cs
@ -1,5 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Moq;
+using RdtClient.Data.Data;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.Internal;
@ -15,13 +16,11 @@ public class SabnzbdTest
    };

    private readonly Mock<ILogger<Sabnzbd>> _loggerMock = new();
-    private readonly TestSettings _settings;
    private readonly Mock<Torrents> _torrentsMock;

    public SabnzbdTest()
    {
-        _settings = new();
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(new List<Torrent>());
    }

@ -51,7 +50,7 @@ public class SabnzbdTest
        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
        _torrentsMock.Setup(t => t.GetDownloadStats(It.IsAny<Guid>())).Returns((0, 1000, 500));

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetQueue();
@ -91,7 +90,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetQueue();
@ -135,7 +134,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetQueue();
@ -187,7 +186,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetQueue();
@ -225,7 +224,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetQueue();
@ -261,7 +260,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetHistory();
@ -276,7 +275,7 @@ public class SabnzbdTest
    {
        // Arrange
        var savePath = @"C:\Downloads";
-        _settings.Current.DownloadClient.MappedPath = savePath;
+        SettingData.Get.DownloadClient.MappedPath = savePath;

        var torrentList = new List<Torrent>
        {
@ -293,7 +292,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetHistory();
@ -309,7 +308,7 @@ public class SabnzbdTest
    {
        // Arrange
        var savePath = @"C:\Downloads";
-        _settings.Current.DownloadClient.MappedPath = savePath;
+        SettingData.Get.DownloadClient.MappedPath = savePath;

        var torrentList = new List<Torrent>
        {
@ -326,7 +325,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetHistory();
@ -356,7 +355,7 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = await sabnzbd.GetHistory();
@ -366,69 +365,11 @@ public class SabnzbdTest
        Assert.Equal("Failed", result.Slots[0].Status);
    }

-    [Theory]
-    [InlineData(TorrentFinishedAction.RemoveAllTorrents, true, true, true, true)]
-    [InlineData(TorrentFinishedAction.RemoveAllTorrents, false, true, true, false)]
-    [InlineData(TorrentFinishedAction.RemoveRealDebrid, true, false, true, true)]
-    [InlineData(TorrentFinishedAction.RemoveRealDebrid, false, false, true, false)]
-    [InlineData(TorrentFinishedAction.RemoveClient, true, true, false, true)]
-    [InlineData(TorrentFinishedAction.RemoveClient, false, true, false, false)]
-    public async Task Delete_ShouldRespectFinishedActionAndDeleteFiles(
-        TorrentFinishedAction finishedAction,
-        Boolean deleteFiles,
-        Boolean expectedDeleteData,
-        Boolean expectedDeleteRdTorrent,
-        Boolean expectedDeleteLocalFiles)
-    {
-        // Arrange
-        var torrentId = Guid.NewGuid();
-        _settings.Current.Integrations.Default.FinishedAction = finishedAction;
-
-        _torrentsMock.Setup(t => t.GetByHash("hash1"))
-                     .ReturnsAsync(new Torrent
-                     {
-                         TorrentId = torrentId,
-                         Hash = "hash1",
-                         Type = DownloadType.Nzb
-                     });
-
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
-
-        // Act
-        await sabnzbd.Delete("hash1", deleteFiles);
-
-        // Assert
-        _torrentsMock.Verify(t => t.Delete(torrentId, expectedDeleteData, expectedDeleteRdTorrent, expectedDeleteLocalFiles), Times.Once);
-    }
-
-    [Fact]
-    public async Task Delete_ShouldNotDelete_WhenFinishedActionIsNone()
-    {
-        // Arrange
-        _settings.Current.Integrations.Default.FinishedAction = TorrentFinishedAction.None;
-
-        _torrentsMock.Setup(t => t.GetByHash("hash1"))
-                     .ReturnsAsync(new Torrent
-                     {
-                         TorrentId = Guid.NewGuid(),
-                         Hash = "hash1",
-                         Type = DownloadType.Nzb
-                     });
-
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
-
-        // Act
-        await sabnzbd.Delete("hash1", true);
-
-        // Assert
-        _torrentsMock.Verify(t => t.Delete(It.IsAny<Guid>(), It.IsAny<Boolean>(), It.IsAny<Boolean>(), It.IsAny<Boolean>()), Times.Never);
-    }
-
    [Fact]
    public void GetConfig_ShouldReturnCorrectConfig()
    {
        // Arrange
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = sabnzbd.GetConfig();
@ -458,9 +399,9 @@ public class SabnzbdTest

        _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);

-        _settings.Current.General.Categories = "TV, Music, *";
+        SettingData.Get.General.Categories = "TV, Music, *";

-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);

        // Act
        var result = sabnzbd.GetCategories();
--- a/server/RdtClient.Service.Test/Services/TorrentClients/PremiumizeDebridClientTest.cs
+++ b/server/RdtClient.Service.Test/Services/TorrentClients/PremiumizeDebridClientTest.cs
@ -1,225 +0,0 @@
-using System.Net;
-using System.Text;
-using Microsoft.Extensions.Logging;
-using Moq;
-using RdtClient.Data.Models.Internal;
-using RdtClient.Service.Services;
-using RdtClient.Service.Services.DebridClients;
-
-namespace RdtClient.Service.Test.Services.TorrentClients;
-
-public class PremiumizeDebridClientTest
-{
-    private readonly Mock<IDownloadableFileFilter> _fileFilterMock;
-    private readonly Mock<IHttpClientFactory> _httpClientFactoryMock;
-    private readonly Mock<ILogger<PremiumizeDebridClient>> _loggerMock;
-    private readonly TestSettings _settings;
-
-    public PremiumizeDebridClientTest()
-    {
-        _loggerMock = new();
-        _httpClientFactoryMock = new();
-        _fileFilterMock = new();
-        _settings = new();
-        _settings.Current.Provider.ApiKey = "test-api-key";
-    }
-
-    [Fact]
-    public async Task AddNzbLink_UsesPremiumizeNetTransferCreate_ReturnsTransferId()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"transfer-id","name":"test.nzb"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var result = await client.AddNzbLink("http://example.com/test.nzb");
-
-        // Assert
-        Assert.Equal("transfer-id", result);
-        Assert.Equal(HttpMethod.Post, handler.Request!.Method);
-        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request.RequestUri!.ToString());
-        Assert.Null(handler.Request.Headers.Authorization);
-        Assert.Equal("application/x-www-form-urlencoded", handler.Request.Content!.Headers.ContentType!.MediaType);
-        Assert.Equal("src=http%3A%2F%2Fexample.com%2Ftest.nzb&folder_id=", handler.RequestBody);
-    }
-
-    [Fact]
-    public async Task AddNzbFile_SubmitsMultipartTransferCreateRequest_ReturnsTransferId()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"test.nzb"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var result = await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "test.nzb");
-
-        // Assert
-        Assert.Equal("file-transfer-id", result);
-        Assert.Equal(HttpMethod.Post, handler.Request!.Method);
-        Assert.Equal("https://www.premiumize.me/api/transfer/create", handler.Request.RequestUri!.ToString());
-        Assert.Equal("Bearer", handler.Request.Headers.Authorization!.Scheme);
-        Assert.Equal("test-api-key", handler.Request.Headers.Authorization.Parameter);
-        Assert.Equal("multipart/form-data", handler.Request.Content!.Headers.ContentType!.MediaType);
-        Assert.Contains("Content-Disposition: form-data", handler.RequestBody);
-        Assert.Contains("src", handler.RequestBody);
-        Assert.Contains("test.nzb", handler.RequestBody);
-        Assert.Contains("nzb body", handler.RequestBody);
-    }
-
-    [Fact]
-    public async Task AddNzbFile_WhenNameIsMissing_UsesDefaultFilename()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"upload.nzb"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), null);
-
-        // Assert
-        Assert.Contains("upload.nzb", handler.RequestBody);
-    }
-
-    [Fact]
-    public async Task AddNzbFile_WhenNameHasNoNzbExtension_AppendsNzbExtension()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"release-title.nzb"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "release-title");
-
-        // Assert
-        Assert.Contains("release-title.nzb", handler.RequestBody);
-    }
-
-    [Fact]
-    public async Task AddNzbLink_WhenSuccessResponseHasNoId_Throws()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","name":"test.nzb"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var ex = await Assert.ThrowsAsync<Exception>(() => client.AddNzbLink("http://example.com/test.nzb"));
-
-        // Assert
-        Assert.Contains("Unable to add NZB link", ex.Message);
-    }
-
-    [Fact]
-    public async Task AddNzbLink_WhenPremiumizeReturnsRateLimitError_ThrowsRateLimitException()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"error","code":"slow_down","message":"rate limit exceeded"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbLink("http://example.com/test.nzb"));
-
-        // Assert
-        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
-    }
-
-    [Theory]
-    [InlineData("You've made too many API requests too quickly.")]
-    [InlineData("Your fair-use points, booster points, or active-job count is exhausted.")]
-    [InlineData("This account's usage limit for this service has been reached.")]
-    [InlineData("The target service is unreachable right now. Retry after a delay.")]
-    public async Task AddNzbLink_WhenPremiumizeNetReturnsDocumentedRetryMessage_ThrowsRateLimitException(String message)
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse($$"""{"status":"error","message":"{{message}}","code":"rate_limit_reached"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbLink("http://example.com/test.nzb"));
-
-        // Assert
-        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
-    }
-
-    [Theory]
-    [InlineData("rate_limit_reached")]
-    [InlineData("account_limit_reached")]
-    [InlineData("service_limit_reached")]
-    [InlineData("service_down")]
-    [InlineData("semi_permanent_error")]
-    public async Task AddNzbFile_WhenPremiumizeReturnsDocumentedRetryCode_ThrowsRateLimitException(String code)
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse($$"""{"status":"error","code":"{{code}}","message":"retry later"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "test.nzb"));
-
-        // Assert
-        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
-    }
-
-    [Fact]
-    public async Task AddTorrentMagnet_UsesPremiumizeNetTransferCreate_ReturnsTransferId()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"magnet-transfer-id","name":"test"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var result = await client.AddTorrentMagnet("magnet:?xt=urn:btih:test");
-
-        // Assert
-        Assert.Equal("magnet-transfer-id", result);
-        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request!.RequestUri!.ToString());
-        Assert.Equal("src=magnet%3A%3Fxt%3Durn%3Abtih%3Atest&folder_id=", handler.RequestBody);
-    }
-
-    [Fact]
-    public async Task AddTorrentFile_UsesPremiumizeNetFileUpload_ReturnsTransferId()
-    {
-        // Arrange
-        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"torrent-transfer-id","name":"test"}"""));
-        var client = CreateClient(handler);
-
-        // Act
-        var result = await client.AddTorrentFile(Encoding.UTF8.GetBytes("torrent body"));
-
-        // Assert
-        Assert.Equal("torrent-transfer-id", result);
-        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request!.RequestUri!.ToString());
-        Assert.Contains("name=file", handler.RequestBody);
-        Assert.Contains("filename=1.torrent", handler.RequestBody);
-        Assert.Contains("application/x-bittorrent", handler.RequestBody);
-        Assert.Contains("torrent body", handler.RequestBody);
-    }
-
-    private PremiumizeDebridClient CreateClient(RecordingHttpMessageHandler handler)
-    {
-        _httpClientFactoryMock.Setup(m => m.CreateClient(It.IsAny<String>())).Returns(new HttpClient(handler));
-
-        return new(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _settings);
-    }
-
-    private static HttpResponseMessage JsonResponse(String json, HttpStatusCode statusCode = HttpStatusCode.OK)
-    {
-        return new(statusCode)
-        {
-            Content = new StringContent(json, Encoding.UTF8, "application/json")
-        };
-    }
-
-    private class RecordingHttpMessageHandler(Func<HttpRequestMessage, HttpResponseMessage> handler) : HttpMessageHandler
-    {
-        public HttpRequestMessage? Request { get; private set; }
-        public String? RequestBody { get; private set; }
-
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            Request = request;
-            RequestBody = request.Content == null ? null : await request.Content.ReadAsStringAsync(cancellationToken);
-
-            return handler(request);
-        }
-    }
-}
--- a/server/RdtClient.Service.Test/Services/TorrentClients/TorBoxDebridClientTest.cs
+++ b/server/RdtClient.Service.Test/Services/TorrentClients/TorBoxDebridClientTest.cs
@ -6,7 +6,6 @@ using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.DebridClient;
 using RdtClient.Data.Models.Internal;
-using RdtClient.Service.Helpers;
 using RdtClient.Service.Services;
 using RdtClient.Service.Services.DebridClients;
 using TorBoxNET;
@ -17,25 +16,21 @@ namespace RdtClient.Service.Test.Services.TorrentClients;

 public class TorBoxDebridClientTest
 {
-    private readonly Mock<IRateLimitCoordinator> _coordinatorMock;
    private readonly Mock<IDownloadableFileFilter> _fileFilterMock;
    private readonly Mock<IHttpClientFactory> _httpClientFactoryMock;
    private readonly Mock<ILogger<TorBoxDebridClient>> _loggerMock;
-    private readonly TestSettings _settings;

    public TorBoxDebridClientTest()
    {
        _loggerMock = new();
        _httpClientFactoryMock = new();
        _fileFilterMock = new();
-        _coordinatorMock = new();
-        _settings = new();

        var httpClient = new HttpClient();
        _httpClientFactoryMock.Setup(m => m.CreateClient(It.IsAny<String>())).Returns(httpClient);

-        _settings.Current.Provider.ApiKey = "test-api-key";
-        _settings.Current.Provider.Timeout = 100;
+        Settings.Get.Provider.ApiKey = "test-api-key";
+        Settings.Get.Provider.Timeout = 100;
    }

    [Fact]
@ -46,7 +41,6 @@ public class TorBoxDebridClientTest
        {
            new()
            {
-                Id = 12345,
                Hash = "hash1",
                Name = "torrent1",
                Size = 1000,
@ -67,7 +61,7 @@ public class TorBoxDebridClientTest
            }
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        clientMock.Protected().Setup<Task<IEnumerable<TorrentInfoResult>?>>("GetCurrentTorrents").ReturnsAsync(torrents);
        clientMock.Protected().Setup<Task<IEnumerable<TorrentInfoResult>?>>("GetQueuedTorrents").ReturnsAsync(new List<TorrentInfoResult>());
        clientMock.Protected().Setup<Task<IEnumerable<UsenetInfoResult>?>>("GetCurrentUsenet").ReturnsAsync(nzbs);
@ -79,7 +73,7 @@ public class TorBoxDebridClientTest
        // Assert
        Assert.Equal(2, result.Count);

-        var torrentResult = result.FirstOrDefault(r => r.Id == "12345");
+        var torrentResult = result.FirstOrDefault(r => r.Id == "hash1");
        Assert.NotNull(torrentResult);
        Assert.Equal(DownloadType.Torrent, torrentResult.Type);

@ -117,7 +111,7 @@ public class TorBoxDebridClientTest
            }
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(availability);

        // Act
@ -160,7 +154,7 @@ public class TorBoxDebridClientTest
            }
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(torrentAvailability);
        clientMock.Protected().Setup<Task<Response<List<AvailableUsenet?>>>>("GetUsenetAvailability", hash).ReturnsAsync(usenetAvailability);

@ -189,7 +183,7 @@ public class TorBoxDebridClientTest
            Data = new()
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(torrentAvailability);
        clientMock.Protected().Setup<Task<Response<List<AvailableUsenet?>>>>("GetUsenetAvailability", hash).ReturnsAsync(usenetAvailability);

@ -201,27 +195,27 @@ public class TorBoxDebridClientTest
    }

    [Fact]
-    public async Task Delete_CallsTorrentsControlById_WhenTypeIsTorrent()
+    public async Task Delete_CallsTorrentsControl_WhenTypeIsTorrent()
    {
        // Arrange
        var torrent = new Torrent
        {
-            RdId = "12345",
+            RdId = "torrent-id",
            Type = DownloadType.Torrent
        };

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        // Act
        await clientMock.Object.Delete(torrent);

        // Assert
-        torrentsApiMock.Verify(m => m.ControlByIdAsync(12345, "delete", It.IsAny<CancellationToken>()), Times.Once);
+        torrentsApiMock.Verify(m => m.ControlAsync("torrent-id", "delete", It.IsAny<CancellationToken>()), Times.Once);
    }

    [Fact]
@ -235,11 +229,11 @@ public class TorBoxDebridClientTest
        };

        var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        // Act
        await clientMock.Object.Delete(torrent);
@ -261,11 +255,11 @@ public class TorBoxDebridClientTest
        var link = "https://torbox.app/d/123/456";

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        torrentsApiMock.Setup(m => m.RequestDownloadAsync(123, 456, false, It.IsAny<CancellationToken>()))
                       .ReturnsAsync(new Response<String>
@ -294,11 +288,11 @@ public class TorBoxDebridClientTest
        var link = "https://torbox.app/d/123/456";

        var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        usenetApiMock.Setup(m => m.RequestDownloadAsync(123, 456, false, It.IsAny<CancellationToken>()))
                     .ReturnsAsync(new Response<String>
@ -326,7 +320,7 @@ public class TorBoxDebridClientTest
        var name = "test-nzb";
        var usenetApiMock = new Mock<IUsenetApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -334,7 +328,7 @@ public class TorBoxDebridClientTest
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        usenetApiMock.Setup(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), It.IsAny<Boolean>(), It.IsAny<CancellationToken>()))
                     .ReturnsAsync(new Response<UsenetAddResult>
@ -376,20 +370,25 @@ public class TorBoxDebridClientTest
        var torrent = new Torrent
        {
            Hash = "test-hash",
-            RdId = "12345",
            RdFiles = JsonConvert.SerializeObject(files)
        };

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
+
+        torrentsApiMock.Setup(m => m.GetHashInfoAsync("test-hash", true, It.IsAny<CancellationToken>()))
+                       .ReturnsAsync(new TorrentInfoResult
+                       {
+                           Id = 12345
+                       });

        _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);

-        _settings.Current.Provider.PreferZippedDownloads = false;
+        Settings.Get.Provider.PreferZippedDownloads = false;

        // Act
        var result = await clientMock.Object.GetDownloadInfos(torrent);
@ -418,20 +417,25 @@ public class TorBoxDebridClientTest
        var torrent = new Torrent
        {
            Hash = "test-hash",
-            RdId = "12345",
            RdName = "TestTorrent",
            RdFiles = JsonConvert.SerializeObject(files),
            DownloadClient = DownloadClient.Aria2c
        };

-        _settings.Current.Provider.PreferZippedDownloads = true;
+        Settings.Get.Provider.PreferZippedDownloads = true;

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
+
+        torrentsApiMock.Setup(m => m.GetHashInfoAsync("test-hash", true, It.IsAny<CancellationToken>()))
+                       .ReturnsAsync(new TorrentInfoResult
+                       {
+                           Id = 12345
+                       });

        _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);

@ -457,11 +461,11 @@ public class TorBoxDebridClientTest
        var link = "https://torbox.app/fakedl/12345/6789";

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        torrentsApiMock.Setup(m => m.RequestDownloadAsync(12345, 6789, false, It.IsAny<CancellationToken>()))
                       .ReturnsAsync(new Response<String>
@ -489,11 +493,11 @@ public class TorBoxDebridClientTest
        var link = "https://torbox.app/fakedl/12345/zip";

        var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        torrentsApiMock.Setup(m => m.RequestDownloadAsync(12345, 0, true, It.IsAny<CancellationToken>()))
                       .ReturnsAsync(new Response<String>
@ -531,13 +535,13 @@ public class TorBoxDebridClientTest
        };

        var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

-        usenetApiMock.Setup(m => m.GetCurrentAsync(true, 1000, It.IsAny<CancellationToken>()))
+        usenetApiMock.Setup(m => m.GetCurrentAsync(true, It.IsAny<CancellationToken>()))
                     .ReturnsAsync(new List<UsenetInfoResult>
                     {
                         new()
@ -549,7 +553,7 @@ public class TorBoxDebridClientTest

        _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);

-        _settings.Current.Provider.PreferZippedDownloads = false;
+        Settings.Get.Provider.PreferZippedDownloads = false;

        // Act
        var result = await clientMock.Object.GetDownloadInfos(torrent);
@ -572,11 +576,11 @@ public class TorBoxDebridClientTest
        var link = "https://torbox.app/fakedl/98765/4321";

        var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        usenetApiMock.Setup(m => m.RequestDownloadAsync(98765, 4321, false, It.IsAny<CancellationToken>()))
                     .ReturnsAsync(new Response<String>
@ -600,7 +604,7 @@ public class TorBoxDebridClientTest
        var torrentsApiMock = new Mock<ITorrentsApi>();
        var userApiMock = new Mock<IUserApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -609,7 +613,7 @@ public class TorBoxDebridClientTest

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
                   .ReturnsAsync(new Response<User>
@ -640,7 +644,7 @@ public class TorBoxDebridClientTest
        var torrentsApiMock = new Mock<ITorrentsApi>();
        var userApiMock = new Mock<IUserApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -649,7 +653,7 @@ public class TorBoxDebridClientTest

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
                   .ReturnsAsync(new Response<User>
@ -678,7 +682,7 @@ public class TorBoxDebridClientTest
        var torrentsApiMock = new Mock<ITorrentsApi>();
        var userApiMock = new Mock<IUserApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -687,7 +691,7 @@ public class TorBoxDebridClientTest

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
                   .ReturnsAsync(new Response<User>
@ -717,7 +721,7 @@ public class TorBoxDebridClientTest
        var torrentsApiMock = new Mock<ITorrentsApi>();
        var userApiMock = new Mock<IUserApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -726,7 +730,7 @@ public class TorBoxDebridClientTest

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
                   .ReturnsAsync(new Response<User>
@ -760,7 +764,7 @@ public class TorBoxDebridClientTest
        var torrentsApiMock = new Mock<ITorrentsApi>();
        var userApiMock = new Mock<IUserApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -769,7 +773,7 @@ public class TorBoxDebridClientTest

        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
                   .ReturnsAsync(new Response<User>
@ -799,7 +803,7 @@ public class TorBoxDebridClientTest
        var nzbLink = "https://example.com/test.nzb";
        var usenetApiMock = new Mock<IUsenetApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -807,7 +811,7 @@ public class TorBoxDebridClientTest
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        usenetApiMock.Setup(m => m.AddLinkAsync(nzbLink, It.IsAny<Int32>(), It.IsAny<String?>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
                     .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
@ -830,7 +834,7 @@ public class TorBoxDebridClientTest
        var name = "test.nzb";
        var usenetApiMock = new Mock<IUsenetApi>();

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object)
        {
            CallBase = true
        };
@ -838,7 +842,7 @@ public class TorBoxDebridClientTest
        var torBoxClientMock = new Mock<ITorBoxNetClient>();

        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);

        usenetApiMock.Setup(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
                     .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
@ -865,7 +869,7 @@ public class TorBoxDebridClientTest
            Filename = "test-file"
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);

        // Act
        var result = await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
@ -891,7 +895,7 @@ public class TorBoxDebridClientTest
            Filename = "test-torrent"
        };

-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);

        // Act
        await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
@ -904,30 +908,4 @@ public class TorBoxDebridClientTest
                                      It.Is<Func<It.IsAnyType, Exception?, String>>((v, t) => true)),
                           Times.Once);
    }
-
-    [Fact]
-    public async Task UpdateData_SetsProcessingStatus_WhenTorBoxStatusIsUnmappedAndTorrentWasQueued()
-    {
-        // Arrange
-        var torrent = new Torrent
-        {
-            RdId = "test-rd-id",
-            RdStatus = TorrentStatus.Queued,
-            RdName = "test-torrent"
-        };
-
-        var torrentClientTorrent = new DebridClientTorrent
-        {
-            Status = "some-unknown-status",
-            Filename = "test-torrent"
-        };
-
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
-
-        // Act
-        var result = await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
-
-        // Assert
-        Assert.Equal(TorrentStatus.Processing, result.RdStatus);
-    }
 }
--- a/server/RdtClient.Service.Test/Services/TorrentRunnerTest.cs
+++ b/server/RdtClient.Service.Test/Services/TorrentRunnerTest.cs
@ -1,77 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Moq;
-using RdtClient.Data.Data;
-using RdtClient.Data.Enums;
-using RdtClient.Data.Models.Data;
-using RdtClient.Service.Helpers;
-using RdtClient.Service.Services;
-
-namespace RdtClient.Service.Test.Services;
-
-public class TorrentRunnerTest
-{
-    [Fact]
-    public async Task Tick_ShouldNotRequeueCompletedErrorTorrent()
-    {
-        var testSettings = new TestSettings();
-        var runnerState = new TorrentRunnerState();
-
-        testSettings.Current.Provider.ApiKey = "test-api-key";
-        testSettings.Current.Provider.Provider = Provider.RealDebrid;
-        testSettings.Current.Provider.MaxParallelDownloads = 1;
-        testSettings.Current.DownloadClient.DownloadPath = "/downloads";
-
-        var erroredTorrent = new Torrent
-        {
-            TorrentId = Guid.NewGuid(),
-            Hash = "hash-1",
-            RdName = "Torrent 1",
-            FileOrMagnet = "magnet:?xt=urn:btih:hash-1",
-            Type = DownloadType.Torrent,
-            RdStatus = TorrentStatus.Queued,
-            DeleteOnError = 10,
-            Error = "Could not add to provider: Infringing file",
-            Completed = DateTimeOffset.UtcNow.AddMinutes(-5),
-            Downloads = new List<Download>()
-        };
-
-        var torrentDataMock = new Mock<ITorrentData>(MockBehavior.Strict);
-
-        torrentDataMock.Setup(m => m.Get())
-                       .ReturnsAsync(new List<Torrent>
-                       {
-                           erroredTorrent
-                       });
-
-        var torrents = new Torrents(Mock.Of<ILogger<Torrents>>(),
-                                    torrentDataMock.Object,
-                                    Mock.Of<IDownloads>(),
-                                    null!,
-                                    null!,
-                                    null!,
-                                    null!,
-                                    null!,
-                                    null!,
-                                    null!,
-                                    null!,
-                                    testSettings,
-                                    runnerState);
-
-        var torrentRunner = new TorrentRunner(Mock.Of<ILogger<TorrentRunner>>(),
-                                              torrents,
-                                              new(null!),
-                                              new(null!, torrents),
-                                              Mock.Of<IHttpClientFactory>(),
-                                              new RateLimitCoordinator(),
-                                              testSettings,
-                                              runnerState);
-
-        await torrentRunner.Tick();
-
-        torrentDataMock.Verify(m => m.UpdateComplete(It.IsAny<Guid>(),
-                                                     It.IsAny<String?>(),
-                                                     It.IsAny<DateTimeOffset?>(),
-                                                     It.IsAny<Boolean>()),
-                               Times.Never);
-    }
-}
--- a/server/RdtClient.Service.Test/Services/TorrentsTest.cs
+++ b/server/RdtClient.Service.Test/Services/TorrentsTest.cs
@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.IO.Abstractions.TestingHelpers;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
@ -10,6 +9,7 @@ using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.Internal;
 using RdtClient.Service.Services;
+using RdtClient.Service.Test.Helpers;
 using RdtClient.Service.Wrappers;
 using DownloadClient = RdtClient.Data.Enums.DownloadClient;
 using TorrentsService = RdtClient.Service.Services.Torrents;
@ -90,18 +90,23 @@ public class TorrentsTest
        mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
        mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);

-        var category = torrent.Category!;
-        var torrentName = torrent.RdName!;
-        var fileName = downloads[0].FileName!;
+        String downloadPath;
+        String torrentPath;
+        String filePath;

-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        if (OSHelper.IsLinux)
        {
-            settings.DownloadClient.DownloadPath = @"C:\Downloads";
+            downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
+            torrentPath = $"{downloadPath}/{torrent.RdName}";
+            filePath = $"{torrentPath}/{downloads[0].FileName}";
+        }
+        else
+        {
+            Settings.Get.DownloadClient.DownloadPath = settings.DownloadClient.DownloadPath = @"C:\Downloads";
+            downloadPath = @$"{settings.DownloadClient.DownloadPath}\{torrent.Category}";
+            torrentPath = @$"{downloadPath}\{torrent.RdName}";
+            filePath = @$"{torrentPath}\{downloads[0].FileName}";
        }
-
-        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, category);
-        var torrentPath = Path.Combine(downloadPath, torrentName);
-        var filePath = Path.Combine(torrentPath, fileName);

        var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
        {
@ -120,9 +125,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>())).Returns(true);

@ -167,9 +170,9 @@ public class TorrentsTest
        mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
        mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);

-        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
-        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
-        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
+        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
+        var torrentPath = $"{downloadPath}/{torrent.RdName}";
+        var filePath = $"{torrentPath}/{downloads[0].FileName}";

        var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
        {
@ -188,9 +191,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        //Act
        await torrents.RunTorrentComplete(torrent.TorrentId, settings);
@ -217,9 +218,9 @@ public class TorrentsTest
        mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
        mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);

-        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
-        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
-        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
+        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
+        var torrentPath = $"{downloadPath}/{torrent.RdName}";
+        var filePath = $"{torrentPath}/{downloads[0].FileName}";

        var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
        {
@ -238,9 +239,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>()))
             .Callback(() =>
@ -286,9 +285,9 @@ public class TorrentsTest
        mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
        mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);

-        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
-        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
-        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
+        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
+        var torrentPath = $"{downloadPath}/{torrent.RdName}";
+        var filePath = $"{torrentPath}/{downloads[0].FileName}";

        var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
        {
@ -307,9 +306,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>()))
             .Callback(() =>
@ -372,9 +369,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        // Act
        await torrents.AddNzbFileToDebridQueue(bytes, "filename.nzb", torrent);
@ -422,9 +417,7 @@ public class TorrentsTest
                                           null!,
                                           null!,
                                           null!,
-                                           null!,
-                                           new TestSettings(),
-                                           new TorrentRunnerState());
+                                           null!);

        // Act
        await torrents.AddNzbLinkToDebridQueue(link, torrent);
--- a/server/RdtClient.Service.Test/TestSettings.cs
+++ b/server/RdtClient.Service.Test/TestSettings.cs
@ -1,59 +0,0 @@
-using RdtClient.Data.Models.Internal;
-using RdtClient.Service.Services;
-
-namespace RdtClient.Service.Test;
-
-internal sealed class TestSettings(DbSettings? settings = null) : ISettings
-{
-    public DbSettings Current { get; } = settings ?? new();
-
-    public String DefaultSavePath
-    {
-        get
-        {
-            var downloadPath = Current.DownloadClient.MappedPath.TrimEnd('\\').TrimEnd('/');
-
-            return downloadPath + Path.DirectorySeparatorChar;
-        }
-    }
-
-    public IList<SettingProperty> GetAll()
-    {
-        return [];
-    }
-
-    public Task Update(IList<SettingProperty> settings)
-    {
-        return Task.CompletedTask;
-    }
-
-    public Task Update(String settingId, Object? value)
-    {
-        SetValue(Current, settingId.Split(':'), 0, value);
-
-        return Task.CompletedTask;
-    }
-
-    private static void SetValue(Object target, IReadOnlyList<String> path, Int32 index, Object? value)
-    {
-        var property = target.GetType().GetProperty(path[index]) ?? throw new($"Unknown setting {String.Join(":", path)}");
-
-        if (index < path.Count - 1)
-        {
-            SetValue(property.GetValue(target)!, path, index + 1, value);
-
-            return;
-        }
-
-        if (value == null)
-        {
-            property.SetValue(target, null);
-
-            return;
-        }
-
-        var propertyType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
-        var convertedValue = propertyType.IsEnum ? Enum.Parse(propertyType, value.ToString()!) : Convert.ChangeType(value, propertyType);
-        property.SetValue(target, convertedValue);
-    }
-}
--- a/server/RdtClient.Service/BackgroundServices/DiskSpaceMonitor.cs
+++ b/server/RdtClient.Service/BackgroundServices/DiskSpaceMonitor.cs
@ -8,7 +8,7 @@ using DownloadClient = RdtClient.Data.Enums.DownloadClient;

 namespace RdtClient.Service.BackgroundServices;

-public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider serviceProvider, ISettings settings, ITorrentRunnerState runnerState) : BackgroundService
+public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider serviceProvider) : BackgroundService
 {
    private static DiskSpaceStatus? _lastStatus;
    private Boolean _isPausedForLowDiskSpace;
@ -34,7 +34,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
        {
            try
            {
-                var minimumFreeSpaceGB = settings.Current.DownloadClient.MinimumFreeSpaceGB;
+                var minimumFreeSpaceGB = Settings.Get.DownloadClient.MinimumFreeSpaceGB;

                if (minimumFreeSpaceGB <= 0)
                {
@ -43,14 +43,14 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
                    continue;
                }

-                var intervalMinutes = settings.Current.DownloadClient.DiskSpaceCheckIntervalMinutes;
+                var intervalMinutes = Settings.Get.DownloadClient.DiskSpaceCheckIntervalMinutes;

                if (intervalMinutes < 1)
                {
                    intervalMinutes = 1;
                }

-                var downloadPath = settings.Current.DownloadClient.DownloadPath;
+                var downloadPath = Settings.Get.DownloadClient.DownloadPath;
                logger.LogDebug($"Checking disk space for path: {downloadPath}");

                if (!Directory.Exists(downloadPath))
@ -78,7 +78,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider

                    var pausedCount = 0;

-                    foreach (var download in runnerState.ActiveDownloadClients)
+                    foreach (var download in TorrentRunner.ActiveDownloadClients)
                    {
                        if (download.Value.Type == DownloadClient.Bezzad)
                        {
@ -90,7 +90,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider

                    logger.LogInformation($"Paused {pausedCount} active Bezzad downloads");

-                    runnerState.IsPausedForLowDiskSpace = true;
+                    TorrentRunner.IsPausedForLowDiskSpace = true;
                    _isPausedForLowDiskSpace = true;

                    var status = new DiskSpaceStatus
@ -125,7 +125,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider

                    var resumedCount = 0;

-                    foreach (var download in runnerState.ActiveDownloadClients)
+                    foreach (var download in TorrentRunner.ActiveDownloadClients)
                    {
                        if (download.Value.Type == DownloadClient.Bezzad)
                        {
@ -137,7 +137,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider

                    logger.LogInformation($"Resumed {resumedCount} Bezzad downloads");

-                    runnerState.IsPausedForLowDiskSpace = false;
+                    TorrentRunner.IsPausedForLowDiskSpace = false;
                    _isPausedForLowDiskSpace = false;

                    var status = new DiskSpaceStatus
--- a/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs
+++ b/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs
@ -7,7 +7,7 @@ using RdtClient.Service.Services;

 namespace RdtClient.Service.BackgroundServices;

-public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider serviceProvider, ISettings settings) : BackgroundService
+public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider serviceProvider) : BackgroundService
 {
    private static DateTime _nextUpdate = DateTime.UtcNow;

@ -18,23 +18,22 @@ public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider s
            await Task.Delay(1000, stoppingToken);
        }

+        using var scope = serviceProvider.CreateScope();
+        var torrentService = scope.ServiceProvider.GetRequiredService<Torrents>();
+        var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
        logger.LogInformation("ProviderUpdater started.");

        while (!stoppingToken.IsCancellationRequested)
        {
-            using var scope = serviceProvider.CreateScope();
-            var torrentService = scope.ServiceProvider.GetRequiredService<Torrents>();
-            var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
-
            try
            {
                var torrents = await torrentService.Get();

-                if (_nextUpdate < DateTime.UtcNow && (settings.Current.Provider.AutoImport || torrents.Any(t => t.RdStatus != TorrentStatus.Finished) || RdtHub.HasConnections))
+                if (_nextUpdate < DateTime.UtcNow && (Settings.Get.Provider.AutoImport || torrents.Any(t => t.RdStatus != TorrentStatus.Finished) || RdtHub.HasConnections))
                {
                    logger.LogDebug($"Updating torrent info from debrid provider");

-                    var updateTime = settings.Current.Provider.CheckInterval * 3;
+                    var updateTime = Settings.Get.Provider.CheckInterval * 3;

                    if (updateTime < 30)
                    {
@ -43,7 +42,7 @@ public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider s

                    if (RdtHub.HasConnections)
                    {
-                        updateTime = settings.Current.Provider.CheckInterval;
+                        updateTime = Settings.Get.Provider.CheckInterval;

                        if (updateTime < 5)
                        {
--- a/server/RdtClient.Service/BackgroundServices/Startup.cs
+++ b/server/RdtClient.Service/BackgroundServices/Startup.cs
@ -1,5 +1,4 @@
 using System.Reflection;
-using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@ -40,9 +39,6 @@ public class Startup(IServiceProvider serviceProvider) : IHostedService

    public Task StopAsync(CancellationToken cancellationToken)
    {
-        Ready = false;
-        SqliteConnection.ClearAllPools();
-
        return Task.CompletedTask;
    }
 }
--- a/server/RdtClient.Service/BackgroundServices/TaskRunner.cs
+++ b/server/RdtClient.Service/BackgroundServices/TaskRunner.cs
@ -16,19 +16,15 @@ public class TaskRunner(ILogger<TaskRunner> logger, IServiceProvider serviceProv
            await Task.Delay(1000, stoppingToken);
        }

+        using var scope = serviceProvider.CreateScope();
+        var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
+
        logger.LogInformation("TaskRunner started.");

-        using (var startupScope = serviceProvider.CreateScope())
-        {
-            var startupRunner = startupScope.ServiceProvider.GetRequiredService<TorrentRunner>();
-            await startupRunner.Initialize();
-        }
+        await torrentRunner.Initialize();

        while (!stoppingToken.IsCancellationRequested)
        {
-            using var scope = serviceProvider.CreateScope();
-            var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
-
            try
            {
                await torrentRunner.Tick();
--- a/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs
+++ b/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs
@ -8,7 +8,7 @@ using LogLevel = Microsoft.Extensions.Logging.LogLevel;

 namespace RdtClient.Service.BackgroundServices;

-public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProvider serviceProvider, ISettings settings) : BackgroundService
+public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProvider serviceProvider) : BackgroundService
 {
    private DateTime _prevCheck = DateTime.MinValue;

@ -28,7 +28,7 @@ public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProv
        {
            try
            {
-                var nextCheck = _prevCheck.AddSeconds(Math.Max(settings.Current.Watch.Interval, 10));
+                var nextCheck = _prevCheck.AddSeconds(Math.Max(Settings.Get.Watch.Interval, 10));

                if (DateTime.Now < nextCheck)
                {
@ -38,25 +38,25 @@ public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProv

                _prevCheck = DateTime.Now;

-                if (String.IsNullOrWhiteSpace(settings.Current.Watch.Path))
+                if (String.IsNullOrWhiteSpace(Settings.Get.Watch.Path))
                {
                    continue;
                }

-                var processedStorePath = Path.Combine(settings.Current.Watch.Path, "processed");
-                var errorStorePath = Path.Combine(settings.Current.Watch.Path, "error");
+                var processedStorePath = Path.Combine(Settings.Get.Watch.Path, "processed");
+                var errorStorePath = Path.Combine(Settings.Get.Watch.Path, "error");

-                if (!String.IsNullOrWhiteSpace(settings.Current.Watch.ProcessedPath))
+                if (!String.IsNullOrWhiteSpace(Settings.Get.Watch.ProcessedPath))
                {
-                    processedStorePath = settings.Current.Watch.ProcessedPath;
+                    processedStorePath = Settings.Get.Watch.ProcessedPath;
                }

-                if (!String.IsNullOrWhiteSpace(settings.Current.Watch.ErrorPath))
+                if (!String.IsNullOrWhiteSpace(Settings.Get.Watch.ErrorPath))
                {
-                    errorStorePath = settings.Current.Watch.ErrorPath;
+                    errorStorePath = Settings.Get.Watch.ErrorPath;
                }

-                var torrentFiles = Directory.GetFiles(settings.Current.Watch.Path, "*.*", SearchOption.TopDirectoryOnly);
+                var torrentFiles = Directory.GetFiles(Settings.Get.Watch.Path, "*.*", SearchOption.TopDirectoryOnly);

                foreach (var torrentFile in torrentFiles)
                {
@ -78,22 +78,22 @@ public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProv

                        var torrent = new Torrent
                        {
-                            DownloadClient = settings.Current.DownloadClient.Client,
-                            Category = settings.Current.Watch.Default.Category,
-                            HostDownloadAction = settings.Current.Watch.Default.HostDownloadAction,
-                            FinishedActionDelay = settings.Current.Watch.Default.FinishedActionDelay,
-                            DownloadAction = settings.Current.Watch.Default.OnlyDownloadAvailableFiles
+                            DownloadClient = Settings.Get.DownloadClient.Client,
+                            Category = Settings.Get.Watch.Default.Category,
+                            HostDownloadAction = Settings.Get.Watch.Default.HostDownloadAction,
+                            FinishedActionDelay = Settings.Get.Watch.Default.FinishedActionDelay,
+                            DownloadAction = Settings.Get.Watch.Default.OnlyDownloadAvailableFiles
                                ? TorrentDownloadAction.DownloadAvailableFiles
                                : TorrentDownloadAction.DownloadAll,
-                            FinishedAction = settings.Current.Watch.Default.FinishedAction,
-                            DownloadMinSize = settings.Current.Watch.Default.MinFileSize,
-                            IncludeRegex = settings.Current.Watch.Default.IncludeRegex,
-                            ExcludeRegex = settings.Current.Watch.Default.ExcludeRegex,
-                            TorrentRetryAttempts = settings.Current.Watch.Default.TorrentRetryAttempts,
-                            DownloadRetryAttempts = settings.Current.Watch.Default.DownloadRetryAttempts,
-                            DeleteOnError = settings.Current.Watch.Default.DeleteOnError,
-                            Lifetime = settings.Current.Watch.Default.TorrentLifetime,
-                            Priority = settings.Current.Watch.Default.Priority > 0 ? settings.Current.Watch.Default.Priority : null
+                            FinishedAction = Settings.Get.Watch.Default.FinishedAction,
+                            DownloadMinSize = Settings.Get.Watch.Default.MinFileSize,
+                            IncludeRegex = Settings.Get.Watch.Default.IncludeRegex,
+                            ExcludeRegex = Settings.Get.Watch.Default.ExcludeRegex,
+                            TorrentRetryAttempts = Settings.Get.Watch.Default.TorrentRetryAttempts,
+                            DownloadRetryAttempts = Settings.Get.Watch.Default.DownloadRetryAttempts,
+                            DeleteOnError = Settings.Get.Watch.Default.DeleteOnError,
+                            Lifetime = Settings.Get.Watch.Default.TorrentLifetime,
+                            Priority = Settings.Get.Watch.Default.Priority > 0 ? Settings.Get.Watch.Default.Priority : null
                        };

                        if (fileInfo.Extension == ".torrent")
--- a/server/RdtClient.Service/DiConfig.cs
+++ b/server/RdtClient.Service/DiConfig.cs
@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Polly;
 using Polly.Timeout;
 using RateLimitHeaders.Polly;
+using RdtClient.Data.Models.Internal;
 using RdtClient.Service.BackgroundServices;
 using RdtClient.Service.Helpers;
 using RdtClient.Service.Middleware;
@ -19,7 +20,6 @@ public static class DiConfig
 {
    public const String RD_CLIENT = "RdClient";
    public const String TORBOX_CLIENT = "TorBoxClient";
-    public const String TORBOX_CLIENT_SLOW = "TorBoxClientSlow";
    public static readonly String UserAgent = $"rdt-client {Assembly.GetEntryAssembly()?.GetName().Version}";

    public static void RegisterRdtServices(this IServiceCollection services)
@ -29,8 +29,6 @@ public static class DiConfig
        services.AddSingleton<IAllDebridNetClientFactory, AllDebridNetClientFactory>();
        services.AddScoped<AllDebridDebridClient>();

-        services.AddSingleton<IRateLimitCoordinator, RateLimitCoordinator>();
-        services.AddSingleton(TorrentRunner.SharedState);
        services.AddSingleton<IProcessFactory, ProcessFactory>();
        services.AddSingleton<IFileSystem, FileSystem>();

@ -42,8 +40,7 @@ public static class DiConfig
        services.AddScoped<Sabnzbd>();
        services.AddScoped<RemoteService>();
        services.AddScoped<RealDebridDebridClient>();
-        services.AddSingleton<Settings>();
-        services.AddSingleton<ISettings>(serviceProvider => serviceProvider.GetRequiredService<Settings>());
+        services.AddScoped<Settings>();
        services.AddScoped<TorBoxDebridClient>();
        services.AddScoped<Torrents>();
        services.AddScoped<TorrentRunner>();
@ -53,7 +50,7 @@ public static class DiConfig
        services.AddSingleton<ITrackerListGrabber, TrackerListGrabber>();
        services.AddSingleton<IEnricher, Enricher>();

-        services.AddScoped<IAuthorizationHandler, AuthSettingHandler>();
+        services.AddSingleton<IAuthorizationHandler, AuthSettingHandler>();
        services.AddScoped<IAuthorizationHandler, SabnzbdHandler>();

        services.AddHostedService<DiskSpaceMonitor>();
@ -86,15 +83,17 @@ public static class DiConfig
        // This likely works for most providers, but should be verified and then the providers changed
        // to this HTTP client for added resilience.
        services.AddHttpClient(TORBOX_CLIENT)
-                .AddResilienceHandler("torbox_client_handler", ConfigureResiliencePipeline);
-
-        services.AddHttpClient(TORBOX_CLIENT_SLOW)
                .AddHttpMessageHandler<RateLimitHandler>()
-                .AddResilienceHandler("torbox_client_handler_slow", ConfigureResiliencePipeline);
+                .AddResilienceHandler("torbox_client_handler", ConfigureResiliencePipeline);
    }

    private static void ConfigureResiliencePipeline(ResiliencePipelineBuilder<HttpResponseMessage> builder)
    {
+        builder.AddTimeout(new TimeoutStrategyOptions
+        {
+            TimeoutGenerator = _ => new(TimeSpan.FromSeconds(Settings.Get.Provider.Timeout))
+        });
+
        builder.AddRateLimitHeaders(options =>
        {
            options.EnableProactiveThrottling = true;
@ -117,12 +116,17 @@ public static class DiConfig
            {
                if (args.Outcome.Result is { StatusCode: HttpStatusCode.TooManyRequests } response)
                {
-                    var delay = RateLimitHandler.GetRetryAfterDelay(response);
-                    var timeout = TimeSpan.FromSeconds(Settings.Get.Provider.Timeout);
+                    var retryAfter = response.Headers.RetryAfter;
+                    var delay = retryAfter?.Delta ?? (retryAfter?.Date.HasValue == true ? retryAfter.Date.Value - DateTimeOffset.UtcNow : TimeSpan.FromMinutes(2));

-                    if (delay >= timeout)
+                    if (delay < TimeSpan.Zero)
                    {
-                        return new((TimeSpan?)null);
+                        delay = TimeSpan.FromMinutes(2);
+                    }
+
+                    if (delay >= TimeSpan.FromSeconds(Settings.Get.Provider.Timeout))
+                    {
+                        throw new RateLimitException("Provider rate limit exceeded", delay);
                    }

                    return new(delay);
@ -131,10 +135,5 @@ public static class DiConfig
                return new((TimeSpan?)null);
            }
        });
-
-        builder.AddTimeout(new TimeoutStrategyOptions
-        {
-            TimeoutGenerator = _ => new(TimeSpan.FromSeconds(Settings.Get.Provider.Timeout))
-        });
    }
 }
--- a/server/RdtClient.Service/Helpers/DownloadHelper.cs
+++ b/server/RdtClient.Service/Helpers/DownloadHelper.cs
@ -38,12 +38,7 @@ public static class DownloadHelper
            {
                subPath = subPath.Trim('/').Trim('\\');

-                subPath = StripTorrentNamePrefix(subPath, directory);
-
-                if (!String.IsNullOrWhiteSpace(subPath))
-                {
-                    torrentPath = Path.Combine(torrentPath, subPath);
-                }
+                torrentPath = Path.Combine(torrentPath, subPath);
            }
        }

@ -92,12 +87,7 @@ public static class DownloadHelper
            {
                subPath = subPath.Trim('/').Trim('\\');

-                subPath = StripTorrentNamePrefix(subPath, torrentPath);
-
-                if (!String.IsNullOrWhiteSpace(subPath))
-                {
-                    torrentPath = Path.Combine(torrentPath, subPath);
-                }
+                torrentPath = Path.Combine(torrentPath, subPath);
            }
        }

@ -127,32 +117,4 @@ public static class DownloadHelper
    {
        return String.Concat(path.Split(Path.GetInvalidPathChars()));
    }
-
-    private static String StripTorrentNamePrefix(String subPath, String torrentName)
-    {
-        var separatorIndex = subPath.IndexOfAny(['/', '\\']);
-
-        String firstComponent;
-        String remainder;
-
-        if (separatorIndex < 0)
-        {
-            firstComponent = subPath;
-            remainder = String.Empty;
-        }
-        else
-        {
-            firstComponent = subPath[..separatorIndex];
-            remainder = subPath[(separatorIndex + 1)..];
-        }
-
-        var normalizedFirst = RemoveInvalidPathChars(firstComponent);
-
-        if (normalizedFirst.Equals(torrentName.TrimEnd('/', '\\'), StringComparison.OrdinalIgnoreCase))
-        {
-            return remainder;
-        }
-
-        return subPath;
-    }
 }
--- a/server/RdtClient.Service/Helpers/IRateLimitCoordinator.cs
+++ b/server/RdtClient.Service/Helpers/IRateLimitCoordinator.cs
@ -1,10 +0,0 @@
-namespace RdtClient.Service.Helpers;
-
-public interface IRateLimitCoordinator
-{
-    TimeSpan GetRemainingCooldown(String key);
-    TimeSpan GetMaxRemainingCooldown();
-    DateTimeOffset? GetMaxNextAllowedAt();
-    void UpdateCooldown(String key, TimeSpan retryAfter);
-    DateTimeOffset? GetNextAllowedAt(String key);
-}
--- a/server/RdtClient.Service/Helpers/RateLimitCoordinator.cs
+++ b/server/RdtClient.Service/Helpers/RateLimitCoordinator.cs
@ -1,94 +0,0 @@
-using System.Collections.Concurrent;
-
-namespace RdtClient.Service.Helpers;
-
-public class RateLimitCoordinator : IRateLimitCoordinator
-{
-    private readonly ConcurrentDictionary<String, DateTimeOffset> _cooldowns = new();
-
-    public TimeSpan GetRemainingCooldown(String key)
-    {
-        if (_cooldowns.TryGetValue(key, out var nextAllowedAt))
-        {
-            var remaining = nextAllowedAt - DateTimeOffset.UtcNow;
-
-            if (remaining > TimeSpan.Zero)
-            {
-                return remaining;
-            }
-
-            _cooldowns.TryRemove(key, out _);
-        }
-
-        return TimeSpan.Zero;
-    }
-
-    public TimeSpan GetMaxRemainingCooldown()
-    {
-        var now = DateTimeOffset.UtcNow;
-        var max = TimeSpan.Zero;
-
-        foreach (var (key, nextAllowedAt) in _cooldowns)
-        {
-            var remaining = nextAllowedAt - now;
-
-            if (remaining > TimeSpan.Zero)
-            {
-                if (remaining > max)
-                {
-                    max = remaining;
-                }
-            }
-            else
-            {
-                _cooldowns.TryRemove(key, out _);
-            }
-        }
-
-        return max;
-    }
-
-    public DateTimeOffset? GetMaxNextAllowedAt()
-    {
-        var now = DateTimeOffset.UtcNow;
-        DateTimeOffset? max = null;
-
-        foreach (var (key, nextAllowedAt) in _cooldowns)
-        {
-            if (nextAllowedAt > now)
-            {
-                if (max == null || nextAllowedAt > max)
-                {
-                    max = nextAllowedAt;
-                }
-            }
-            else
-            {
-                _cooldowns.TryRemove(key, out _);
-            }
-        }
-
-        return max;
-    }
-
-    public void UpdateCooldown(String key, TimeSpan retryAfter)
-    {
-        var nextAllowedAt = DateTimeOffset.UtcNow.Add(retryAfter);
-        _cooldowns.AddOrUpdate(key, nextAllowedAt, (_, existing) => nextAllowedAt > existing ? nextAllowedAt : existing);
-    }
-
-    public DateTimeOffset? GetNextAllowedAt(String key)
-    {
-        if (_cooldowns.TryGetValue(key, out var nextAllowedAt))
-        {
-            if (nextAllowedAt > DateTimeOffset.UtcNow)
-            {
-                return nextAllowedAt;
-            }
-
-            _cooldowns.TryRemove(key, out _);
-        }
-
-        return null;
-    }
-}
--- a/server/RdtClient.Service/Helpers/RateLimitHandler.cs
+++ b/server/RdtClient.Service/Helpers/RateLimitHandler.cs
@ -1,61 +1,37 @@
 using System.Net;
-using Polly;
+using Polly.Timeout;
 using RdtClient.Data.Models.Internal;

 namespace RdtClient.Service.Helpers;

-public class RateLimitHandler(IRateLimitCoordinator coordinator) : DelegatingHandler
+public class RateLimitHandler : DelegatingHandler
 {
-    public static readonly ResiliencePropertyKey<DateTimeOffset> StartTimeKey = new("StartTime");
-
-    public static TimeSpan GetRetryAfterDelay(HttpResponseMessage response)
-    {
-        var retryAfter = response.Headers.RetryAfter;
-        var delay = retryAfter?.Delta ?? (retryAfter?.Date.HasValue == true ? retryAfter.Date.Value - DateTimeOffset.UtcNow : TimeSpan.FromMinutes(2));
-
-        if (delay < TimeSpan.Zero)
-        {
-            delay = TimeSpan.FromMinutes(2);
-        }
-
-        return delay;
-    }
-
    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
    {
-        var host = request.RequestUri?.Host ?? "unknown";
-
-        var cooldown = coordinator.GetRemainingCooldown(host);
-
-        if (cooldown > TimeSpan.Zero)
+        try
        {
-            throw new RateLimitException($"Rate limit cooldown active for {host}", cooldown);
+            var response = await base.SendAsync(request, cancellationToken);
+
+            if (response.StatusCode == HttpStatusCode.TooManyRequests)
+            {
+                var retryAfter = response.Headers.RetryAfter;
+                var delay = retryAfter?.Delta ?? (retryAfter?.Date.HasValue == true ? retryAfter.Date.Value - DateTimeOffset.UtcNow : TimeSpan.FromMinutes(2));
+
+                if (delay < TimeSpan.Zero)
+                {
+                    delay = TimeSpan.FromMinutes(2);
+                }
+
+                response.Dispose();
+
+                throw new RateLimitException("TorBox rate limit exceeded", delay);
+            }
+
+            return response;
        }
-
-        var context = request.GetResilienceContext();
-
-        if (context == null)
+        catch (Exception ex) when (ex is TimeoutRejectedException or TaskCanceledException)
        {
-            context = ResilienceContextPool.Shared.Get(cancellationToken);
-            request.SetResilienceContext(context);
+            throw new RateLimitException("Provider rate limit exceeded (timeout)", TimeSpan.FromMinutes(2));
        }
-
-        if (!context.Properties.TryGetValue(StartTimeKey, out _))
-        {
-            context.Properties.Set(StartTimeKey, DateTimeOffset.UtcNow);
-        }
-
-        var response = await base.SendAsync(request, cancellationToken);
-
-        if (response.StatusCode == HttpStatusCode.TooManyRequests)
-        {
-            var delay = GetRetryAfterDelay(response);
-            coordinator.UpdateCooldown(host, delay);
-            response.Dispose();
-
-            throw new RateLimitException($"Provider {host} rate limit exceeded", delay);
-        }
-
-        return response;
    }
 }
--- a/server/RdtClient.Service/Helpers/TorrentDtoMapper.cs
+++ b/server/RdtClient.Service/Helpers/TorrentDtoMapper.cs
@ -1,232 +0,0 @@
-using RdtClient.Data.Enums;
-using RdtClient.Data.Models.Data;
-using RdtClient.Data.Models.Internal;
-
-namespace RdtClient.Service.Helpers;
-
-public static class TorrentDtoMapper
-{
-    public static TorrentDto ToListDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
-    {
-        return ToDto(torrent, getDownloadStats, includeDownloads: false, includeFiles: false, includeFileOrMagnet: false);
-    }
-
-    public static TorrentDto ToUpdateDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
-    {
-        return ToDto(torrent, getDownloadStats, includeDownloads: true, includeFiles: false, includeFileOrMagnet: false);
-    }
-
-    public static TorrentDto ToDetailDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
-    {
-        return ToDto(torrent, getDownloadStats, includeDownloads: true, includeFiles: true, includeFileOrMagnet: true);
-    }
-
-    private static TorrentDto ToDto(Torrent torrent,
-                                    Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats,
-                                    Boolean includeDownloads,
-                                    Boolean includeFiles,
-                                    Boolean includeFileOrMagnet)
-    {
-        var downloads = includeDownloads ? torrent.Downloads.Select(download => ToDto(download, getDownloadStats)).ToList() : [];
-
-        return new()
-        {
-            TorrentId = torrent.TorrentId,
-            Hash = torrent.Hash,
-            Category = torrent.Category,
-            DownloadAction = torrent.DownloadAction,
-            FinishedAction = torrent.FinishedAction,
-            FinishedActionDelay = torrent.FinishedActionDelay,
-            HostDownloadAction = torrent.HostDownloadAction,
-            DownloadMinSize = torrent.DownloadMinSize,
-            IncludeRegex = torrent.IncludeRegex,
-            ExcludeRegex = torrent.ExcludeRegex,
-            DownloadManualFiles = torrent.DownloadManualFiles,
-            DownloadClient = torrent.DownloadClient,
-            Added = torrent.Added,
-            FilesSelected = torrent.FilesSelected,
-            Completed = torrent.Completed,
-            Type = torrent.Type,
-            FileOrMagnet = includeFileOrMagnet ? torrent.FileOrMagnet : null,
-            IsFile = torrent.IsFile,
-            Priority = torrent.Priority,
-            RetryCount = torrent.RetryCount,
-            DownloadRetryAttempts = torrent.DownloadRetryAttempts,
-            TorrentRetryAttempts = torrent.TorrentRetryAttempts,
-            DeleteOnError = torrent.DeleteOnError,
-            Lifetime = torrent.Lifetime,
-            Error = torrent.Error,
-            RdId = torrent.RdId,
-            RdName = torrent.RdName,
-            RdSize = torrent.RdSize,
-            RdHost = torrent.RdHost,
-            RdSplit = torrent.RdSplit,
-            RdProgress = torrent.RdProgress,
-            RdStatus = torrent.RdStatus,
-            RdStatusRaw = torrent.RdStatusRaw,
-            RdAdded = torrent.RdAdded,
-            RdEnded = torrent.RdEnded,
-            RdSpeed = torrent.RdSpeed,
-            RdSeeders = torrent.RdSeeders,
-            StatusText = GetStatusText(torrent, getDownloadStats),
-            FilesCount = torrent.Files.Count,
-            DownloadsCount = torrent.Downloads.Count,
-            Files = includeFiles ? torrent.Files : [],
-            Downloads = downloads
-        };
-    }
-
-    private static DownloadDto ToDto(Download download, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
-    {
-        var (speed, bytesTotal, bytesDone) = getDownloadStats(download.DownloadId);
-
-        return new()
-        {
-            DownloadId = download.DownloadId,
-            TorrentId = download.TorrentId,
-            Path = download.Path,
-            Link = download.Link,
-            Added = download.Added,
-            DownloadQueued = download.DownloadQueued,
-            DownloadStarted = download.DownloadStarted,
-            DownloadFinished = download.DownloadFinished,
-            UnpackingQueued = download.UnpackingQueued,
-            UnpackingStarted = download.UnpackingStarted,
-            UnpackingFinished = download.UnpackingFinished,
-            Completed = download.Completed,
-            RetryCount = download.RetryCount,
-            Error = download.Error,
-            BytesTotal = bytesTotal,
-            BytesDone = bytesDone,
-            Speed = speed
-        };
-    }
-
-    private static String GetStatusText(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
-    {
-        if (!String.IsNullOrWhiteSpace(torrent.Error))
-        {
-            return torrent.Error;
-        }
-
-        if (torrent.Downloads.Count > 0)
-        {
-            var allFinished = true;
-            var downloadingCount = 0;
-            var downloadedCount = 0;
-            Int64 downloadingBytesDone = 0;
-            Int64 downloadingBytesTotal = 0;
-            Int64 downloadingSpeed = 0;
-            var unpackingCount = 0;
-            var unpackedCount = 0;
-            Int64 unpackingBytesDone = 0;
-            Int64 unpackingBytesTotal = 0;
-            var queuedForUnpackingCount = 0;
-            var queuedForDownloadingCount = 0;
-
-            foreach (var download in torrent.Downloads)
-            {
-                if (download.Completed == null)
-                {
-                    allFinished = false;
-                }
-
-                var (speed, bytesTotal, bytesDone) = getDownloadStats(download.DownloadId);
-
-                if (download.DownloadFinished != null)
-                {
-                    downloadedCount += 1;
-                }
-
-                if (download.DownloadStarted != null && download.DownloadFinished == null && bytesDone > 0)
-                {
-                    downloadingCount += 1;
-                    downloadingBytesDone += bytesDone;
-                    downloadingBytesTotal += bytesTotal;
-                    downloadingSpeed += speed;
-                }
-
-                if (download.UnpackingFinished != null)
-                {
-                    unpackedCount += 1;
-                }
-
-                if (download.UnpackingStarted != null && download.UnpackingFinished == null && bytesDone > 0)
-                {
-                    unpackingCount += 1;
-                    unpackingBytesDone += bytesDone;
-                    unpackingBytesTotal += bytesTotal;
-                }
-
-                if (download.UnpackingQueued != null && download.UnpackingStarted == null)
-                {
-                    queuedForUnpackingCount += 1;
-                }
-
-                if (download.DownloadStarted == null && download.DownloadFinished == null)
-                {
-                    queuedForDownloadingCount += 1;
-                }
-            }
-
-            if (allFinished)
-            {
-                return "Finished";
-            }
-
-            if (downloadingCount > 0)
-            {
-                var progress = downloadingBytesTotal == 0 ? 0 : (Double)downloadingBytesDone / downloadingBytesTotal * 100;
-
-                return $"Downloading file {downloadingCount + downloadedCount}/{torrent.Downloads.Count} ({progress:0.00}% - {FileSizeHelper.FormatSize(downloadingSpeed)}/s)";
-            }
-
-            if (unpackingCount > 0)
-            {
-                var progress = unpackingBytesTotal == 0 ? 0 : (Double)unpackingBytesDone / unpackingBytesTotal * 100;
-
-                return $"Extracting file {unpackingCount + unpackedCount}/{torrent.Downloads.Count} ({progress:0.00}%)";
-            }
-
-            if (queuedForUnpackingCount > 0)
-            {
-                return "Queued for unpacking";
-            }
-
-            if (queuedForDownloadingCount > 0)
-            {
-                return "Queued for downloading";
-            }
-
-            if (unpackedCount > 0)
-            {
-                return "Files unpacked";
-            }
-
-            if (downloadedCount > 0)
-            {
-                return "Files downloaded to host";
-            }
-        }
-
-        if (torrent.Completed != null)
-        {
-            return "Finished";
-        }
-
-        var prefix = torrent.Type == DownloadType.Nzb ? "NZB" : "Torrent";
-
-        return torrent.RdStatus switch
-        {
-            TorrentStatus.Queued => "Not Yet Added to Provider",
-            TorrentStatus.Downloading when torrent.RdSeeders < 1 && torrent.Type != DownloadType.Nzb => "Torrent stalled",
-            TorrentStatus.Downloading => $"{prefix} downloading ({torrent.RdProgress}% - {FileSizeHelper.FormatSize(torrent.RdSpeed)}/s)",
-            TorrentStatus.Processing => $"{prefix} processing",
-            TorrentStatus.WaitingForFileSelection => $"{prefix} waiting for file selection",
-            TorrentStatus.Error => $"{prefix} error: {torrent.RdStatusRaw}",
-            TorrentStatus.Finished => $"{prefix} finished, waiting for download links",
-            TorrentStatus.Uploading => $"{prefix} uploading",
-            _ => "Unknown status"
-        };
-    }
-}
--- a/server/RdtClient.Service/Middleware/AuthSettingHandler.cs
+++ b/server/RdtClient.Service/Middleware/AuthSettingHandler.cs
@ -8,7 +8,7 @@ public class AuthSettingRequirement : IAuthorizationRequirement
 {
 }

-public class AuthSettingHandler(ISettings settings) : AuthorizationHandler<AuthSettingRequirement>
+public class AuthSettingHandler : AuthorizationHandler<AuthSettingRequirement>
 {
    protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, AuthSettingRequirement requirement)
    {
@ -17,7 +17,7 @@ public class AuthSettingHandler(ISettings settings) : AuthorizationHandler<AuthS
            context.Succeed(requirement);
        }

-        if (settings.Current.General.AuthenticationType == AuthenticationType.None)
+        if (Settings.Get.General.AuthenticationType == AuthenticationType.None)
        {
            context.Succeed(requirement);
        }
--- a/server/RdtClient.Service/Middleware/SabnzbdHandler.cs
+++ b/server/RdtClient.Service/Middleware/SabnzbdHandler.cs
@ -9,7 +9,7 @@ public class SabnzbdRequirement : IAuthorizationRequirement
 {
 }

-public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor httpContextAccessor, ISettings settings) : AuthorizationHandler<SabnzbdRequirement>
+public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor httpContextAccessor) : AuthorizationHandler<SabnzbdRequirement>
 {
    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, SabnzbdRequirement requirement)
    {
@ -22,7 +22,7 @@ public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor
            return;
        }

-        if (settings.Current.General.AuthenticationType == AuthenticationType.None)
+        if (Settings.Get.General.AuthenticationType == AuthenticationType.None)
        {
            context.Succeed(requirement);

@ -65,36 +65,6 @@ public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor
                return;
            }

-            var apiKey = GetParam("apikey");
-
-            if (!String.IsNullOrWhiteSpace(apiKey))
-            {
-                var separatorIndex = apiKey.IndexOf(':');
-
-                if (separatorIndex <= 0 || separatorIndex == apiKey.Length - 1)
-                {
-                    context.Fail();
-
-                    return;
-                }
-
-                var username = apiKey[..separatorIndex];
-                var password = apiKey[(separatorIndex + 1)..];
-
-                var loginResult = await authentication.Login(username, password);
-
-                if (loginResult.Succeeded)
-                {
-                    context.Succeed(requirement);
-
-                    return;
-                }
-
-                context.Fail();
-
-                return;
-            }
-
            // Authentication required but missing credentials
            context.Fail();
        }
--- a/server/RdtClient.Service/RdtClient.Service.csproj
+++ b/server/RdtClient.Service/RdtClient.Service.csproj
@ -11,22 +11,22 @@
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
    <PackageReference Include="AllDebrid.NET" Version="1.0.18" />
    <PackageReference Include="Aria2.NET" Version="1.0.6" />
-    <PackageReference Include="DebridLinkFr.NET" Version="2.0.0" />
-    <PackageReference Include="Downloader" Version="5.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.6.0" />
+    <PackageReference Include="DebridLinkFr.NET" Version="1.0.4" />
+    <PackageReference Include="Downloader" Version="4.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
    <PackageReference Include="MonoTorrent" Version="3.0.2" />
-    <PackageReference Include="Polly" Version="8.6.6" />
+    <PackageReference Include="Polly" Version="8.6.5" />
    <PackageReference Include="Premiumize.NET" Version="1.0.10" />
    <PackageReference Include="RateLimitHeaders.Polly" Version="1.0.0" />
    <PackageReference Include="RD.NET" Version="2.1.11" />
    <PackageReference Include="Serilog" Version="4.3.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="SharpCompress" Version="[0.42.1]" />
-    <PackageReference Include="Synology.Api.Client" Version="[0.3.93]" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.1" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.1" />
-    <PackageReference Include="TorBox.NET" Version="2.1.0" />
+    <PackageReference Include="SharpCompress" Version="0.42.1" />
+    <PackageReference Include="Synology.Api.Client" Version="0.3.93" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.0" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
+    <PackageReference Include="TorBox.NET" Version="1.6.2" />
  </ItemGroup>

  <ItemGroup>
--- a/server/RdtClient.Service/Services/DebridClients/AllDebridDebridClient.cs
+++ b/server/RdtClient.Service/Services/DebridClients/AllDebridDebridClient.cs
@ -17,13 +17,13 @@ public interface IAllDebridNetClientFactory
    public IAllDebridNETClient GetClient();
 }

-public class AllDebridNetClientFactory(ILogger<AllDebridNetClientFactory> logger, IHttpClientFactory httpClientFactory, ISettings settings) : IAllDebridNetClientFactory
+public class AllDebridNetClientFactory(ILogger<AllDebridNetClientFactory> logger, IHttpClientFactory httpClientFactory) : IAllDebridNetClientFactory
 {
    public IAllDebridNETClient GetClient()
    {
        try
        {
-            var apiKey = settings.Current.Provider.ApiKey;
+            var apiKey = Settings.Get.Provider.ApiKey;

            if (String.IsNullOrWhiteSpace(apiKey))
            {
--- a/server/RdtClient.Service/Services/DebridClients/DebridLinkTorrentClient.cs
+++ b/server/RdtClient.Service/Services/DebridClients/DebridLinkTorrentClient.cs
@ -12,7 +12,7 @@ using Torrent = DebridLinkFrNET.Models.Torrent;

 namespace RdtClient.Service.Services.DebridClients;

-public class DebridLinkClient(ILogger<DebridLinkClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter, ISettings settings) : IDebridClient
+public class DebridLinkClient(ILogger<DebridLinkClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter) : IDebridClient
 {
    public async Task<IList<DebridClientTorrent>> GetDownloads()
    {
@ -228,7 +228,7 @@ public class DebridLinkClient(ILogger<DebridLinkClient> logger, IHttpClientFacto
    {
        try
        {
-            var apiKey = settings.Current.Provider.ApiKey;
+            var apiKey = Settings.Get.Provider.ApiKey;

            if (String.IsNullOrWhiteSpace(apiKey))
            {
@ -236,7 +236,7 @@ public class DebridLinkClient(ILogger<DebridLinkClient> logger, IHttpClientFacto
            }

            var httpClient = httpClientFactory.CreateClient();
-            httpClient.Timeout = TimeSpan.FromSeconds(settings.Current.Provider.Timeout);
+            httpClient.Timeout = TimeSpan.FromSeconds(Settings.Get.Provider.Timeout);

            var debridLinkClient = new DebridLinkFrNETClient(apiKey, httpClient);

--- a/server/RdtClient.Service/Services/DebridClients/PremiumizeDebridClient.cs
+++ b/server/RdtClient.Service/Services/DebridClients/PremiumizeDebridClient.cs
@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Net;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using PremiumizeNET;
@ -12,11 +11,8 @@ using Torrent = RdtClient.Data.Models.Data.Torrent;

 namespace RdtClient.Service.Services.DebridClients;

-public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter, ISettings settings)
-    : IDebridClient
+public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter) : IDebridClient
 {
-    private const String TransferCreateUrl = "https://www.premiumize.me/api/transfer/create";
-
    public async Task<IList<DebridClientTorrent>> GetDownloads()
    {
        var results = await GetClient().Transfers.ListAsync();
@ -37,22 +33,56 @@ public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHtt

    public async Task<String> AddTorrentMagnet(String magnetLink)
    {
-        return await CreatePremiumizeNetTransfer(() => GetClient().Transfers.CreateAsync(magnetLink, ""), "magnet link");
+        try
+        {
+            var result = await GetClient().Transfers.CreateAsync(magnetLink, "");
+
+            if (result?.Id == null)
+            {
+                throw new("Unable to add magnet link");
+            }
+
+            var resultId = result.Id ?? throw new($"Invalid responseID {result.Id}");
+
+            return resultId;
+        }
+        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase) ||
+                                   ex.Message.Contains("rate limit exceeded", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
    }

    public async Task<String> AddTorrentFile(Byte[] bytes)
    {
-        return await CreatePremiumizeNetTransfer(() => GetClient().Transfers.CreateAsync(bytes, ""), "torrent file");
+        try
+        {
+            var result = await GetClient().Transfers.CreateAsync(bytes, "");
+
+            if (result?.Id == null)
+            {
+                throw new("Unable to add torrent file");
+            }
+
+            var resultId = result.Id ?? throw new($"Invalid responseID {result.Id}");
+
+            return resultId;
+        }
+        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase) ||
+                                   ex.Message.Contains("rate limit exceeded", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
    }

-    public async Task<String> AddNzbLink(String nzbLink)
+    public Task<String> AddNzbLink(String nzbLink)
    {
-        return await CreatePremiumizeNetTransfer(() => GetClient().Transfers.CreateAsync(nzbLink, ""), "NZB link");
+        throw new NotSupportedException();
    }

-    public async Task<String> AddNzbFile(Byte[] bytes, String? name)
+    public Task<String> AddNzbFile(Byte[] bytes, String? name)
    {
-        return await CreateTransferFromNzbFile(bytes, GetNzbFileName(name));
+        throw new NotSupportedException();
    }

    public Task<IList<DebridClientAvailableFile>> GetAvailableFiles(String hash)
@ -195,7 +225,13 @@ public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHtt
    {
        try
        {
-            var apiKey = GetApiKey();
+            var apiKey = Settings.Get.Provider.ApiKey;
+
+            if (String.IsNullOrWhiteSpace(apiKey))
+            {
+                throw new("Premiumize API Key not set in the settings");
+            }
+
            var httpClient = httpClientFactory.CreateClient();
            httpClient.Timeout = TimeSpan.FromSeconds(10);

@ -217,146 +253,6 @@ public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHtt
        }
    }

-    private String GetApiKey()
-    {
-        var apiKey = settings.Current.Provider.ApiKey;
-
-        if (String.IsNullOrWhiteSpace(apiKey))
-        {
-            throw new("Premiumize API Key not set in the settings");
-        }
-
-        return apiKey;
-    }
-
-    private async Task<String> CreatePremiumizeNetTransfer(Func<Task<TransferCreateResponse>> createTransfer, String description)
-    {
-        try
-        {
-            var result = await createTransfer();
-
-            if (String.IsNullOrWhiteSpace(result?.Id))
-            {
-                throw new($"Unable to add {description}");
-            }
-
-            return result.Id;
-        }
-        catch (Exception ex) when (IsRateLimitMessage(ex.Message))
-        {
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-    }
-
-    private async Task<String> CreateTransferFromNzbFile(Byte[] bytes, String fileName)
-    {
-        var content = new MultipartFormDataContent();
-        var fileContent = new ByteArrayContent(bytes);
-        content.Add(fileContent, "src", fileName);
-
-        return await CreateTransfer(content, "NZB file");
-    }
-
-    private static String GetNzbFileName(String? name)
-    {
-        if (String.IsNullOrWhiteSpace(name))
-        {
-            return "upload.nzb";
-        }
-
-        return name.EndsWith(".nzb", StringComparison.OrdinalIgnoreCase) ? name : $"{name}.nzb";
-    }
-
-    private async Task<String> CreateTransfer(HttpContent content, String description)
-    {
-        try
-        {
-            using (content)
-            {
-                var httpClient = httpClientFactory.CreateClient();
-                httpClient.Timeout = TimeSpan.FromSeconds(10);
-
-                using var request = new HttpRequestMessage(HttpMethod.Post, TransferCreateUrl)
-                {
-                    Content = content
-                };
-
-                request.Headers.Authorization = new("Bearer", GetApiKey());
-
-                using var response = await httpClient.SendAsync(request);
-                var responseBody = await response.Content.ReadAsStringAsync();
-
-                if (response.StatusCode == HttpStatusCode.TooManyRequests)
-                {
-                    var retryAfter = response.Headers.RetryAfter?.Delta ?? TimeSpan.FromMinutes(2);
-
-                    throw new RateLimitException($"Unable to add {description}: Premiumize rate limit exceeded", retryAfter);
-                }
-
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw new($"Unable to add {description}: Premiumize returned {(Int32)response.StatusCode} {response.ReasonPhrase}. {responseBody}");
-                }
-
-                var result = JsonConvert.DeserializeObject<RawTransferCreateResponse>(responseBody) ?? throw new($"Unable to add {description}: invalid Premiumize response");
-
-                if (!String.Equals(result.Status, "success", StringComparison.OrdinalIgnoreCase))
-                {
-                    var error = FormatPremiumizeError(result);
-
-                    if (IsRateLimitMessage(error))
-                    {
-                        throw new RateLimitException(error, TimeSpan.FromMinutes(2));
-                    }
-
-                    throw new($"Unable to add {description}: {error}");
-                }
-
-                if (String.IsNullOrWhiteSpace(result.Id))
-                {
-                    throw new($"Unable to add {description}: Premiumize did not return a transfer id");
-                }
-
-                return result.Id;
-            }
-        }
-        catch (RateLimitException)
-        {
-            throw;
-        }
-        catch (Exception ex) when (IsRateLimitMessage(ex.Message))
-        {
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-    }
-
-    private static String FormatPremiumizeError(RawTransferCreateResponse result)
-    {
-        return String.Join(": ",
-                           new[]
-                           {
-                               result.Code, result.Message
-                           }.Where(m => !String.IsNullOrWhiteSpace(m)));
-    }
-
-    private static Boolean IsRateLimitMessage(String message)
-    {
-        return message.Contains("slow_down", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("rate limit exceeded", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("rate_limit_reached", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("account_limit_reached", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("service_limit_reached", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("service_down", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("semi_permanent_error", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("too many API requests", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("fair-use points", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("booster points", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("active-job count", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("usage limit for this service", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("target service is unreachable", StringComparison.OrdinalIgnoreCase) ||
-               message.Contains("retry after a delay", StringComparison.OrdinalIgnoreCase);
-    }
-
    private static DebridClientTorrent Map(Transfer transfer)
    {
        return new()
@ -467,19 +363,4 @@ public class PremiumizeDebridClient(ILogger<PremiumizeDebridClient> logger, IHtt

        logger.LogDebug(message);
    }
-
-    private class RawTransferCreateResponse
-    {
-        [JsonProperty("status")]
-        public String? Status { get; set; }
-
-        [JsonProperty("id")]
-        public String? Id { get; set; }
-
-        [JsonProperty("message")]
-        public String? Message { get; set; }
-
-        [JsonProperty("code")]
-        public String? Code { get; set; }
-    }
 }
--- a/server/RdtClient.Service/Services/DebridClients/RealDebridDebridClient.cs
+++ b/server/RdtClient.Service/Services/DebridClients/RealDebridDebridClient.cs
@ -12,8 +12,7 @@ using Torrent = RDNET.Torrent;

 namespace RdtClient.Service.Services.DebridClients;

-public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter, ISettings settings)
-    : IDebridClient
+public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter) : IDebridClient
 {
    private TimeSpan? _offset;

@ -54,7 +53,7 @@ public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHtt
    {
        try
        {
-            var timeoutCancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(settings.Current.Provider.Timeout));
+            var timeoutCancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(Settings.Get.Provider.Timeout));

            var result = await GetClient().Torrents.AddMagnetAsync(magnetLink, timeoutCancellationToken.Token);

@ -71,7 +70,7 @@ public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHtt
    {
        try
        {
-            var timeoutCancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(settings.Current.Provider.Timeout));
+            var timeoutCancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(Settings.Get.Provider.Timeout));

            var result = await GetClient().Torrents.AddFileAsync(bytes, timeoutCancellationToken.Token);

@ -315,7 +314,7 @@ public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHtt
    {
        try
        {
-            var apiKey = settings.Current.Provider.ApiKey;
+            var apiKey = Settings.Get.Provider.ApiKey;

            if (String.IsNullOrWhiteSpace(apiKey))
            {
@ -323,9 +322,9 @@ public class RealDebridDebridClient(ILogger<RealDebridDebridClient> logger, IHtt
            }

            var httpClient = httpClientFactory.CreateClient(DiConfig.RD_CLIENT);
-            httpClient.Timeout = TimeSpan.FromSeconds(settings.Current.Provider.Timeout);
+            httpClient.Timeout = TimeSpan.FromSeconds(Settings.Get.Provider.Timeout);

-            var rdtNetClient = new RdNetClient(null, httpClient, 5, settings.Current.Provider.ApiHostname);
+            var rdtNetClient = new RdNetClient(null, httpClient, 5, Settings.Get.Provider.ApiHostname);
            rdtNetClient.UseApiAuthentication(apiKey);

            // Get the server time to fix up the timezones on results
--- a/server/RdtClient.Service/Services/DebridClients/TorBoxDebridClient.cs
+++ b/server/RdtClient.Service/Services/DebridClients/TorBoxDebridClient.cs
@ -11,16 +11,8 @@ using Torrent = RdtClient.Data.Models.Data.Torrent;

 namespace RdtClient.Service.Services.DebridClients;

-public class TorBoxDebridClient(
-    ILogger<TorBoxDebridClient> logger,
-    IHttpClientFactory httpClientFactory,
-    IDownloadableFileFilter fileFilter,
-    IRateLimitCoordinator coordinator,
-    ISettings settings)
-    : IDebridClient
+public class TorBoxDebridClient(ILogger<TorBoxDebridClient> logger, IHttpClientFactory httpClientFactory, IDownloadableFileFilter fileFilter) : IDebridClient
 {
-    private const String TorBoxApiHost = "api.torbox.app";
-
    private TimeSpan? _offset;

    public async Task<IList<DebridClientTorrent>> GetDownloads()
@ -60,7 +52,7 @@ public class TorBoxDebridClient(

    public async Task<DebridClientUser> GetUser()
    {
-        var user = await HandleErrors(() => GetClient().User.GetAsync(false));
+        var user = await GetClient().User.GetAsync(false);

        return new()
        {
@ -74,14 +66,9 @@ public class TorBoxDebridClient(
        return await HandleAddTorrentErrors(async asQueued =>
        {
            var user = await GetClient().User.GetAsync(true);
+            var result = await GetClient().Torrents.AddMagnetAsync(magnetLink, user.Data?.Settings?.SeedTorrents ?? 3, as_queued: asQueued);

-            var result = await GetClient(DiConfig.TORBOX_CLIENT_SLOW)
-                               .Torrents.AddMagnetAsync(magnetLink,
-                                                        user.Data?.Settings?.SeedTorrents ?? 3,
-                                                        allowZip: Settings.Get.Provider.PreferZippedDownloads,
-                                                        as_queued: asQueued);
-
-            return result.Data?.TorrentId?.ToString() ?? throw new InvalidOperationException("TorBox API did not return torrent ID.");
+            return result.Data!.Hash!;
        });
    }

@ -90,14 +77,9 @@ public class TorBoxDebridClient(
        return await HandleAddTorrentErrors(async asQueued =>
        {
            var user = await GetClient().User.GetAsync(true);
+            var result = await GetClient().Torrents.AddFileAsync(bytes, user.Data?.Settings?.SeedTorrents ?? 3, as_queued: asQueued);

-            var result = await GetClient(DiConfig.TORBOX_CLIENT_SLOW)
-                               .Torrents.AddFileAsync(bytes,
-                                                      user.Data?.Settings?.SeedTorrents ?? 3,
-                                                      allowZip: Settings.Get.Provider.PreferZippedDownloads,
-                                                      as_queued: asQueued);
-
-            return result.Data?.TorrentId?.ToString() ?? throw new InvalidOperationException("TorBox API did not return torrent ID");
+            return result.Data!.Hash!;
        });
    }

@ -105,7 +87,7 @@ public class TorBoxDebridClient(
    {
        return await HandleAddUsenetErrors(async asQueued =>
        {
-            var result = await GetClient(DiConfig.TORBOX_CLIENT_SLOW).Usenet.AddLinkAsync(nzbLink, as_queued: asQueued);
+            var result = await GetClient().Usenet.AddLinkAsync(nzbLink, as_queued: asQueued);

            return result.Data!.Hash!;
        });
@ -115,7 +97,7 @@ public class TorBoxDebridClient(
    {
        return await HandleAddUsenetErrors(async asQueued =>
        {
-            var result = await GetClient(DiConfig.TORBOX_CLIENT_SLOW).Usenet.AddFileAsync(bytes, name: name, as_queued: asQueued);
+            var result = await GetClient().Usenet.AddFileAsync(bytes, name: name, as_queued: asQueued);

            return result.Data!.Hash!;
        });
@ -163,17 +145,14 @@ public class TorBoxDebridClient(
            return;
        }

-        await HandleErrors(async () =>
+        if (torrent.Type == DownloadType.Nzb)
        {
-            if (torrent.Type == DownloadType.Nzb)
-            {
-                await GetClient().Usenet.ControlAsync(torrent.RdId, "delete");
-            }
-            else
-            {
-                await GetClient().Torrents.ControlByIdAsync(Int32.Parse(torrent.RdId), "delete");
-            }
-        });
+            await GetClient().Usenet.ControlAsync(torrent.RdId, "delete");
+        }
+        else
+        {
+            await GetClient().Torrents.ControlAsync(torrent.RdId, "delete");
+        }
    }

    public async Task<String> Unrestrict(Torrent torrent, String link)
@ -207,11 +186,11 @@ public class TorBoxDebridClient(

        if (torrent.Type == DownloadType.Nzb)
        {
-            result = await HandleErrors(() => GetClient().Usenet.RequestDownloadAsync(torrentId, fileId, zipped));
+            result = await GetClient().Usenet.RequestDownloadAsync(torrentId, fileId, zipped);
        }
        else
        {
-            result = await HandleErrors(() => GetClient().Torrents.RequestDownloadAsync(torrentId, fileId, zipped));
+            result = await GetClient().Torrents.RequestDownloadAsync(torrentId, fileId, zipped);
        }

        if (result.Error != null)
@ -325,18 +304,14 @@ public class TorBoxDebridClient(
                return null;
            }

-            var usenets = await HandleErrors(() => GetClient().Usenet.GetCurrentAsync(true));
+            var usenets = await GetClient().Usenet.GetCurrentAsync(true);
            var usenet = usenets?.FirstOrDefault(m => m.Hash == torrent.RdId);
            id = (Int32?)usenet?.Id;
        }
        else
        {
-            if (torrent.RdId == null)
-            {
-                return null;
-            }
-
-            id = Int32.Parse(torrent.RdId);
+            var torrentId = await GetClient().Torrents.GetHashInfoAsync(torrent.Hash, true);
+            id = torrentId?.Id;
        }

        if (id == null)
@ -346,7 +321,7 @@ public class TorBoxDebridClient(

        var downloadableFiles = torrent.Files.Where(file => fileFilter.IsDownloadable(torrent, file.Path, file.Bytes)).ToList();

-        if (downloadableFiles.Count == torrent.Files.Count && torrent.DownloadClient != Data.Enums.DownloadClient.Symlink && settings.Current.Provider.PreferZippedDownloads)
+        if (downloadableFiles.Count == torrent.Files.Count && torrent.DownloadClient != Data.Enums.DownloadClient.Symlink && Settings.Get.Provider.PreferZippedDownloads)
        {
            logger.LogDebug("Downloading files from TorBox as a zip.");

@ -379,19 +354,19 @@ public class TorBoxDebridClient(
        return Task.FromResult(download.FileName);
    }

-    protected virtual ITorBoxNetClient GetClient(String clientId = DiConfig.TORBOX_CLIENT)
+    protected virtual ITorBoxNetClient GetClient()
    {
        try
        {
-            var apiKey = settings.Current.Provider.ApiKey;
+            var apiKey = Settings.Get.Provider.ApiKey;

            if (String.IsNullOrWhiteSpace(apiKey))
            {
                throw new("TorBox API Key not set in the settings");
            }

-            var httpClient = httpClientFactory.CreateClient(clientId);
-            var torBoxNetClient = new TorBoxNetClient(null, httpClient, retryCount: 5);
+            var httpClient = httpClientFactory.CreateClient(DiConfig.TORBOX_CLIENT);
+            var torBoxNetClient = new TorBoxNetClient(null, httpClient);
            torBoxNetClient.UseApiAuthentication(apiKey);

            // Get the server time to fix up the timezones on results
@ -428,39 +403,39 @@ public class TorBoxDebridClient(

    protected virtual async Task<IEnumerable<TorrentInfoResult>?> GetCurrentTorrents()
    {
-        return await HandleErrors(() => GetClient().Torrents.GetCurrentAsync(true));
+        return await GetClient().Torrents.GetCurrentAsync(true);
    }

    protected virtual async Task<IEnumerable<TorrentInfoResult>?> GetQueuedTorrents()
    {
-        return await HandleErrors(() => GetClient().Torrents.GetQueuedAsync(true));
+        return await GetClient().Torrents.GetQueuedAsync(true);
    }

    protected virtual async Task<IEnumerable<UsenetInfoResult>?> GetCurrentUsenet()
    {
-        return await HandleErrors(() => GetClient().Usenet.GetCurrentAsync(true));
+        return await GetClient().Usenet.GetCurrentAsync(true);
    }

    protected virtual async Task<IEnumerable<UsenetInfoResult>?> GetQueuedUsenet()
    {
-        return await HandleErrors(() => GetClient().Usenet.GetQueuedAsync(true));
+        return await GetClient().Usenet.GetQueuedAsync(true);
    }

    protected virtual async Task<Response<List<AvailableTorrent?>>> GetTorrentAvailability(String hash)
    {
-        return await HandleErrors(() => GetClient().Torrents.GetAvailabilityAsync(hash, true));
+        return await GetClient().Torrents.GetAvailabilityAsync(hash, true);
    }

    protected virtual async Task<Response<List<AvailableUsenet?>>> GetUsenetAvailability(String hash)
    {
-        return await HandleErrors(() => GetClient().Usenet.GetAvailabilityAsync(hash, true));
+        return await GetClient().Usenet.GetAvailabilityAsync(hash, true);
    }

    private DebridClientTorrent Map(TorrentInfoResult torrent)
    {
        return new()
        {
-            Id = torrent.Id.ToString(),
+            Id = torrent.Hash,
            Filename = torrent.Name,
            OriginalFilename = torrent.Name,
            Hash = torrent.Hash,
@ -518,76 +493,52 @@ public class TorBoxDebridClient(
        };
    }

-    private async Task<T> HandleErrors<T>(Func<Task<T>> action)
-    {
-        try
-        {
-            return await action();
-        }
-        catch (RateLimitException)
-        {
-            throw;
-        }
-        catch (Exception ex) when (ex.InnerException is RateLimitException rateLimitException)
-        {
-            throw rateLimitException;
-        }
-        catch (TorBoxException ex) when (IsRateLimit(ex))
-        {
-            coordinator.UpdateCooldown(TorBoxApiHost, TimeSpan.FromMinutes(2));
-
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase))
-        {
-            coordinator.UpdateCooldown(TorBoxApiHost, TimeSpan.FromMinutes(2));
-
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-    }
-
-    private async Task HandleErrors(Func<Task> action)
-    {
-        try
-        {
-            await action();
-        }
-        catch (RateLimitException)
-        {
-            throw;
-        }
-        catch (Exception ex) when (ex.InnerException is RateLimitException rateLimitException)
-        {
-            throw rateLimitException;
-        }
-        catch (TorBoxException ex) when (IsRateLimit(ex))
-        {
-            coordinator.UpdateCooldown(TorBoxApiHost, TimeSpan.FromMinutes(2));
-
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase))
-        {
-            coordinator.UpdateCooldown(TorBoxApiHost, TimeSpan.FromMinutes(2));
-
-            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
-        }
-    }
-
    private async Task<String> HandleAddTorrentErrors(Func<Boolean, Task<String>> action)
    {
-        return await HandleErrors(() => action(false));
-    }
-
-    private static Boolean IsRateLimit(TorBoxException exception)
-    {
-        return exception.Error.Equals("RATE_LIMIT", StringComparison.OrdinalIgnoreCase)
-               || exception.Error.Equals("ACTIVE_LIMIT", StringComparison.OrdinalIgnoreCase);
+        try
+        {
+            return await action(false);
+        }
+        catch (RateLimitException)
+        {
+            throw;
+        }
+        catch (Exception ex) when (ex.InnerException is RateLimitException rateLimitException)
+        {
+            throw rateLimitException;
+        }
+        catch (TorBoxException ex) when (ex.Error.Equals("active_limit", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
+        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
    }

    private async Task<String> HandleAddUsenetErrors(Func<Boolean, Task<String>> action)
    {
-        return await HandleErrors(() => action(false));
+        try
+        {
+            return await action(false);
+        }
+        catch (RateLimitException)
+        {
+            throw;
+        }
+        catch (Exception ex) when (ex.InnerException is RateLimitException rateLimitException)
+        {
+            throw rateLimitException;
+        }
+        catch (TorBoxException ex) when (ex.Error.Equals("active_limit", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
+        catch (Exception ex) when (ex.Message.Contains("slow_down", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new RateLimitException(ex.Message, TimeSpan.FromMinutes(2));
+        }
    }

    private DateTimeOffset? ChangeTimeZone(DateTimeOffset? dateTimeOffset)
@ -602,29 +553,26 @@ public class TorBoxDebridClient(

    private async Task<DebridClientTorrent?> GetInfo(String id, DownloadType type)
    {
-        return await HandleErrors(async () =>
+        if (type == DownloadType.Nzb)
        {
-            if (type == DownloadType.Nzb)
+            var usenet = await GetClient().Usenet.GetHashInfoAsync(id, true);
+
+            if (usenet != null)
            {
-                var usenet = await GetClient().Usenet.GetHashInfoAsync(id, true);
-
-                if (usenet != null)
-                {
-                    return Map(usenet);
-                }
+                return Map(usenet);
            }
-            else
+        }
+        else
+        {
+            var result = await GetClient().Torrents.GetHashInfoAsync(id, true);
+
+            if (result != null)
            {
-                var result = await GetClient().Torrents.GetIdInfoAsync(Int32.Parse(id), true);
-
-                if (result != null)
-                {
-                    return Map(result);
-                }
+                return Map(result);
            }
+        }

-            return null;
-        });
+        return null;
    }

    public static void MoveHashDirContents(String extractPath, Torrent torrent)
@ -669,16 +617,10 @@ public class TorBoxDebridClient(
    {
        if (!String.IsNullOrWhiteSpace(status))
        {
-            logger.LogInformation("TorBoxDebridClient encountered an unmapped status: {Status} for torrent {TorrentName} with previous status {PreviousStatus}",
-                                  status,
-                                  torrent.RdName,
-                                  torrent.RdStatus);
+            logger.LogInformation("TorBoxDebridClient encountered an unmapped status: {Status} for torrent {TorrentName}", status, torrent.RdName);
        }

-        // Once TorBox has acknowledged the torrent, an unknown provider-side status should not fall all the way back to
-        // the local queue state. Treat it as provider-side processing so the UI does not incorrectly show
-        // "Not Yet Added to Provider" while TorBox is already handling it.
-        return torrent.RdStatus is null or TorrentStatus.Queued ? TorrentStatus.Processing : torrent.RdStatus.Value;
+        return torrent.RdStatus ?? TorrentStatus.Processing;
    }

    private void Log(String message, Torrent? torrent = null)
--- a/server/RdtClient.Service/Services/Downloads.cs
+++ b/server/RdtClient.Service/Services/Downloads.cs
@ -21,9 +21,9 @@ public class Downloads(DownloadData downloadData) : IDownloads
        return await downloadData.Get(torrentId, path);
    }

-    public async Task<DownloadAddResult> TryAddForTorrent(Guid torrentId, DownloadInfo downloadInfo)
+    public async Task<Download> Add(Guid torrentId, DownloadInfo downloadInfo)
    {
-        return await downloadData.TryAddForTorrent(torrentId, downloadInfo);
+        return await downloadData.Add(torrentId, downloadInfo);
    }

    public async Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink)
@ -86,8 +86,8 @@ public class Downloads(DownloadData downloadData) : IDownloads
        await downloadData.DeleteForTorrent(torrentId);
    }

-    public async Task Reset(Guid downloadId, DateTimeOffset? downloadQueued = null)
+    public async Task Reset(Guid downloadId)
    {
-        await downloadData.Reset(downloadId, downloadQueued);
+        await downloadData.Reset(downloadId);
    }
 }
--- a/server/RdtClient.Service/Services/IDownloads.cs
+++ b/server/RdtClient.Service/Services/IDownloads.cs
@ -1,4 +1,3 @@
-using RdtClient.Data.Data;
 using RdtClient.Data.Models.Data;

 namespace RdtClient.Service.Services;
@ -8,7 +7,7 @@ public interface IDownloads
    Task<List<Download>> GetForTorrent(Guid torrentId);
    Task<Download?> GetById(Guid downloadId);
    Task<Download?> Get(Guid torrentId, String path);
-    Task<DownloadAddResult> TryAddForTorrent(Guid torrentId, DownloadInfo downloadInfo);
+    Task<Download> Add(Guid torrentId, DownloadInfo downloadInfo);
    Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink);
    Task UpdateFileName(Guid downloadId, String fileName);
    Task UpdateDownloadStarted(Guid downloadId, DateTimeOffset? dateTime);
@ -21,5 +20,5 @@ public interface IDownloads
    Task UpdateRetryCount(Guid downloadId, Int32 retryCount);
    Task UpdateRemoteId(Guid downloadId, String remoteId);
    Task DeleteForTorrent(Guid torrentId);
-    Task Reset(Guid downloadId, DateTimeOffset? downloadQueued = null);
+    Task Reset(Guid downloadId);
 }
--- a/server/RdtClient.Service/Services/QBittorrent.cs
+++ b/server/RdtClient.Service/Services/QBittorrent.cs
@ -5,7 +5,7 @@ using RdtClient.Data.Models.QBittorrent;

 namespace RdtClient.Service.Services;

-public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authentication authentication, Torrents torrents, Downloads downloads, ITorrentRunnerState runnerState)
+public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authentication authentication, Torrents torrents, Downloads downloads)
 {
    public async Task<Boolean> AuthLogin(String userName, String password)
    {
@ -168,7 +168,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
            WebUiUsername = ""
        };

-        var savePath = settings.DefaultSavePath;
+        var savePath = Settings.AppDefaultSavePath;

        preferences.SavePath = savePath;
        preferences.TempPath = $"{savePath}temp{Path.DirectorySeparatorChar}";
@ -183,9 +183,9 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
        return preferences;
    }

-    public virtual async Task<IList<TorrentInfo>> TorrentInfo()
+    public async Task<IList<TorrentInfo>> TorrentInfo()
    {
-        var savePath = settings.DefaultSavePath;
+        var savePath = Settings.AppDefaultSavePath;

        var results = new List<TorrentInfo>();

@ -214,17 +214,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
                }
                else
                {
-                    var existingContentPath = GetExistingContentPath(downloadPath, torrent);
-
-                    if (!String.IsNullOrWhiteSpace(existingContentPath))
-                    {
-                        torrentPath = existingContentPath;
-                    }
-                    else
-                    {
-                        var contentPathName = GetContentPathName(torrent);
-                        torrentPath = Path.Combine(downloadPath, contentPathName) + Path.DirectorySeparatorChar;
-                    }
+                    torrentPath = Path.Combine(downloadPath, torrent.RdName) + Path.DirectorySeparatorChar;
                }
            }

@ -338,164 +328,10 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
        return results;
    }

-    private static String GetContentPathName(Torrent torrent)
-    {
-        if (String.IsNullOrWhiteSpace(torrent.RdName))
-        {
-            return torrent.RdName ?? String.Empty;
-        }
-
-        var topLevelSelectedFiles = torrent.Files
-                                           .Where(m => m.Selected && !String.IsNullOrWhiteSpace(m.Path))
-                                           .Select(m => m.Path.Trim('/').Trim('\\'))
-                                           .Where(m => m.IndexOfAny(['/', '\\']) < 0)
-                                           .Select(Path.GetFileName)
-                                           .Where(m => !String.IsNullOrWhiteSpace(m))
-                                           .Distinct(StringComparer.OrdinalIgnoreCase)
-                                           .ToList();
-
-        if (topLevelSelectedFiles.Count == 1)
-        {
-            var selectedFileName = topLevelSelectedFiles[0]!;
-            var selectedFileBaseName = Path.GetFileNameWithoutExtension(selectedFileName);
-
-            if (torrent.ClientKind == Provider.TorBox)
-            {
-                return selectedFileBaseName;
-            }
-
-            if (!String.IsNullOrWhiteSpace(selectedFileBaseName) &&
-                selectedFileBaseName.Equals(torrent.RdName, StringComparison.OrdinalIgnoreCase))
-            {
-                return selectedFileName;
-            }
-        }
-
-        return torrent.RdName;
-    }
-
-    private static String? GetExistingContentPath(String downloadPath, Torrent torrent)
-    {
-        if (!torrent.Completed.HasValue || !Directory.Exists(downloadPath))
-        {
-            return null;
-        }
-
-        var selectedFilePaths = torrent.Files
-                                       .Where(m => m.Selected && !String.IsNullOrWhiteSpace(m.Path))
-                                       .Select(m => NormalizeRelativePath(m.Path!))
-                                       .Where(m => !String.IsNullOrWhiteSpace(m))
-                                       .Distinct(StringComparer.OrdinalIgnoreCase)
-                                       .ToList();
-
-        var downloadFileNames = torrent.Downloads
-                                       .Select(m => m.FileName)
-                                       .Where(m => !String.IsNullOrWhiteSpace(m))
-                                       .Select(m => Path.GetFileName(m!))
-                                       .Where(m => !String.IsNullOrWhiteSpace(m))
-                                       .Distinct(StringComparer.OrdinalIgnoreCase)
-                                       .ToList();
-
-        if (selectedFilePaths.Count == 0 && downloadFileNames.Count == 0)
-        {
-            return null;
-        }
-
-        foreach (var candidateRoot in GetCandidateContentRoots(downloadPath, torrent, selectedFilePaths, downloadFileNames))
-        {
-            if (IsMatchingContentRoot(candidateRoot, selectedFilePaths, downloadFileNames))
-            {
-                return candidateRoot + Path.DirectorySeparatorChar;
-            }
-        }
-
-        return null;
-    }
-
-    private static IEnumerable<String> GetCandidateContentRoots(String downloadPath,
-                                                                Torrent torrent,
-                                                                IEnumerable<String> selectedFilePaths,
-                                                                IEnumerable<String> downloadFileNames)
-    {
-        var yielded = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
-
-        void AddCandidate(ICollection<String> candidates, String? name)
-        {
-            if (!String.IsNullOrWhiteSpace(name))
-            {
-                candidates.Add(Path.Combine(downloadPath, name));
-            }
-        }
-
-        var directCandidates = new List<String>();
-
-        AddCandidate(directCandidates, torrent.RdName);
-
-        foreach (var fileName in downloadFileNames)
-        {
-            AddCandidate(directCandidates, fileName);
-        }
-
-        foreach (var selectedFilePath in selectedFilePaths)
-        {
-            AddCandidate(directCandidates, Path.GetFileName(selectedFilePath));
-            AddCandidate(directCandidates, GetFirstPathComponent(selectedFilePath));
-        }
-
-        foreach (var candidate in directCandidates)
-        {
-            if (Directory.Exists(candidate) && yielded.Add(candidate))
-            {
-                yield return candidate;
-            }
-        }
-
-        foreach (var directory in Directory.EnumerateDirectories(downloadPath))
-        {
-            if (yielded.Add(directory))
-            {
-                yield return directory;
-            }
-        }
-    }
-
-    private static Boolean IsMatchingContentRoot(String candidateRoot,
-                                                 IEnumerable<String> selectedFilePaths,
-                                                 IEnumerable<String> downloadFileNames)
-    {
-        foreach (var selectedFilePath in selectedFilePaths)
-        {
-            if (File.Exists(Path.Combine(candidateRoot, selectedFilePath)))
-            {
-                return true;
-            }
-        }
-
-        foreach (var fileName in downloadFileNames)
-        {
-            if (File.Exists(Path.Combine(candidateRoot, fileName)))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static String NormalizeRelativePath(String path)
-    {
-        return path.Trim('/').Trim('\\').Replace('\\', Path.DirectorySeparatorChar);
-    }
-
-    private static String GetFirstPathComponent(String path)
-    {
-        var separatorIndex = path.IndexOfAny(['/', '\\']);
-
-        return separatorIndex < 0 ? path : path[..separatorIndex];
-    }
-
    public async Task<IList<TorrentFileItem>?> TorrentFileContents(String hash)
    {
+        var results = new List<TorrentFileItem>();
+
        var torrent = await torrents.GetByHash(hash);

        if (torrent == null || torrent.Type != DownloadType.Torrent)
@ -503,24 +339,22 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
            return null;
        }

-        var progress = torrent.Completed.HasValue || torrent.RdStatus == TorrentStatus.Finished ? 1f : 0f;
+        foreach (var file in torrent.Files.Where(m => m.Selected))
+        {
+            var result = new TorrentFileItem
+            {
+                Name = file.Path
+            };

-        return torrent.Files
-                      .Select((file, index) => new TorrentFileItem
-                      {
-                          Index = index,
-                          Name = file.Path,
-                          Size = file.Bytes,
-                          Progress = file.Selected ? progress : 0f,
-                          Priority = file.Selected ? 1 : 0,
-                          IsSeed = false
-                      })
-                      .ToList();
+            results.Add(result);
+        }
+
+        return results;
    }

    public async Task<TorrentProperties?> TorrentProperties(String hash)
    {
-        var savePath = settings.DefaultSavePath;
+        var savePath = Settings.AppDefaultSavePath;

        var torrent = await torrents.GetByHash(hash);

@ -551,7 +385,6 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
            AdditionDate = torrent.Added.ToUnixTimeSeconds(),
            Comment = "RealDebridClient <https://github.com/rogerfar/rdt-client>",
            CompletionDate = torrent.Completed?.ToUnixTimeSeconds() ?? -1,
-            IsPrivate = false,
            CreatedBy = "RealDebridClient <https://github.com/rogerfar/rdt-client>",
            CreationDate = torrent.Added.ToUnixTimeSeconds(),
            DlLimit = -1,
@ -587,11 +420,6 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
        return result;
    }

-    public async Task TorrentsFilePrio(String hash, IReadOnlyCollection<Int32> fileIds, Int32 priority)
-    {
-        await torrents.UpdateFileSelection(hash, fileIds, priority > 0);
-    }
-
    public async Task TorrentsDelete(String hash, Boolean deleteFiles)
    {
        if (deleteFiles)
@ -610,7 +438,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
            return;
        }

-        switch (settings.Current.Integrations.Default.FinishedAction)
+        switch (Settings.Get.Integrations.Default.FinishedAction)
        {
            case TorrentFinishedAction.RemoveAllTorrents:
                logger.LogDebug("Removing torrents from debrid provider and RDT-Client, no files");
@ -638,54 +466,54 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
        }
    }

-    public async Task<Torrent> TorrentsAddMagnet(String magnetLink, String? category, Int32? priority)
+    public async Task TorrentsAddMagnet(String magnetLink, String? category, Int32? priority)
    {
        logger.LogDebug($"Add magnet {category}");

        var torrent = new Torrent
        {
            Category = category,
-            DownloadClient = settings.Current.DownloadClient.Client,
-            HostDownloadAction = settings.Current.Integrations.Default.HostDownloadAction,
-            FinishedActionDelay = settings.Current.Integrations.Default.FinishedActionDelay,
-            DownloadAction = settings.Current.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
+            DownloadClient = Settings.Get.DownloadClient.Client,
+            HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
+            FinishedActionDelay = Settings.Get.Integrations.Default.FinishedActionDelay,
+            DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
            FinishedAction = TorrentFinishedAction.None,
-            DownloadMinSize = settings.Current.Integrations.Default.MinFileSize,
-            IncludeRegex = settings.Current.Integrations.Default.IncludeRegex,
-            ExcludeRegex = settings.Current.Integrations.Default.ExcludeRegex,
-            TorrentRetryAttempts = settings.Current.Integrations.Default.TorrentRetryAttempts,
-            DownloadRetryAttempts = settings.Current.Integrations.Default.DownloadRetryAttempts,
-            DeleteOnError = settings.Current.Integrations.Default.DeleteOnError,
-            Lifetime = settings.Current.Integrations.Default.TorrentLifetime,
-            Priority = priority ?? (settings.Current.Integrations.Default.Priority > 0 ? settings.Current.Integrations.Default.Priority : null)
+            DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
+            IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex,
+            ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex,
+            TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts,
+            DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts,
+            DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError,
+            Lifetime = Settings.Get.Integrations.Default.TorrentLifetime,
+            Priority = priority ?? (Settings.Get.Integrations.Default.Priority > 0 ? Settings.Get.Integrations.Default.Priority : null)
        };

-        return await torrents.AddMagnetToDebridQueue(magnetLink, torrent);
+        await torrents.AddMagnetToDebridQueue(magnetLink, torrent);
    }

-    public async Task<Torrent> TorrentsAddFile(Byte[] fileBytes, String? category, Int32? priority)
+    public async Task TorrentsAddFile(Byte[] fileBytes, String? category, Int32? priority)
    {
        logger.LogDebug($"Add file {category}");

        var torrent = new Torrent
        {
            Category = category,
-            DownloadClient = settings.Current.DownloadClient.Client,
-            HostDownloadAction = settings.Current.Integrations.Default.HostDownloadAction,
-            FinishedActionDelay = settings.Current.Integrations.Default.FinishedActionDelay,
-            DownloadAction = settings.Current.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
+            DownloadClient = Settings.Get.DownloadClient.Client,
+            HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
+            FinishedActionDelay = Settings.Get.Integrations.Default.FinishedActionDelay,
+            DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
            FinishedAction = TorrentFinishedAction.None,
-            DownloadMinSize = settings.Current.Integrations.Default.MinFileSize,
-            IncludeRegex = settings.Current.Integrations.Default.IncludeRegex,
-            ExcludeRegex = settings.Current.Integrations.Default.ExcludeRegex,
-            TorrentRetryAttempts = settings.Current.Integrations.Default.TorrentRetryAttempts,
-            DownloadRetryAttempts = settings.Current.Integrations.Default.DownloadRetryAttempts,
-            DeleteOnError = settings.Current.Integrations.Default.DeleteOnError,
-            Lifetime = settings.Current.Integrations.Default.TorrentLifetime,
-            Priority = priority ?? (settings.Current.Integrations.Default.Priority > 0 ? settings.Current.Integrations.Default.Priority : null)
+            DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
+            IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex,
+            ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex,
+            TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts,
+            DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts,
+            DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError,
+            Lifetime = Settings.Get.Integrations.Default.TorrentLifetime,
+            Priority = priority ?? (Settings.Get.Integrations.Default.Priority > 0 ? Settings.Get.Integrations.Default.Priority : null)
        };

-        return await torrents.AddFileToDebridQueue(fileBytes, torrent);
+        await torrents.AddFileToDebridQueue(fileBytes, torrent);
    }

    public async Task TorrentsSetCategory(String hash, String? category)
@ -701,7 +529,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
                                         .Select(m => m.Category!.ToLower())
                                         .ToList();

-        var categoryList = (settings.Current.General.Categories ?? "")
+        var categoryList = (Settings.Get.General.Categories ?? "")
                           .Split(",", StringSplitOptions.RemoveEmptyEntries)
                           .Distinct(StringComparer.CurrentCultureIgnoreCase)
                           .Select(m => m.Trim())
@ -718,7 +546,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
                                                   m => new TorrentCategory
                                                   {
                                                       Name = m,
-                                                       SavePath = Path.Combine(settings.DefaultSavePath, m)
+                                                       SavePath = Path.Combine(Settings.AppDefaultSavePath, m)
                                                   });
        }

@ -734,7 +562,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen

        category = category.Trim();

-        var categoriesSetting = settings.Current.General.Categories;
+        var categoriesSetting = Settings.Get.General.Categories;

        var categoryList = (categoriesSetting ?? "")
                           .Split(",", StringSplitOptions.RemoveEmptyEntries)
@ -761,7 +589,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen

        category = category.Trim();

-        var categoriesSetting = settings.Current.General.Categories;
+        var categoriesSetting = Settings.Get.General.Categories;

        var categoryList = (categoriesSetting ?? "")
                           .Split(",", StringSplitOptions.RemoveEmptyEntries)
@ -801,7 +629,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen

        foreach (var download in downloadsForTorrent)
        {
-            if (runnerState.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
+            if (TorrentRunner.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
            {
                await downloadClient.Pause();
            }
@ -821,7 +649,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen

        foreach (var download in downloadsForTorrent)
        {
-            if (runnerState.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
+            if (TorrentRunner.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
            {
                await downloadClient.Resume();
            }
@ -834,7 +662,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen

        var categories = await TorrentsCategories();

-        var activeDownloads = runnerState.ActiveDownloadClients.Sum(m => m.Value.Speed);
+        var activeDownloads = TorrentRunner.ActiveDownloadClients.Sum(m => m.Value.Speed);

        return new()
        {
@ -852,37 +680,16 @@ public class QBittorrent(ILogger<QBittorrent> logger, ISettings settings, Authen
        };
    }

-    public virtual TransferInfo TransferInfo()
+    public static TransferInfo TransferInfo()
    {
-        var activeDownloads = runnerState.ActiveDownloadClients.Sum(m => m.Value.Speed);
+        var activeDownloads = TorrentRunner.ActiveDownloadClients.Sum(m => m.Value.Speed);

        return new()
        {
            ConnectionStatus = "connected",
            DlInfoData = DownloadClient.GetTotalBytesDownloadedThisSession(),
            DlInfoSpeed = activeDownloads,
-            DlRateLimit = settings.Current.DownloadClient.MaxSpeed
+            DlRateLimit = Settings.Get.DownloadClient.MaxSpeed
        };
    }
-
-    public async Task<List<Tracker>> TorrentsTrackers(String hash)
-    {
-        var torrent = await torrents.GetByHash(hash);
-
-        if (torrent == null || torrent.Type != DownloadType.Torrent)
-        {
-            return [];
-        }
-
-        return
-        [
-            new()
-            {
-                Url = $"http://{torrent.RdHost ?? torrent.ClientKind.ToString()}/**".ToLower(),
-                Status = "Working",
-                NumPeers = torrent.RdSeeders ?? 1,
-                Msg = $"Fake Tracker for {torrent.ClientKind}"
-            }
-        ];
-    }
 }
--- a/server/RdtClient.Service/Services/RemoteService.cs
+++ b/server/RdtClient.Service/Services/RemoteService.cs
@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.SignalR;
 using RdtClient.Data.Models.Internal;
-using RdtClient.Service.Helpers;

 namespace RdtClient.Service.Services;

@ -10,7 +9,72 @@ public class RemoteService(IHubContext<RdtHub> hub, Torrents torrents)
    {
        var allTorrents = await torrents.Get();

-        var torrentDtos = allTorrents.Select(torrent => TorrentDtoMapper.ToUpdateDto(torrent, torrents.GetDownloadStats))
+        var torrentDtos = allTorrents.Select(torrent => new TorrentDto
+                                     {
+                                         TorrentId = torrent.TorrentId,
+                                         Hash = torrent.Hash,
+                                         Category = torrent.Category,
+                                         DownloadAction = torrent.DownloadAction,
+                                         FinishedAction = torrent.FinishedAction,
+                                         FinishedActionDelay = torrent.FinishedActionDelay,
+                                         HostDownloadAction = torrent.HostDownloadAction,
+                                         DownloadMinSize = torrent.DownloadMinSize,
+                                         IncludeRegex = torrent.IncludeRegex,
+                                         ExcludeRegex = torrent.ExcludeRegex,
+                                         DownloadManualFiles = torrent.DownloadManualFiles,
+                                         DownloadClient = torrent.DownloadClient,
+                                         Added = torrent.Added,
+                                         FilesSelected = torrent.FilesSelected,
+                                         Completed = torrent.Completed,
+                                         Type = torrent.Type,
+                                         IsFile = torrent.IsFile,
+                                         Priority = torrent.Priority,
+                                         RetryCount = torrent.RetryCount,
+                                         DownloadRetryAttempts = torrent.DownloadRetryAttempts,
+                                         TorrentRetryAttempts = torrent.TorrentRetryAttempts,
+                                         DeleteOnError = torrent.DeleteOnError,
+                                         Lifetime = torrent.Lifetime,
+                                         Error = torrent.Error,
+                                         RdId = torrent.RdId,
+                                         RdName = torrent.RdName,
+                                         RdSize = torrent.RdSize,
+                                         RdHost = torrent.RdHost,
+                                         RdSplit = torrent.RdSplit,
+                                         RdProgress = torrent.RdProgress,
+                                         RdStatus = torrent.RdStatus,
+                                         RdStatusRaw = torrent.RdStatusRaw,
+                                         RdAdded = torrent.RdAdded,
+                                         RdEnded = torrent.RdEnded,
+                                         RdSpeed = torrent.RdSpeed,
+                                         RdSeeders = torrent.RdSeeders,
+                                         Files = torrent.Files,
+                                         Downloads = torrent.Downloads.Select(download =>
+                                                            {
+                                                                var (speed, bytesTotal, bytesDone) = torrents.GetDownloadStats(download.DownloadId);
+
+                                                                return new DownloadDto
+                                                                {
+                                                                    DownloadId = download.DownloadId,
+                                                                    TorrentId = download.TorrentId,
+                                                                    Path = download.Path,
+                                                                    Link = download.Link,
+                                                                    Added = download.Added,
+                                                                    DownloadQueued = download.DownloadQueued,
+                                                                    DownloadStarted = download.DownloadStarted,
+                                                                    DownloadFinished = download.DownloadFinished,
+                                                                    UnpackingQueued = download.UnpackingQueued,
+                                                                    UnpackingStarted = download.UnpackingStarted,
+                                                                    UnpackingFinished = download.UnpackingFinished,
+                                                                    Completed = download.Completed,
+                                                                    RetryCount = download.RetryCount,
+                                                                    Error = download.Error,
+                                                                    BytesTotal = bytesTotal,
+                                                                    BytesDone = bytesDone,
+                                                                    Speed = speed
+                                                                };
+                                                            })
+                                                            .ToList()
+                                     })
                                     .ToList();

        await hub.Clients.All.SendCoreAsync("update",
--- a/server/RdtClient.Service/Services/Sabnzbd.cs
+++ b/server/RdtClient.Service/Services/Sabnzbd.cs
@ -7,7 +7,7 @@ using RdtClient.Service.Helpers;

 namespace RdtClient.Service.Services;

-public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings appSettings, ISettings settings)
+public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings appSettings)
 {
    public virtual async Task<SabnzbdQueue> GetQueue()
    {
@ -87,7 +87,7 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
        var allTorrents = await torrents.Get();
        var completedTorrents = allTorrents.Where(t => t.Type == DownloadType.Nzb && t.Completed != null).ToList();

-        var savePath = settings.DefaultSavePath;
+        var savePath = Settings.AppDefaultSavePath;

        var history = new SabnzbdHistory
        {
@ -130,19 +130,19 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
        var torrent = new Torrent
        {
            Category = category,
-            DownloadClient = settings.Current.DownloadClient.Client,
-            HostDownloadAction = settings.Current.Integrations.Default.HostDownloadAction,
-            FinishedActionDelay = settings.Current.Integrations.Default.FinishedActionDelay,
-            DownloadAction = settings.Current.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
+            DownloadClient = Settings.Get.DownloadClient.Client,
+            HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
+            FinishedActionDelay = Settings.Get.Integrations.Default.FinishedActionDelay,
+            DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
            FinishedAction = TorrentFinishedAction.None,
-            DownloadMinSize = settings.Current.Integrations.Default.MinFileSize,
-            IncludeRegex = settings.Current.Integrations.Default.IncludeRegex,
-            ExcludeRegex = settings.Current.Integrations.Default.ExcludeRegex,
-            TorrentRetryAttempts = settings.Current.Integrations.Default.TorrentRetryAttempts,
-            DownloadRetryAttempts = settings.Current.Integrations.Default.DownloadRetryAttempts,
-            DeleteOnError = settings.Current.Integrations.Default.DeleteOnError,
-            Lifetime = settings.Current.Integrations.Default.TorrentLifetime,
-            Priority = (priority ?? settings.Current.Integrations.Default.Priority) > 0 ? 1 : null
+            DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
+            IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex,
+            ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex,
+            TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts,
+            DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts,
+            DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError,
+            Lifetime = Settings.Get.Integrations.Default.TorrentLifetime,
+            Priority = (priority ?? Settings.Get.Integrations.Default.Priority) > 0 ? 1 : null
        };

        var result = await torrents.AddNzbFileToDebridQueue(fileBytes, fileName, torrent);
@ -157,19 +157,19 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
        var torrent = new Torrent
        {
            Category = category,
-            DownloadClient = settings.Current.DownloadClient.Client,
-            HostDownloadAction = settings.Current.Integrations.Default.HostDownloadAction,
-            FinishedActionDelay = settings.Current.Integrations.Default.FinishedActionDelay,
-            DownloadAction = settings.Current.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
+            DownloadClient = Settings.Get.DownloadClient.Client,
+            HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
+            FinishedActionDelay = Settings.Get.Integrations.Default.FinishedActionDelay,
+            DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
            FinishedAction = TorrentFinishedAction.None,
-            DownloadMinSize = settings.Current.Integrations.Default.MinFileSize,
-            IncludeRegex = settings.Current.Integrations.Default.IncludeRegex,
-            ExcludeRegex = settings.Current.Integrations.Default.ExcludeRegex,
-            TorrentRetryAttempts = settings.Current.Integrations.Default.TorrentRetryAttempts,
-            DownloadRetryAttempts = settings.Current.Integrations.Default.DownloadRetryAttempts,
-            DeleteOnError = settings.Current.Integrations.Default.DeleteOnError,
-            Lifetime = settings.Current.Integrations.Default.TorrentLifetime,
-            Priority = priority ?? (settings.Current.Integrations.Default.Priority > 0 ? settings.Current.Integrations.Default.Priority : null)
+            DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
+            IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex,
+            ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex,
+            TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts,
+            DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts,
+            DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError,
+            Lifetime = Settings.Get.Integrations.Default.TorrentLifetime,
+            Priority = priority ?? (Settings.Get.Integrations.Default.Priority > 0 ? Settings.Get.Integrations.Default.Priority : null)
        };

        var result = await torrents.AddNzbLinkToDebridQueue(url, torrent);
@ -177,7 +177,7 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
        return result.Hash;
    }

-    public virtual async Task Delete(String hash, Boolean deleteFiles = false)
+    public virtual async Task Delete(String hash)
    {
        var torrent = await torrents.GetByHash(hash);

@ -186,21 +186,21 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app
            return;
        }

-        switch (settings.Current.Integrations.Default.FinishedAction)
+        switch (Settings.Get.Integrations.Default.FinishedAction)
        {
            case TorrentFinishedAction.RemoveAllTorrents:
-                logger.LogDebug("Removing nzb from debrid provider and RDT-Client, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, true, true, deleteFiles);
+                logger.LogDebug("Removing nzb from debrid provider and RDT-Client, no files");
+                await torrents.Delete(torrent.TorrentId, true, true, true);

                break;
            case TorrentFinishedAction.RemoveRealDebrid:
-                logger.LogDebug("Removing nzb from debrid provider, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, false, true, deleteFiles);
+                logger.LogDebug("Removing nzb from debrid provider, no files");
+                await torrents.Delete(torrent.TorrentId, false, true, true);

                break;
            case TorrentFinishedAction.RemoveClient:
-                logger.LogDebug("Removing nzb from client, {Files}", deleteFiles ? "with files" : "no files");
-                await torrents.Delete(torrent.TorrentId, true, false, deleteFiles);
+                logger.LogDebug("Removing nzb from client, no files");
+                await torrents.Delete(torrent.TorrentId, true, false, true);

                break;
            case TorrentFinishedAction.None:
@ -216,7 +216,7 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app

    public virtual List<String> GetCategories()
    {
-        var categoryList = (settings.Current.General.Categories ?? "")
+        var categoryList = (Settings.Get.General.Categories ?? "")
                           .Split(",", StringSplitOptions.RemoveEmptyEntries)
                           .Select(m => m.Trim())
                           .Where(m => m != "*")
@ -230,7 +230,7 @@ public class Sabnzbd(ILogger<Sabnzbd> logger, Torrents torrents, AppSettings app

    public virtual SabnzbdConfig GetConfig()
    {
-        var savePath = settings.DefaultSavePath;
+        var savePath = Settings.AppDefaultSavePath;

        var categoryList = GetCategories();

--- a/server/RdtClient.Service/Services/Settings.cs
+++ b/server/RdtClient.Service/Services/Settings.cs
@ -1,88 +1,49 @@
 using RdtClient.Data.Data;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Internal;
-using Microsoft.Extensions.DependencyInjection;
 using Serilog.Core;
 using Serilog.Events;

 namespace RdtClient.Service.Services;

-public interface ISettings
-{
-    DbSettings Current { get; }
-
-    String DefaultSavePath { get; }
-
-    IList<SettingProperty> GetAll();
-
-    Task Update(IList<SettingProperty> settings);
-
-    Task Update(String settingId, Object? value);
-}
-
-public class Settings(IServiceScopeFactory serviceScopeFactory) : ISettings
+public class Settings(SettingData settingData)
 {
    public static readonly LoggingLevelSwitch LoggingLevelSwitch = new(LogEventLevel.Debug);

    public static DbSettings Get => SettingData.Get;

-    public DbSettings Current => Get;
-
-    public static String AppDefaultSavePath => GetDefaultSavePath(Get);
-
-    public String DefaultSavePath => GetDefaultSavePath(Current);
-
-    public IList<SettingProperty> GetAll()
+    public static String AppDefaultSavePath
    {
-        return SettingData.GetAll();
-    }
-
-    private static String GetDefaultSavePath(DbSettings settings)
-    {
-        var downloadPath = settings.DownloadClient.MappedPath;
-
-        if (String.IsNullOrWhiteSpace(downloadPath))
+        get
        {
-            downloadPath = settings.DownloadClient.DownloadPath;
+            var downloadPath = Get.DownloadClient.MappedPath;
+
+            downloadPath = downloadPath.TrimEnd('\\')
+                                       .TrimEnd('/');
+
+            downloadPath += Path.DirectorySeparatorChar;
+
+            return downloadPath;
        }
-
-        downloadPath = downloadPath.TrimEnd('\\')
-                                   .TrimEnd('/');
-
-        downloadPath += Path.DirectorySeparatorChar;
-
-        return downloadPath;
    }

    public async Task Update(IList<SettingProperty> settings)
    {
-        using var scope = serviceScopeFactory.CreateScope();
-        var settingData = scope.ServiceProvider.GetRequiredService<SettingData>();
-
        await settingData.Update(settings);
    }

    public async Task Update(String settingId, Object? value)
    {
-        using var scope = serviceScopeFactory.CreateScope();
-        var settingData = scope.ServiceProvider.GetRequiredService<SettingData>();
-
        await settingData.Update(settingId, value);
    }

    public async Task Seed()
    {
-        using var scope = serviceScopeFactory.CreateScope();
-        var settingData = scope.ServiceProvider.GetRequiredService<SettingData>();
-
        await settingData.Seed();
    }

    public async Task ResetCache()
    {
-        using var scope = serviceScopeFactory.CreateScope();
-        var settingData = scope.ServiceProvider.GetRequiredService<SettingData>();
-
        await settingData.ResetCache();

        LoggingLevelSwitch.MinimumLevel = Get.General.LogLevel switch
--- a/server/RdtClient.Service/Services/TorrentRunner.cs
+++ b/server/RdtClient.Service/Services/TorrentRunner.cs
@ -11,40 +11,35 @@ using RdtClient.Service.Services.Downloaders;

 namespace RdtClient.Service.Services;

-public class TorrentRunner(
-    ILogger<TorrentRunner> logger,
-    Torrents torrents,
-    Downloads downloads,
-    RemoteService remoteService,
-    IHttpClientFactory httpClientFactory,
-    IRateLimitCoordinator coordinator,
-    ISettings settings,
-    ITorrentRunnerState runnerState)
+public class TorrentRunner(ILogger<TorrentRunner> logger, Torrents torrents, Downloads downloads, RemoteService remoteService, IHttpClientFactory httpClientFactory)
 {
-    public static readonly ITorrentRunnerState SharedState = new TorrentRunnerState();
+    public static readonly ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients = new();
+    public static readonly ConcurrentDictionary<Guid, UnpackClient> ActiveUnpackClients = new();

-    public static ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients => SharedState.ActiveDownloadClients;
+    public static Boolean IsPausedForLowDiskSpace { get; set; }

-    public static ConcurrentDictionary<Guid, UnpackClient> ActiveUnpackClients => SharedState.ActiveUnpackClients;
-
-    private DateTimeOffset? _lastNextAllowedAt;
-
-    public static Boolean IsPausedForLowDiskSpace
-    {
-        get => SharedState.IsPausedForLowDiskSpace;
-        set => SharedState.IsPausedForLowDiskSpace = value;
-    }
+    public static DateTimeOffset NextDequeueTime { get; private set; } = DateTimeOffset.MinValue;

    public static (Int64 Speed, Int64 BytesTotal, Int64 BytesDone) GetStats(Guid downloadId)
    {
-        return SharedState.GetStats(downloadId);
+        if (ActiveDownloadClients.TryGetValue(downloadId, out var downloadClient))
+        {
+            return (downloadClient.Speed, downloadClient.BytesTotal, downloadClient.BytesDone);
+        }
+
+        if (ActiveUnpackClients.TryGetValue(downloadId, out var unpackClient))
+        {
+            return (0, 100, unpackClient.Progess);
+        }
+
+        return (0, 0, 0);
    }

    public async Task Initialize()
    {
        Log("Initializing TorrentRunner");

-        var settingsCopy = JsonSerializer.Deserialize<DbSettings>(JsonSerializer.Serialize(settings.Current));
+        var settingsCopy = JsonSerializer.Deserialize<DbSettings>(JsonSerializer.Serialize(Settings.Get));

        if (settingsCopy != null)
        {
@ -87,28 +82,28 @@ public class TorrentRunner(

    public async Task Tick()
    {
-        if (String.IsNullOrWhiteSpace(settings.Current.Provider.ApiKey))
+        if (String.IsNullOrWhiteSpace(Settings.Get.Provider.ApiKey))
        {
            Log($"No RealDebridApiKey set in settings");

            return;
        }

-        var settingDownloadLimit = settings.Current.General.DownloadLimit;
+        var settingDownloadLimit = Settings.Get.General.DownloadLimit;

        if (settingDownloadLimit < 1)
        {
            settingDownloadLimit = 1;
        }

-        var settingUnpackLimit = settings.Current.General.UnpackLimit;
+        var settingUnpackLimit = Settings.Get.General.UnpackLimit;

        if (settingUnpackLimit < 0)
        {
            settingUnpackLimit = 0;
        }

-        var settingDownloadPath = settings.Current.DownloadClient.DownloadPath;
+        var settingDownloadPath = Settings.Get.DownloadClient.DownloadPath;

        if (String.IsNullOrWhiteSpace(settingDownloadPath))
        {
@ -120,46 +115,25 @@ public class TorrentRunner(
        var sw = new Stopwatch();
        sw.Start();

-        var currentNextAllowedAt = coordinator.GetMaxNextAllowedAt();
-
-        if (currentNextAllowedAt != _lastNextAllowedAt)
+        if (!ActiveDownloadClients.IsEmpty || !ActiveUnpackClients.IsEmpty)
        {
-            if (currentNextAllowedAt == null || currentNextAllowedAt <= DateTimeOffset.UtcNow)
-            {
-                if (_lastNextAllowedAt > DateTimeOffset.UtcNow)
-                {
-                    Log("Rate-limit cooldown expired, resuming dequeuing");
-
-                    await remoteService.UpdateRateLimitStatus(new()
-                    {
-                        NextDequeueTime = null,
-                        SecondsRemaining = 0
-                    });
-                }
-            }
-
-            _lastNextAllowedAt = currentNextAllowedAt;
+            Log($"TorrentRunner Tick Start, {ActiveDownloadClients.Count} active downloads, {ActiveUnpackClients.Count} active unpacks");
        }

-        if (!runnerState.ActiveDownloadClients.IsEmpty || !runnerState.ActiveUnpackClients.IsEmpty)
-        {
-            Log($"TorrentRunner Tick Start, {runnerState.ActiveDownloadClients.Count} active downloads, {runnerState.ActiveUnpackClients.Count} active unpacks");
-        }
-
-        if (runnerState.ActiveDownloadClients.Any(m => m.Value.Type == Data.Enums.DownloadClient.Aria2c))
+        if (ActiveDownloadClients.Any(m => m.Value.Type == Data.Enums.DownloadClient.Aria2c))
        {
            Log("Updating Aria2 status");

            var httpClient = httpClientFactory.CreateClient();
            httpClient.Timeout = TimeSpan.FromSeconds(10);

-            var aria2NetClient = new Aria2NetClient(settings.Current.DownloadClient.Aria2cUrl, settings.Current.DownloadClient.Aria2cSecret, httpClient, 1);
+            var aria2NetClient = new Aria2NetClient(Settings.Get.DownloadClient.Aria2cUrl, Settings.Get.DownloadClient.Aria2cSecret, httpClient, 1);

            var allDownloads = await aria2NetClient.TellAllAsync();

            Log($"Found {allDownloads.Count} Aria2 downloads");

-            foreach (var activeDownload in runnerState.ActiveDownloadClients)
+            foreach (var activeDownload in ActiveDownloadClients)
            {
                if (activeDownload.Value.Downloader is Aria2cDownloader aria2Downloader)
                {
@ -170,11 +144,11 @@ public class TorrentRunner(
            Log("Finished updating Aria2 status");
        }

-        if (runnerState.ActiveDownloadClients.Any(m => m.Value.Type == Data.Enums.DownloadClient.DownloadStation))
+        if (ActiveDownloadClients.Any(m => m.Value.Type == Data.Enums.DownloadClient.DownloadStation))
        {
            Log("Updating DownloadStation status");

-            foreach (var activeDownload in runnerState.ActiveDownloadClients)
+            foreach (var activeDownload in ActiveDownloadClients)
            {
                if (activeDownload.Value.Downloader is DownloadStationDownloader downloadStationDownloader)
                {
@ -184,7 +158,7 @@ public class TorrentRunner(
        }

        // Check if any torrents are finished downloading to the host, remove them from the active download list.
-        var completedActiveDownloads = runnerState.ActiveDownloadClients.Where(m => m.Value.Finished).ToList();
+        var completedActiveDownloads = ActiveDownloadClients.Where(m => m.Value.Finished).ToList();

        if (completedActiveDownloads.Count > 0)
        {
@ -196,7 +170,7 @@ public class TorrentRunner(

                if (download == null)
                {
-                    runnerState.ActiveDownloadClients.TryRemove(downloadId, out _);
+                    ActiveDownloadClients.TryRemove(downloadId, out _);

                    Log($"Download with ID {downloadId} not found! Removed from download queue");

@ -237,14 +211,14 @@ public class TorrentRunner(
                    await downloads.UpdateUnpackingQueued(downloadId, DateTimeOffset.UtcNow);
                }

-                runnerState.ActiveDownloadClients.TryRemove(downloadId, out _);
+                ActiveDownloadClients.TryRemove(downloadId, out _);

                Log($"Removed from ActiveDownloadClients", download, download.Torrent);
            }
        }

        // Check if any torrents are finished unpacking, remove them from the active unpack list.
-        var completedUnpacks = runnerState.ActiveUnpackClients.Where(m => m.Value.Finished).ToList();
+        var completedUnpacks = ActiveUnpackClients.Where(m => m.Value.Finished).ToList();

        if (completedUnpacks.Count > 0)
        {
@ -256,7 +230,7 @@ public class TorrentRunner(

                if (download == null)
                {
-                    runnerState.ActiveUnpackClients.TryRemove(downloadId, out _);
+                    ActiveUnpackClients.TryRemove(downloadId, out _);

                    Log($"Download with ID {downloadId} not found! Removed from unpack queue");

@ -278,33 +252,36 @@ public class TorrentRunner(

                await downloads.UpdateCompleted(downloadId, DateTimeOffset.UtcNow);

-                runnerState.ActiveUnpackClients.TryRemove(downloadId, out _);
+                ActiveUnpackClients.TryRemove(downloadId, out _);

                Log($"Removed from ActiveUnpackClients", download, download.Torrent);
            }
        }

        var allTorrents = await torrents.Get();
-        var downloadsById = allTorrents.SelectMany(m => m.Downloads).ToDictionary(m => m.DownloadId, m => m);

        // Check for deleted torrents that are stuck in the ActiveDownloads or ActiveUnpacks
-        foreach (var activeDownload in runnerState.ActiveDownloadClients)
+        foreach (var activeDownload in ActiveDownloadClients)
        {
-            if (!downloadsById.ContainsKey(activeDownload.Key))
+            var download = allTorrents.SelectMany(m => m.Downloads).FirstOrDefault(m => m.DownloadId == activeDownload.Key);
+
+            if (download == null)
            {
                await activeDownload.Value.Cancel();
-                runnerState.ActiveDownloadClients.TryRemove(activeDownload.Key, out _);
+                ActiveDownloadClients.TryRemove(activeDownload.Key, out _);

                break;
            }
        }

-        foreach (var activeUnpacks in runnerState.ActiveUnpackClients)
+        foreach (var activeUnpacks in ActiveUnpackClients)
        {
-            if (!downloadsById.ContainsKey(activeUnpacks.Key))
+            var download = allTorrents.SelectMany(m => m.Downloads).FirstOrDefault(m => m.DownloadId == activeUnpacks.Key);
+
+            if (download == null)
            {
                activeUnpacks.Value.Cancel();
-                runnerState.ActiveUnpackClients.TryRemove(activeUnpacks.Key, out _);
+                ActiveUnpackClients.TryRemove(activeUnpacks.Key, out _);

                break;
            }
@ -367,24 +344,31 @@ public class TorrentRunner(
        }

        // Process torrents in DebridQueue
-        var torrentsToAddToProvider = allTorrents
-                                      .Where(m => m.Completed == null && m.Error == null && m.RdId == null && m.RdAdded == null && m.FileOrMagnet != null &&
-                                                  m.RdStatus == TorrentStatus.Queued)
-                                      .ToList();
+        var torrentsToAddToProvider = allTorrents.Where(m => m.RdId == null && m.RdAdded == null && m.FileOrMagnet != null && m.RdStatus == TorrentStatus.Queued)
+                                                 .ToList();

        if (torrentsToAddToProvider.Count != 0)
        {
-            var nextAllowedAt = coordinator.GetMaxNextAllowedAt();
-
-            if (nextAllowedAt > DateTimeOffset.UtcNow)
+            if (DateTimeOffset.Now < NextDequeueTime)
            {
-                logger.LogDebug($"Dequeuing torrents is paused until {nextAllowedAt}, {nextAllowedAt - DateTimeOffset.Now} remaining");
+                logger.LogDebug($"Dequeuing torrents is paused until {NextDequeueTime}, {NextDequeueTime - DateTimeOffset.Now} remaining");
            }
            else
            {
+                if (NextDequeueTime != DateTimeOffset.MinValue)
+                {
+                    NextDequeueTime = DateTimeOffset.MinValue;
+
+                    await remoteService.UpdateRateLimitStatus(new()
+                    {
+                        NextDequeueTime = null,
+                        SecondsRemaining = 0
+                    });
+                }
+
                var downloadingTorrentsCount = allTorrents.Count(m => m.RdStatus is not (TorrentStatus.Queued or TorrentStatus.Finished or TorrentStatus.Error));

-                var maxParallelDownloads = settings.Current.Provider.MaxParallelDownloads;
+                var maxParallelDownloads = Settings.Get.Provider.MaxParallelDownloads;

                logger.LogDebug("Currently downloading {downloadingTorrentCount}/{maxParallelDownloads} torrents, {queuedCount} queued.",
                                downloadingTorrentsCount,
@ -479,35 +463,31 @@ public class TorrentRunner(
            {
                // Check if there are any downloads that are queued and can be started.
                var queuedDownloads = torrent.Downloads
-                                             .Where(m => m.Completed == null
-                                                         && m.DownloadQueued != null
-                                                         && m.DownloadQueued <= DateTimeOffset.UtcNow
-                                                         && m.DownloadStarted == null
-                                                         && m.Error == null)
+                                             .Where(m => m.Completed == null && m.DownloadQueued != null && m.DownloadStarted == null && m.Error == null)
                                             .OrderBy(m => m.DownloadQueued)
                                             .ToList();

-                Log($"Currently {queuedDownloads.Count} queued downloads and {runnerState.ActiveDownloadClients.Count} total active downloads", torrent);
+                Log($"Currently {queuedDownloads.Count} queued downloads and {ActiveDownloadClients.Count} total active downloads", torrent);

                foreach (var download in queuedDownloads)
                {
                    Log($"Processing to download", download, torrent);

-                    if (runnerState.ActiveDownloadClients.Count >= settingDownloadLimit && torrent.DownloadClient != Data.Enums.DownloadClient.Symlink)
+                    if (ActiveDownloadClients.Count >= settingDownloadLimit && torrent.DownloadClient != Data.Enums.DownloadClient.Symlink)
                    {
                        Log($"Not starting download because there are already the max number of downloads active", download, torrent);

                        return;
                    }

-                    if (runnerState.IsPausedForLowDiskSpace && torrent.DownloadClient == Data.Enums.DownloadClient.Bezzad)
+                    if (IsPausedForLowDiskSpace && torrent.DownloadClient == Data.Enums.DownloadClient.Bezzad)
                    {
                        logger.LogInformation($"Not starting Bezzad download because of low disk space {download.ToLog()} {torrent.ToLog()}");

                        return;
                    }

-                    if (runnerState.ActiveDownloadClients.ContainsKey(download.DownloadId))
+                    if (ActiveDownloadClients.ContainsKey(download.DownloadId))
                    {
                        Log($"Not starting download because this download is already active", download, torrent);

@ -534,24 +514,10 @@ public class TorrentRunner(
                    {
                        logger.LogError(ex, "Cannot unrestrict link: {ex.Message}", ex.Message);

-                        if (download.RetryCount < torrent.DownloadRetryAttempts)
-                        {
-                            var retryCount = download.RetryCount + 1;
-                            var retryDelay = GetDownloadLinkRetryDelay(retryCount);
-                            var retryAt = DateTimeOffset.UtcNow.Add(retryDelay);
-
-                            Log($"Retrying download link generation {retryCount}/{torrent.DownloadRetryAttempts} at {retryAt:u}", download, torrent);
-
-                            await downloads.Reset(download.DownloadId, retryAt);
-                            await downloads.UpdateRetryCount(download.DownloadId, retryCount);
-                        }
-                        else
-                        {
-                            await downloads.UpdateError(download.DownloadId, ex.Message);
-                            await downloads.UpdateCompleted(download.DownloadId, DateTimeOffset.UtcNow);
-                            download.Error = ex.Message;
-                            download.Completed = DateTimeOffset.UtcNow;
-                        }
+                        await downloads.UpdateError(download.DownloadId, ex.Message);
+                        await downloads.UpdateCompleted(download.DownloadId, DateTimeOffset.UtcNow);
+                        download.Error = ex.Message;
+                        download.Completed = DateTimeOffset.UtcNow;

                        return;
                    }
@ -573,7 +539,7 @@ public class TorrentRunner(
                    // Start the download process
                    var downloadClient = new DownloadClient(download, torrent, downloadPath, torrent.Category);

-                    if (runnerState.ActiveDownloadClients.TryAdd(download.DownloadId, downloadClient))
+                    if (ActiveDownloadClients.TryAdd(download.DownloadId, downloadClient))
                    {
                        Log($"Starting download", download, torrent);

@ -593,7 +559,7 @@ public class TorrentRunner(
                                await downloads.UpdateRemoteId(download.DownloadId, remoteId);
                            }

-                            if (runnerState.IsPausedForLowDiskSpace && downloadClient.Type == Data.Enums.DownloadClient.Bezzad)
+                            if (IsPausedForLowDiskSpace && downloadClient.Type == Data.Enums.DownloadClient.Bezzad)
                            {
                                logger.LogInformation($"Pausing new Bezzad download due to low disk space {download.ToLog()} {torrent.ToLog()}");
                                await downloadClient.Pause();
@ -653,14 +619,14 @@ public class TorrentRunner(
                    }

                    // Check if we have reached the download limit, if so queue the download, but don't start it.
-                    if (runnerState.ActiveUnpackClients.Count >= settingUnpackLimit)
+                    if (ActiveUnpackClients.Count >= settingUnpackLimit)
                    {
                        Log($"Not starting unpack because there are already the max number of unpacks active", download, torrent);

                        continue;
                    }

-                    if (runnerState.ActiveUnpackClients.ContainsKey(download.DownloadId))
+                    if (ActiveUnpackClients.ContainsKey(download.DownloadId))
                    {
                        Log($"Not starting unpack because this download is already active", download, torrent);

@ -682,7 +648,7 @@ public class TorrentRunner(
                    // Start the unpacking process
                    var unpackClient = new UnpackClient(download, downloadPath);

-                    if (runnerState.ActiveUnpackClients.TryAdd(download.DownloadId, unpackClient))
+                    if (ActiveUnpackClients.TryAdd(download.DownloadId, unpackClient))
                    {
                        Log($"Starting unpack", download, torrent);

@ -740,8 +706,8 @@ public class TorrentRunner(

                    var completePerc = 0;

-                    var totalDownloadBytes = torrent.Downloads.Sum(m => runnerState.GetStats(m.DownloadId).BytesTotal);
-                    var totalDoneBytes = torrent.Downloads.Sum(m => runnerState.GetStats(m.DownloadId).BytesDone);
+                    var totalDownloadBytes = torrent.Downloads.Sum(m => GetStats(m.DownloadId).BytesTotal);
+                    var totalDoneBytes = torrent.Downloads.Sum(m => GetStats(m.DownloadId).BytesDone);

                    if (totalDownloadBytes > 0)
                    {
@ -786,35 +752,17 @@ public class TorrentRunner(

    public async Task SetRateLimit(TimeSpan retryAfter, String message)
    {
-        coordinator.UpdateCooldown("General", retryAfter);
-        var nextDequeueTime = coordinator.GetMaxNextAllowedAt();
-        var now = DateTimeOffset.UtcNow;
-        var secondsRemaining = nextDequeueTime.HasValue ? (nextDequeueTime.Value - now).TotalSeconds : 0;
+        NextDequeueTime = DateTimeOffset.Now.Add(retryAfter);

-        Log($"Rate-limit reached, pausing dequeuing for {retryAfter.TotalMinutes} minutes (until {nextDequeueTime}): {message}");
-
-        _lastNextAllowedAt = nextDequeueTime;
+        Log($"Rate-limit reached, pausing dequeuing for {retryAfter.TotalMinutes} minutes (until {NextDequeueTime}): {message}");

        await remoteService.UpdateRateLimitStatus(new()
        {
-            NextDequeueTime = nextDequeueTime,
-            SecondsRemaining = secondsRemaining
+            NextDequeueTime = NextDequeueTime,
+            SecondsRemaining = retryAfter.TotalSeconds
        });
    }

-    private static TimeSpan GetDownloadLinkRetryDelay(Int32 retryCount)
-    {
-        var seconds = retryCount switch
-        {
-            <= 1 => 15,
-            2 => 30,
-            3 => 60,
-            _ => 120
-        };
-
-        return TimeSpan.FromSeconds(seconds);
-    }
-
    private void Log(String message, Download? download, Torrent? torrent)
    {
        if (download != null)
--- a/server/RdtClient.Service/Services/TorrentRunnerState.cs
+++ b/server/RdtClient.Service/Services/TorrentRunnerState.cs
@ -1,47 +0,0 @@
-using System.Collections.Concurrent;
-
-namespace RdtClient.Service.Services;
-
-public interface ITorrentRunnerState
-{
-    ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients { get; }
-
-    ConcurrentDictionary<Guid, UnpackClient> ActiveUnpackClients { get; }
-
-    Boolean IsPausedForLowDiskSpace { get; set; }
-
-    (Int64 Speed, Int64 BytesTotal, Int64 BytesDone) GetStats(Guid downloadId);
-
-    void Clear();
-}
-
-public class TorrentRunnerState : ITorrentRunnerState
-{
-    public ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients { get; } = new();
-
-    public ConcurrentDictionary<Guid, UnpackClient> ActiveUnpackClients { get; } = new();
-
-    public Boolean IsPausedForLowDiskSpace { get; set; }
-
-    public (Int64 Speed, Int64 BytesTotal, Int64 BytesDone) GetStats(Guid downloadId)
-    {
-        if (ActiveDownloadClients.TryGetValue(downloadId, out var downloadClient))
-        {
-            return (downloadClient.Speed, downloadClient.BytesTotal, downloadClient.BytesDone);
-        }
-
-        if (ActiveUnpackClients.TryGetValue(downloadId, out var unpackClient))
-        {
-            return (0, 100, unpackClient.Progess);
-        }
-
-        return (0, 0, 0);
-    }
-
-    public void Clear()
-    {
-        ActiveDownloadClients.Clear();
-        ActiveUnpackClients.Clear();
-        IsPausedForLowDiskSpace = false;
-    }
-}
--- a/server/RdtClient.Service/Services/Torrents.cs
+++ b/server/RdtClient.Service/Services/Torrents.cs
@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.IO.Abstractions;
 using System.Security.Cryptography;
 using System.Text;
@ -32,24 +32,22 @@ public class Torrents(
    PremiumizeDebridClient premiumizeDebridClient,
    RealDebridDebridClient realDebridDebridClient,
    DebridLinkClient debridLinkClient,
-    TorBoxDebridClient torBoxDebridClient,
-    ISettings settings,
-    ITorrentRunnerState runnerState)
+    TorBoxDebridClient torBoxDebridClient)
 {
    private static readonly SemaphoreSlim RealDebridUpdateLock = new(1, 1);

-    private static readonly SemaphoreSlim TorrentResetLock = new(1, 1);
-
    private static readonly JsonSerializerOptions JsonSerializerOptions = new()
    {
        ReferenceHandler = ReferenceHandler.IgnoreCycles
    };

+    private static readonly SemaphoreSlim TorrentResetLock = new(1, 1);
+
    private IDebridClient DebridClient
    {
        get
        {
-            return settings.Current.Provider.Provider switch
+            return Settings.Get.Provider.Provider switch
            {
                Provider.Premiumize => premiumizeDebridClient,
                Provider.RealDebrid => realDebridDebridClient,
@ -63,7 +61,7 @@ public class Torrents(

    public virtual (Int64 Speed, Int64 BytesTotal, Int64 BytesDone) GetDownloadStats(Guid downloadId)
    {
-        return runnerState.GetStats(downloadId);
+        return TorrentRunner.GetStats(downloadId);
    }

    public virtual async Task<IList<Torrent>> Get()
@ -199,9 +197,9 @@ public class Torrents(
            throw new($"{ex.Message}, trying to parse {magnetLink}");
        }

-        if (!String.IsNullOrWhiteSpace(settings.Current.General.BannedTrackers))
+        if (!String.IsNullOrWhiteSpace(Settings.Get.General.BannedTrackers))
        {
-            var bannedTrackers = settings.Current.General.BannedTrackers.Split(',');
+            var bannedTrackers = Settings.Get.General.BannedTrackers.Split(',');

            foreach (var bannedTracker in bannedTrackers)
            {
@ -266,9 +264,9 @@ public class Torrents(
            throw new($"{ex.Message}, trying to parse {fileAsBase64}");
        }

-        if (!String.IsNullOrWhiteSpace(settings.Current.General.BannedTrackers))
+        if (!String.IsNullOrWhiteSpace(Settings.Get.General.BannedTrackers))
        {
-            var bannedTrackers = settings.Current.General.BannedTrackers.Split(',');
+            var bannedTrackers = Settings.Get.General.BannedTrackers.Split(',');

            foreach (var bannedTracker in bannedTrackers)
            {
@ -314,16 +312,16 @@ public class Torrents(

    private async Task CopyAddedTorrent(Torrent torrent)
    {
-        if (String.IsNullOrWhiteSpace(settings.Current.General.CopyAddedTorrents) || String.IsNullOrWhiteSpace(torrent.FileOrMagnet) || String.IsNullOrWhiteSpace(torrent.RdName))
+        if (String.IsNullOrWhiteSpace(Settings.Get.General.CopyAddedTorrents) || String.IsNullOrWhiteSpace(torrent.FileOrMagnet) || String.IsNullOrWhiteSpace(torrent.RdName))
        {
            return;
        }

        try
        {
-            if (!fileSystem.Directory.Exists(settings.Current.General.CopyAddedTorrents))
+            if (!fileSystem.Directory.Exists(Settings.Get.General.CopyAddedTorrents))
            {
-                fileSystem.Directory.CreateDirectory(settings.Current.General.CopyAddedTorrents);
+                fileSystem.Directory.CreateDirectory(Settings.Get.General.CopyAddedTorrents);
            }

            var extension = torrent.Type switch
@ -333,7 +331,7 @@ public class Torrents(
                _ => throw new ArgumentException("Unexpected DownloadType")
            };

-            var copyFileName = Path.Combine(settings.Current.General.CopyAddedTorrents, FileHelper.RemoveInvalidFileNameChars(torrent.RdName));
+            var copyFileName = Path.Combine(Settings.Get.General.CopyAddedTorrents, FileHelper.RemoveInvalidFileNameChars(torrent.RdName));

            if (!copyFileName.EndsWith(extension, StringComparison.OrdinalIgnoreCase))
            {
@ -357,7 +355,7 @@ public class Torrents(
        }
        catch (Exception ex)
        {
-            logger.LogError(ex, $"Unable to create torrent blackhole directory: {settings.Current.General.CopyAddedTorrents}: {ex.Message}");
+            logger.LogError(ex, $"Unable to create torrent blackhole directory: {Settings.Get.General.CopyAddedTorrents}: {ex.Message}");
        }
    }

@ -459,23 +457,12 @@ public class Torrents(

        foreach (var downloadInfo in downloadInfos)
        {
-            var addResult = await downloads.TryAddForTorrent(torrent.TorrentId, downloadInfo);
+            // Make sure downloads don't get added multiple times
+            var downloadExists = await downloads.Get(torrent.TorrentId, downloadInfo.RestrictedLink);

-            switch (addResult)
+            if (downloadExists == null && !String.IsNullOrWhiteSpace(downloadInfo.RestrictedLink))
            {
-                case DownloadAddResult.Added:
-                case DownloadAddResult.AlreadyExists:
-                    continue;
-                case DownloadAddResult.TorrentMissing:
-                    logger.LogDebug("Stopping download creation because the torrent was deleted concurrently. TorrentId: {torrentId}", torrent.TorrentId);
-
-                    return;
-                case DownloadAddResult.InvalidInput:
-                    logger.LogDebug("Skipping download creation because the provider returned an invalid download link. TorrentId: {torrentId}", torrent.TorrentId);
-
-                    continue;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(addResult), addResult, null);
+                await downloads.Add(torrent.TorrentId, downloadInfo);
            }
        }
    }
@ -513,7 +500,7 @@ public class Torrents(
        {
            var retry = 10;

-            while (runnerState.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
+            while (TorrentRunner.ActiveDownloadClients.TryGetValue(download.DownloadId, out var downloadClient))
            {
                Log($"Cancelling download", download, torrent);

@ -531,7 +518,7 @@ public class Torrents(

            retry = 10;

-            while (runnerState.ActiveUnpackClients.TryGetValue(download.DownloadId, out var unpackClient))
+            while (TorrentRunner.ActiveUnpackClients.TryGetValue(download.DownloadId, out var unpackClient))
            {
                Log($"Cancelling unpack", download, torrent);

@ -552,6 +539,7 @@ public class Torrents(
        {
            Log($"Deleting RdtClient data", torrent);

+            await downloads.DeleteForTorrent(torrent.TorrentId);
            await torrentData.Delete(torrentId);
        }

@ -571,7 +559,7 @@ public class Torrents(

        if (deleteLocalFiles && !String.IsNullOrWhiteSpace(torrent.RdName))
        {
-            var downloadPath = DownloadPath(torrent, settings.Current);
+            var downloadPath = DownloadPath(torrent);
            downloadPath = Path.Combine(downloadPath, torrent.RdName);

            Log($"Deleting local files in {downloadPath}", torrent);
@ -617,6 +605,7 @@ public class Torrents(
        return unrestrictedLink;
    }

+    /// <inheritdoc />
    public async Task<String> RetrieveFileName(Guid downloadId)
    {
        var download = await downloads.GetById(downloadId) ?? throw new($"Download with ID {downloadId} not found");
@ -636,13 +625,13 @@ public class Torrents(

        var profile = new Profile
        {
-            Provider = Enum.GetName(settings.Current.Provider.Provider),
+            Provider = Enum.GetName(Settings.Get.Provider.Provider),
            UserName = user.Username,
            Expiration = user.Expiration,
            CurrentVersion = UpdateChecker.CurrentVersion,
            LatestVersion = UpdateChecker.LatestVersion,
            IsInsecure = UpdateChecker.IsInsecure,
-            DisableUpdateNotification = settings.Current.General.DisableUpdateNotifications
+            DisableUpdateNotification = Settings.Get.General.DisableUpdateNotifications
        };

        return profile;
@ -657,65 +646,31 @@ public class Torrents(
        try
        {
            var rdTorrents = await DebridClient.GetDownloads();
-            var torrentsByRdId = CreateTorrentLookupByRdId(torrents);
-            var providerTorrentsById = CreateProviderTorrentLookupById(rdTorrents);

            foreach (var rdTorrent in rdTorrents)
            {
-                torrentsByRdId.TryGetValue(rdTorrent.Id, out var torrent);
-
-                // TorBox migration from storing torrent hash in RdId to torrent ids.
-                if (torrent == null
-                    && Settings.Get.Provider.Provider == Provider.TorBox
-                    && rdTorrent.Type == DownloadType.Torrent
-                    && !String.IsNullOrWhiteSpace(rdTorrent.Hash)
-                    && !String.IsNullOrWhiteSpace(rdTorrent.Id))
-                {
-                    torrent = torrents.FirstOrDefault(localTorrent => localTorrent is { Type: DownloadType.Torrent, ClientKind: null or Provider.TorBox }
-                                                                      && !String.IsNullOrWhiteSpace(localTorrent.Hash)
-                                                                      && !String.IsNullOrWhiteSpace(localTorrent.RdId)
-                                                                      && localTorrent.RdId.Equals(localTorrent.Hash, StringComparison.OrdinalIgnoreCase)
-                                                                      && localTorrent.Hash.Equals(rdTorrent.Hash, StringComparison.OrdinalIgnoreCase));
-
-                    if (torrent != null)
-                    {
-                        if (!String.IsNullOrWhiteSpace(torrent.RdId))
-                        {
-                            torrentsByRdId.Remove(torrent.RdId);
-                        }
-
-                        await torrentData.UpdateRdId(torrent, rdTorrent.Id);
-                        torrent.RdId = rdTorrent.Id;
-                        torrent.ClientKind = Provider.TorBox;
-                        torrentsByRdId[rdTorrent.Id] = torrent;
-
-                        logger.LogInformation("Migrated TorBox torrent RdId from hash to torrent id for {TorrentName} ({Hash}) -> {RdId}",
-                                              torrent.RdName ?? rdTorrent.Filename,
-                                              rdTorrent.Hash,
-                                              rdTorrent.Id);
-                    }
-                }
+                var torrent = torrents.FirstOrDefault(m => m.RdId == rdTorrent.Id);

                // Auto import torrents only torrents that have their files selected
-                if (torrent == null && settings.Current.Provider.AutoImport)
+                if (torrent == null && Settings.Get.Provider.AutoImport)
                {
                    var newTorrent = new Torrent
                    {
-                        Category = settings.Current.Provider.Default.Category,
-                        DownloadClient = settings.Current.DownloadClient.Client,
+                        Category = Settings.Get.Provider.Default.Category,
+                        DownloadClient = Settings.Get.DownloadClient.Client,
                        DownloadAction =
-                            settings.Current.Provider.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
-                        HostDownloadAction = settings.Current.Provider.Default.HostDownloadAction,
-                        FinishedActionDelay = settings.Current.Provider.Default.FinishedActionDelay,
-                        FinishedAction = settings.Current.Provider.Default.FinishedAction,
-                        DownloadMinSize = settings.Current.Provider.Default.MinFileSize,
-                        IncludeRegex = settings.Current.Provider.Default.IncludeRegex,
-                        ExcludeRegex = settings.Current.Provider.Default.ExcludeRegex,
-                        TorrentRetryAttempts = settings.Current.Provider.Default.TorrentRetryAttempts,
-                        DownloadRetryAttempts = settings.Current.Provider.Default.DownloadRetryAttempts,
-                        DeleteOnError = settings.Current.Provider.Default.DeleteOnError,
-                        Lifetime = settings.Current.Provider.Default.TorrentLifetime,
-                        Priority = settings.Current.Provider.Default.Priority > 0 ? settings.Current.Provider.Default.Priority : null,
+                            Settings.Get.Provider.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
+                        HostDownloadAction = Settings.Get.Provider.Default.HostDownloadAction,
+                        FinishedActionDelay = Settings.Get.Provider.Default.FinishedActionDelay,
+                        FinishedAction = Settings.Get.Provider.Default.FinishedAction,
+                        DownloadMinSize = Settings.Get.Provider.Default.MinFileSize,
+                        IncludeRegex = Settings.Get.Provider.Default.IncludeRegex,
+                        ExcludeRegex = Settings.Get.Provider.Default.ExcludeRegex,
+                        TorrentRetryAttempts = Settings.Get.Provider.Default.TorrentRetryAttempts,
+                        DownloadRetryAttempts = Settings.Get.Provider.Default.DownloadRetryAttempts,
+                        DeleteOnError = Settings.Get.Provider.Default.DeleteOnError,
+                        Lifetime = Settings.Get.Provider.Default.TorrentLifetime,
+                        Priority = Settings.Get.Provider.Default.Priority > 0 ? Settings.Get.Provider.Default.Priority : null,
                        RdId = rdTorrent.Id
                    };

@ -724,9 +679,7 @@ public class Torrents(
                        continue;
                    }

-                    torrent = await torrentData.Add(rdTorrent.Id, rdTorrent.Hash, null, false, DownloadType.Torrent, settings.Current.DownloadClient.Client, newTorrent);
-                    torrentsByRdId[rdTorrent.Id] = torrent;
-                    torrents.Add(torrent);
+                    torrent = await torrentData.Add(rdTorrent.Id, rdTorrent.Hash, null, false, DownloadType.Torrent, Settings.Get.DownloadClient.Client, newTorrent);

                    await UpdateTorrentClientData(torrent, rdTorrent);
                }
@ -738,9 +691,9 @@ public class Torrents(

            foreach (var torrent in torrents)
            {
-                var rdTorrent = torrent.RdId != null && providerTorrentsById.TryGetValue(torrent.RdId, out var providerTorrent) ? providerTorrent : null;
+                var rdTorrent = rdTorrents.FirstOrDefault(m => m.Id == torrent.RdId);

-                if (rdTorrent == null && settings.Current.Provider.AutoDelete && torrent.RdStatus != TorrentStatus.Queued)
+                if (rdTorrent == null && Settings.Get.Provider.AutoDelete && torrent.RdStatus != TorrentStatus.Queued)
                {
                    await Delete(torrent.TorrentId, true, false, true);
                }
@ -778,14 +731,14 @@ public class Torrents(

            foreach (var download in torrent.Downloads)
            {
-                while (runnerState.ActiveDownloadClients.TryRemove(download.DownloadId, out var downloadClient))
+                while (TorrentRunner.ActiveDownloadClients.TryRemove(download.DownloadId, out var downloadClient))
                {
                    await downloadClient.Cancel();

                    await Task.Delay(100);
                }

-                while (runnerState.ActiveUnpackClients.TryRemove(download.DownloadId, out var unpackClient))
+                while (TorrentRunner.ActiveUnpackClients.TryRemove(download.DownloadId, out var unpackClient))
                {
                    unpackClient.Cancel();

@ -848,21 +801,21 @@ public class Torrents(

        Log($"Retrying Download", download, download.Torrent);

-        while (runnerState.ActiveDownloadClients.TryRemove(download.DownloadId, out var downloadClient))
+        while (TorrentRunner.ActiveDownloadClients.TryRemove(download.DownloadId, out var downloadClient))
        {
            await downloadClient.Cancel();

            await Task.Delay(100);
        }

-        while (runnerState.ActiveUnpackClients.TryRemove(download.DownloadId, out var unpackClient))
+        while (TorrentRunner.ActiveUnpackClients.TryRemove(download.DownloadId, out var unpackClient))
        {
            unpackClient.Cancel();

            await Task.Delay(100);
        }

-        var downloadPath = DownloadPath(download.Torrent!, settings.Current);
+        var downloadPath = DownloadPath(download.Torrent!);

        var filePath = DownloadHelper.GetDownloadPath(downloadPath, download.Torrent!, download);

@ -890,43 +843,6 @@ public class Torrents(
        await torrentData.UpdateFilesSelected(torrentId, datetime);
    }

-    public async Task<Boolean> UpdateFileSelection(String hash, IReadOnlyCollection<Int32> fileIds, Boolean selected)
-    {
-        if (fileIds.Count == 0)
-        {
-            return false;
-        }
-
-        var torrent = await torrentData.GetByHash(hash);
-
-        if (torrent == null)
-        {
-            return false;
-        }
-
-        var files = torrent.Files.ToList();
-
-        if (files.Count == 0)
-        {
-            return false;
-        }
-
-        foreach (var fileId in fileIds)
-        {
-            if (fileId < 0 || fileId >= files.Count)
-            {
-                continue;
-            }
-
-            files[fileId].Selected = selected;
-        }
-
-        torrent.RdFiles = JsonSerializer.Serialize(files, JsonSerializerOptions);
-        await torrentData.UpdateRdData(torrent);
-
-        return true;
-    }
-
    public async Task UpdatePriority(String hash, Int32 priority)
    {
        var torrent = await torrentData.GetByHash(hash);
@ -963,9 +879,9 @@ public class Torrents(
        return torrent;
    }

-    private static String DownloadPath(Torrent torrent, DbSettings settings)
+    private static String DownloadPath(Torrent torrent)
    {
-        var settingDownloadPath = settings.DownloadClient.DownloadPath;
+        var settingDownloadPath = Settings.Get.DownloadClient.DownloadPath;

        if (!String.IsNullOrWhiteSpace(torrent.Category))
        {
@ -1004,11 +920,11 @@ public class Torrents(
        await torrentData.Update(torrent);
    }

-    public async Task RunTorrentComplete(Guid torrentId, DbSettings? runSettings = null)
+    public async Task RunTorrentComplete(Guid torrentId, DbSettings? settings = null)
    {
-        runSettings ??= settings.Current;
+        settings ??= Settings.Get;

-        if (String.IsNullOrWhiteSpace(runSettings.General.RunOnTorrentCompleteFileName))
+        if (String.IsNullOrWhiteSpace(settings.General.RunOnTorrentCompleteFileName))
        {
            return;
        }
@ -1017,12 +933,12 @@ public class Torrents(

        var downloadsForTorrent = await downloads.GetForTorrent(torrentId);

-        var fileName = runSettings.General.RunOnTorrentCompleteFileName;
-        var arguments = runSettings.General.RunOnTorrentCompleteArguments ?? "";
+        var fileName = settings.General.RunOnTorrentCompleteFileName;
+        var arguments = settings.General.RunOnTorrentCompleteArguments ?? "";

        Log($"Parsing external program {fileName} with arguments {arguments}", torrent);

-        var downloadPath = DownloadPath(torrent, runSettings);
+        var downloadPath = DownloadPath(torrent);
        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "Unknown");

        var filePath = torrentPath;
@ -1106,83 +1022,23 @@ public class Torrents(
    {
        try
        {
-            var originalTorrent = CaptureRdState(torrent);
+            var originalTorrent = JsonSerializer.Serialize(torrent, JsonSerializerOptions);

            await DebridClient.UpdateData(torrent, torrentClientTorrent);

-            var newTorrent = CaptureRdState(torrent);
+            var newTorrent = JsonSerializer.Serialize(torrent, JsonSerializerOptions);

            if (originalTorrent != newTorrent)
            {
                await torrentData.UpdateRdData(torrent);
            }
        }
-        catch (Exception)
+        catch
        {
            // ignored
        }
    }

-    private static Dictionary<String, Torrent> CreateTorrentLookupByRdId(IEnumerable<Torrent> torrents)
-    {
-        var lookup = new Dictionary<String, Torrent>(StringComparer.Ordinal);
-
-        foreach (var torrent in torrents)
-        {
-            if (!String.IsNullOrWhiteSpace(torrent.RdId))
-            {
-                lookup[torrent.RdId] = torrent;
-            }
-        }
-
-        return lookup;
-    }
-
-    private static Dictionary<String, DebridClientTorrent> CreateProviderTorrentLookupById(IEnumerable<DebridClientTorrent> torrents)
-    {
-        var lookup = new Dictionary<String, DebridClientTorrent>(StringComparer.Ordinal);
-
-        foreach (var torrent in torrents)
-        {
-            if (!String.IsNullOrWhiteSpace(torrent.Id))
-            {
-                lookup[torrent.Id] = torrent;
-            }
-        }
-
-        return lookup;
-    }
-
-    private static TorrentRdState CaptureRdState(Torrent torrent)
-    {
-        return new(torrent.RdName,
-                   torrent.RdSize,
-                   torrent.RdHost,
-                   torrent.RdSplit,
-                   torrent.RdProgress,
-                   torrent.RdStatus,
-                   torrent.RdStatusRaw,
-                   torrent.RdAdded,
-                   torrent.RdEnded,
-                   torrent.RdSpeed,
-                   torrent.RdSeeders,
-                   torrent.RdFiles);
-    }
-
-    private readonly record struct TorrentRdState(
-        String? RdName,
-        Int64? RdSize,
-        String? RdHost,
-        Int64? RdSplit,
-        Int64? RdProgress,
-        TorrentStatus? RdStatus,
-        String? RdStatusRaw,
-        DateTimeOffset? RdAdded,
-        DateTimeOffset? RdEnded,
-        Int64? RdSpeed,
-        Int64? RdSeeders,
-        String? RdFiles);
-
    private void Log(String message, Download? download, Torrent? torrent)
    {
        if (download != null)
--- a/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs
+++ b/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs
@ -1,98 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Moq;
-using RdtClient.Data.Models.QBittorrent;
-using RdtClient.Service.Services;
-using RdtClient.Web.Controllers;
-
-namespace RdtClient.Web.Test.Controllers;
-
-public class QBittorrentControllerTest
-{
-    private readonly QBittorrentController _controller;
-    private readonly Mock<QBittorrent> _qBittorrentMock;
-    private readonly Mock<Torrents> _torrentsMock;
-    private readonly TestSettings _settings;
-
-    public QBittorrentControllerTest()
-    {
-        _settings = new();
-        _qBittorrentMock = new(new Mock<ILogger<QBittorrent>>().Object, _settings, null!, null!, null!, new TorrentRunnerState());
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
-
-        _controller = new(new Mock<ILogger<QBittorrentController>>().Object,
-                          _qBittorrentMock.Object,
-                          new Mock<IHttpClientFactory>().Object,
-                          _settings,
-                          _torrentsMock.Object);
-
-        _controller.ControllerContext = new()
-        {
-            HttpContext = new DefaultHttpContext()
-        };
-    }
-
-    [Fact]
-    public async Task TorrentsInfo_FilterAll_DoesNotFilterOutResults()
-    {
-        // Arrange
-        _qBittorrentMock.Setup(q => q.TorrentInfo())
-                        .ReturnsAsync(new List<TorrentInfo>
-                        {
-                            new()
-                            {
-                                Hash = "hash1",
-                                State = "pausedUP",
-                                Progress = 1f
-                            }
-                        });
-
-        // Act
-        var result = await _controller.TorrentsInfo(new()
-        {
-            Filter = "all",
-            Hashes = "hash1"
-        });
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result.Result);
-        var payload = Assert.IsAssignableFrom<IList<TorrentInfo>>(okResult.Value);
-        Assert.Single(payload);
-        Assert.Equal("hash1", payload[0].Hash);
-    }
-
-    [Fact]
-    public async Task TorrentsInfo_FilterCompleted_MatchesPausedUploadTorrents()
-    {
-        // Arrange
-        _qBittorrentMock.Setup(q => q.TorrentInfo())
-                        .ReturnsAsync(new List<TorrentInfo>
-                        {
-                            new()
-                            {
-                                Hash = "hash1",
-                                State = "pausedUP",
-                                Progress = 1f
-                            },
-                            new()
-                            {
-                                Hash = "hash2",
-                                State = "downloading",
-                                Progress = 0.4f
-                            }
-                        });
-
-        // Act
-        var result = await _controller.TorrentsInfo(new()
-        {
-            Filter = "completed"
-        });
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result.Result);
-        var payload = Assert.IsAssignableFrom<IList<TorrentInfo>>(okResult.Value);
-        Assert.Single(payload);
-        Assert.Equal("hash1", payload[0].Hash);
-    }
-}
--- a/server/RdtClient.Web.Test/Controllers/SabnzbdControllerTest.cs
+++ b/server/RdtClient.Web.Test/Controllers/SabnzbdControllerTest.cs
@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Moq;
+using RdtClient.Data.Data;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Sabnzbd;
 using RdtClient.Service.Services;
@ -16,17 +17,15 @@ public class SabnzbdControllerTest
    private readonly Mock<Authentication> _authenticationMock;
    private readonly SabnzbdController _controller;
    private readonly Mock<Sabnzbd> _sabnzbdMock;
-    private readonly TestSettings _settings;

    public SabnzbdControllerTest()
    {
-        _settings = new();
-        _settings.Current.General.AuthenticationType = AuthenticationType.None;
-        _settings.Current.Provider.ApiKey = "test-api-key";
+        SettingData.Get.General.AuthenticationType = AuthenticationType.None;
+        SettingData.Get.Provider.ApiKey = "test-api-key";

-        var torrentsMock = new Mock<Torrents>(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
+        var torrentsMock = new Mock<Torrents>(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
        var sabnzbdLoggerMock = new Mock<ILogger<Sabnzbd>>();
-        _sabnzbdMock = new(sabnzbdLoggerMock.Object, torrentsMock.Object, null!, _settings);
+        _sabnzbdMock = new(sabnzbdLoggerMock.Object, torrentsMock.Object, null!);
        var loggerMock = new Mock<ILogger<SabnzbdController>>();
        _authenticationMock = new(null!, null!, null!);

@ -65,7 +64,7 @@ public class SabnzbdControllerTest
    public async Task GetQueue_Unauthorized_ReturnsOk_BecauseFilterIsSkippedInUnitTests()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        SettingData.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;

        var queue = new SabnzbdQueue
        {
@ -87,7 +86,7 @@ public class SabnzbdControllerTest
    public async Task GetQueue_WithMaAuth_ReturnsOk()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        SettingData.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
        var httpContext = new DefaultHttpContext();
        httpContext.Request.QueryString = new("?ma_username=user&ma_password=pass");
        _controller.ControllerContext.HttpContext = httpContext;
@ -108,30 +107,6 @@ public class SabnzbdControllerTest
        Assert.IsType<OkObjectResult>(result);
    }

-    [Theory]
-    [InlineData("?name=delete&value=hash1&del_files=1", true)]
-    [InlineData("?name=delete&value=hash1&del_files=true", true)]
-    [InlineData("?name=delete&value=hash1&del_files=0", false)]
-    [InlineData("?name=delete&value=hash1", false)]
-    public async Task Queue_Delete_PassesDeleteFilesFlag(String queryString, Boolean expectedDeleteFiles)
-    {
-        // Arrange
-        var httpContext = new DefaultHttpContext();
-        httpContext.Request.QueryString = new(queryString);
-        _controller.ControllerContext.HttpContext = httpContext;
-
-        _sabnzbdMock.Setup(s => s.Delete("hash1", expectedDeleteFiles)).Returns(Task.CompletedTask);
-
-        // Act
-        var result = await _controller.Queue();
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result);
-        var response = Assert.IsType<SabnzbdResponse>(okResult.Value);
-        Assert.True(response.Status);
-        _sabnzbdMock.Verify(s => s.Delete("hash1", expectedDeleteFiles), Times.Once);
-    }
-
    [Fact]
    public async Task GetHistory_ReturnsOk()
    {
@ -153,26 +128,6 @@ public class SabnzbdControllerTest
        Assert.Equal(1, response.History.NoOfSlots);
    }

-    [Fact]
-    public async Task History_Delete_PassesDeleteFilesFlag()
-    {
-        // Arrange
-        var httpContext = new DefaultHttpContext();
-        httpContext.Request.QueryString = new("?name=delete&value=hash1&del_files=1");
-        _controller.ControllerContext.HttpContext = httpContext;
-
-        _sabnzbdMock.Setup(s => s.Delete("hash1", true)).Returns(Task.CompletedTask);
-
-        // Act
-        var result = await _controller.History();
-
-        // Assert
-        var okResult = Assert.IsType<OkObjectResult>(result);
-        var response = Assert.IsType<SabnzbdResponse>(okResult.Value);
-        Assert.True(response.Status);
-        _sabnzbdMock.Verify(s => s.Delete("hash1", true), Times.Once);
-    }
-
    [Fact]
    public void GetVersion_HasAllowAnonymousAttribute()
    {
@ -191,7 +146,7 @@ public class SabnzbdControllerTest
    public void GetVersion_ReturnsOk()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        SettingData.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;

        // Act
        var result = _controller.Version();
--- a/server/RdtClient.Web.Test/Controllers/SabnzbdHandlerTest.cs
+++ b/server/RdtClient.Web.Test/Controllers/SabnzbdHandlerTest.cs
@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Moq;
+using RdtClient.Data.Data;
 using RdtClient.Data.Enums;
 using RdtClient.Service.Middleware;
 using RdtClient.Service.Services;
@ -14,22 +15,20 @@ public class SabnzbdHandlerTest
    private readonly Mock<Authentication> _authenticationMock;
    private readonly SabnzbdHandler _handler;
    private readonly Mock<IHttpContextAccessor> _httpContextAccessorMock;
-    private readonly TestSettings _settings;

    public SabnzbdHandlerTest()
    {
        _authenticationMock = new(null!, null!, null!);
        _httpContextAccessorMock = new();
-        _settings = new();
-        _handler = new(_authenticationMock.Object, _httpContextAccessorMock.Object, _settings);
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        _handler = new(_authenticationMock.Object, _httpContextAccessorMock.Object);
+        SettingData.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
    }

    [Fact]
    public async Task HandleAsync_AuthNone_Succeeds()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.None;
+        SettingData.Get.General.AuthenticationType = AuthenticationType.None;
        var context = CreateContext();

        // Act
@ -43,16 +42,9 @@ public class SabnzbdHandlerTest
    public async Task HandleAsync_ValidCredentials_Succeeds()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?ma_username=user&ma_password=pass")
-            }
-        };
-
+        Settings.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.QueryString = new("?ma_username=user&ma_password=pass");
        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);

        var context = CreateContext(httpContext);
@ -65,119 +57,11 @@ public class SabnzbdHandlerTest
        Assert.True(context.HasSucceeded, "HasSucceeded should be true for valid credentials");
    }

-    [Fact]
-    public async Task HandleAsync_ValidApiKeyCredentials_Succeeds()
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?apikey=user:pass")
-            }
-        };
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-        _authenticationMock.Setup(a => a.Login("user", "pass")).ReturnsAsync(SignInResult.Success);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.True(context.HasSucceeded, "HasSucceeded should be true for valid api key credentials");
-    }
-
-    [Fact]
-    public async Task HandleAsync_ValidApiKeyCredentialsFromForm_Succeeds()
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-        var httpContext = new DefaultHttpContext();
-        httpContext.Request.ContentType = "application/x-www-form-urlencoded";
-
-        httpContext.Request.Form = new FormCollection(new()
-        {
-            {
-                "apikey", "user:pass"
-            }
-        });
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-        _authenticationMock.Setup(a => a.Login("user", "pass")).ReturnsAsync(SignInResult.Success);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.True(context.HasSucceeded, "HasSucceeded should be true for valid form api key credentials");
-    }
-
-    [Fact]
-    public async Task HandleAsync_ApiKeyPasswordContainingColon_Succeeds()
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?apikey=user:pass:with:colons")
-            }
-        };
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-        _authenticationMock.Setup(a => a.Login("user", "pass:with:colons")).ReturnsAsync(SignInResult.Success);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.True(context.HasSucceeded, "HasSucceeded should be true when the password contains colons");
-    }
-
-    [Fact]
-    public async Task HandleAsync_MaCredentialsTakePrecedenceOverApiKey()
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?ma_username=user&ma_password=wrong&apikey=user:pass")
-            }
-        };
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-        _authenticationMock.Setup(a => a.Login("user", "wrong")).ReturnsAsync(SignInResult.Failed);
-        _authenticationMock.Setup(a => a.Login("user", "pass")).ReturnsAsync(SignInResult.Success);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.False(context.HasSucceeded, "HasSucceeded should be false because ma_username/ma_password take precedence");
-        _authenticationMock.Verify(a => a.Login("user", "wrong"), Times.Once);
-        _authenticationMock.Verify(a => a.Login("user", "pass"), Times.Never);
-    }
-
    [Fact]
    public async Task HandleAsync_AlreadyAuthenticated_Succeeds()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        Settings.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
        var httpContext = new DefaultHttpContext();
        var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity("TestAuth"));
        httpContext.User = claimsPrincipal;
@ -196,16 +80,9 @@ public class SabnzbdHandlerTest
    public async Task HandleAsync_InvalidCredentials_DoesNotSucceed()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?ma_username=user&ma_password=wrong")
-            }
-        };
-
+        Settings.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.QueryString = new("?ma_username=user&ma_password=wrong");
        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);

        var context = CreateContext(httpContext);
@ -218,66 +95,11 @@ public class SabnzbdHandlerTest
        Assert.False(context.HasSucceeded, "HasSucceeded should be false for invalid credentials");
    }

-    [Fact]
-    public async Task HandleAsync_InvalidApiKeyCredentials_DoesNotSucceed()
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new("?apikey=user:wrong")
-            }
-        };
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-        _authenticationMock.Setup(a => a.Login("user", "wrong")).ReturnsAsync(SignInResult.Failed);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.False(context.HasSucceeded, "HasSucceeded should be false for invalid api key credentials");
-    }
-
-    [Theory]
-    [InlineData("missingdelimiter")]
-    [InlineData(":pass")]
-    [InlineData("user:")]
-    public async Task HandleAsync_MalformedApiKey_DoesNotSucceed(String apiKey)
-    {
-        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
-
-        var httpContext = new DefaultHttpContext
-        {
-            Request =
-            {
-                QueryString = new($"?apikey={apiKey}")
-            }
-        };
-
-        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);
-
-        var context = CreateContext(httpContext);
-
-        // Act
-        await _handler.HandleAsync(context);
-
-        // Assert
-        Assert.False(context.HasSucceeded, "HasSucceeded should be false for malformed api keys");
-        _authenticationMock.Verify(a => a.Login(It.IsAny<String>(), It.IsAny<String>()), Times.Never);
-    }
-
    [Fact]
    public async Task HandleAsync_MissingCredentials_DoesNotSucceed()
    {
        // Arrange
-        _settings.Current.General.AuthenticationType = AuthenticationType.UserNamePassword;
+        Settings.Get.General.AuthenticationType = AuthenticationType.UserNamePassword;
        var httpContext = new DefaultHttpContext();
        _httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);

--- a/server/RdtClient.Web.Test/Controllers/TorrentsControllerNzbTest.cs
+++ b/server/RdtClient.Web.Test/Controllers/TorrentsControllerNzbTest.cs
@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Moq;
-using RdtClient.Service.Helpers;
 using RdtClient.Service.Services;
 using RdtClient.Web.Controllers;

@ -11,16 +10,14 @@ namespace RdtClient.Web.Test.Controllers;
 public class TorrentsControllerNzbTest
 {
    private readonly TorrentsController _controller;
-    private readonly Mock<IRateLimitCoordinator> _coordinatorMock;
    private readonly Mock<ILogger<TorrentsController>> _loggerMock;
    private readonly Mock<Torrents> _torrentsMock;

    public TorrentsControllerNzbTest()
    {
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, new TestSettings(), new TorrentRunnerState());
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
        _loggerMock = new();
-        _coordinatorMock = new();
-        _controller = new(_loggerMock.Object, _torrentsMock.Object, null!, _coordinatorMock.Object);
+        _controller = new(_loggerMock.Object, _torrentsMock.Object, null!);
    }

    [Fact]
--- a/server/RdtClient.Web.Test/GlobalTestConfig.cs
+++ b/server/RdtClient.Web.Test/GlobalTestConfig.cs
@ -1 +0,0 @@
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
--- a/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj
+++ b/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj
@ -5,15 +5,14 @@
        <ImplicitUsings>enable</ImplicitUsings>
        <Nullable>enable</Nullable>
        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
        <AssemblyName>RdtClient.Web.Test</AssemblyName>
        <RootNamespace>RdtClient.Web.Test</RootNamespace>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
        <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="SharpCompress" Version="[0.42.1]" />
+        <PackageReference Include="SharpCompress" Version="0.42.1" />
        <PackageReference Include="xunit" Version="2.9.3" />
        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
          <PrivateAssets>all</PrivateAssets>
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`[assembly: CollectionBehavior(DisableTestParallelization = true)]`