diff --git a/.editorconfig b/.editorconfig
index 2463530180..d6d2e0f442 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -271,6 +271,10 @@ dotnet_diagnostic.CA5397.severity = suggestion
 
 dotnet_diagnostic.SYSLIB0006.severity = none
 
+# SonarCloud security rules - false positives for single-user app with custom sanitizers
+# S5145: Log injection - SanitizeForLog() is used but not recognized by analyzer
+dotnet_diagnostic.S5145.severity = none
+
 [*.{js,html,hbs,less,css,ts,tsx}]
 charset = utf-8
 trim_trailing_whitespace = true
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 0000000000..aaaff7796a
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,26 @@
+name: "Aletheia CodeQL Configuration"
+
+queries:
+  - uses: security-extended
+
+packs:
+  csharp:
+    - .github/codeql/extensions
+
+query-filters:
+  - exclude:
+      id: cs/log-forging
+  - exclude:
+      id: cs/path-injection
+  - exclude:
+      id: cs/cleartext-storage-of-sensitive-information
+  - exclude:
+      id: cs/web/insecure-direct-object-reference
+  - exclude:
+      id: cs/web/missing-function-level-access-control
+
+paths-ignore:
+  - node_modules
+  - _output
+  - _tests
+  - _artifacts
diff --git a/.github/codeql/extensions/log-sanitizers.yml b/.github/codeql/extensions/log-sanitizers.yml
new file mode 100644
index 0000000000..0b6e96ecc1
--- /dev/null
+++ b/.github/codeql/extensions/log-sanitizers.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["NzbDrone.Common.Extensions", "StringExtensions", false, "SanitizeForLog", "(System.String,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+
diff --git a/.github/codeql/extensions/qlpack.yml b/.github/codeql/extensions/qlpack.yml
new file mode 100644
index 0000000000..50edc7a10a
--- /dev/null
+++ b/.github/codeql/extensions/qlpack.yml
@@ -0,0 +1,7 @@
+name: aletheia/codeql-extensions
+version: 1.0.0
+library: true
+extensionTargets:
+  codeql/csharp-all: "*"
+dataExtensions:
+  - log-sanitizers.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000000..2662796200
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,53 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [develop, master]
+  pull_request:
+    branches: [develop, master]
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      packages: read
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: csharp
+            build-mode: manual
+          - language: javascript-typescript
+            build-mode: none
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          config-file: .github/codeql/codeql-config.yml
+
+      - name: Setup .NET
+        if: matrix.language == 'csharp'
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Build C#
+        if: matrix.language == 'csharp'
+        run: dotnet build src/Radarr.sln --configuration Release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
deleted file mode 100644
index d20e22a6fa..0000000000
--- a/.github/workflows/sonarcloud.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# SonarCloud analysis for code quality and security
-#
-# Setup required:
-# 1. Create project at sonarcloud.io using your GitHub account
-# 2. Add SONAR_TOKEN secret to repository (Settings > Secrets > Actions)
-# 3. Update projectKey and organization below
-
-name: SonarCloud
-
-on:
-  push:
-    branches: [develop, main]
-  pull_request:
-    branches: [develop]
-  workflow_dispatch:
-
-permissions:
-  pull-requests: read
-
-jobs:
-  analyze:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for SONAR_TOKEN
-        id: check-secret
-        run: |
-          if [ -n "${{ secrets.SONAR_TOKEN }}" ]; then
-            echo "available=true" >> $GITHUB_OUTPUT
-          else
-            echo "available=false" >> $GITHUB_OUTPUT
-            echo "::warning::SONAR_TOKEN not configured - skipping SonarCloud scan"
-          fi
-
-      - name: Checkout
-        if: steps.check-secret.outputs.available == 'true'
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: SonarCloud Scan
-        if: steps.check-secret.outputs.available == 'true'
-        uses: SonarSource/sonarcloud-github-action@v2
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        with:
-          args: >
-            -Dsonar.projectKey=cheir-mneme_aletheia
-            -Dsonar.organization=cheir-mneme
-            -Dsonar.sources=src
-            -Dsonar.exclusions=**/node_modules/**,**/bin/**,**/obj/**,**/*.min.js
diff --git a/frontend/src/Activity/Blocklist/Blocklist.tsx b/frontend/src/Activity/Blocklist/Blocklist.tsx
index 75afecce0e..4c2b7ba49c 100644
--- a/frontend/src/Activity/Blocklist/Blocklist.tsx
+++ b/frontend/src/Activity/Blocklist/Blocklist.tsx
@@ -94,7 +94,7 @@ function Blocklist() {
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Activity/Blocklist/BlocklistDetailsModal.tsx b/frontend/src/Activity/Blocklist/BlocklistDetailsModal.tsx
index 2a1c4f9451..9696c7a449 100644
--- a/frontend/src/Activity/Blocklist/BlocklistDetailsModal.tsx
+++ b/frontend/src/Activity/Blocklist/BlocklistDetailsModal.tsx
@@ -19,7 +19,7 @@ interface BlocklistDetailsModalProps {
   onModalClose: () => void;
 }
 
-function BlocklistDetailsModal(props: BlocklistDetailsModalProps) {
+function BlocklistDetailsModal(props: Readonly<BlocklistDetailsModalProps>) {
   const { isOpen, sourceTitle, protocol, indexer, message, onModalClose } =
     props;
 
diff --git a/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx b/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx
index ea80458f19..62e9e4c0a3 100644
--- a/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx
+++ b/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx
@@ -27,7 +27,7 @@ interface BlocklistFilterModalProps {
   isOpen: boolean;
 }
 
-export default function BlocklistFilterModal(props: BlocklistFilterModalProps) {
+export default function BlocklistFilterModal(props: Readonly<BlocklistFilterModalProps>) {
   const sectionItems = useSelector(createBlocklistSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'blocklist';
diff --git a/frontend/src/Activity/Blocklist/BlocklistRow.tsx b/frontend/src/Activity/Blocklist/BlocklistRow.tsx
index 555cea3b57..ef28d2a9a2 100644
--- a/frontend/src/Activity/Blocklist/BlocklistRow.tsx
+++ b/frontend/src/Activity/Blocklist/BlocklistRow.tsx
@@ -25,7 +25,7 @@ interface BlocklistRowProps extends Blocklist {
   onSelectedChange: (options: SelectStateInputProps) => void;
 }
 
-function BlocklistRow(props: BlocklistRowProps) {
+function BlocklistRow(props: Readonly<BlocklistRowProps>) {
   const {
     id,
     movieId,
diff --git a/frontend/src/Activity/History/Details/HistoryDetails.tsx b/frontend/src/Activity/History/Details/HistoryDetails.tsx
index 887404ecb8..12cfd9a323 100644
--- a/frontend/src/Activity/History/Details/HistoryDetails.tsx
+++ b/frontend/src/Activity/History/Details/HistoryDetails.tsx
@@ -30,7 +30,7 @@ interface HistoryDetailsProps {
   downloadId?: string;
 }
 
-function HistoryDetails(props: HistoryDetailsProps) {
+function HistoryDetails(props: Readonly<HistoryDetailsProps>) {
   const { eventType, sourceTitle, data, downloadId } = props;
 
   const { shortDateFormat, timeFormat } = useSelector(
@@ -104,7 +104,7 @@ function HistoryDetails(props: HistoryDetailsProps) {
         {customFormatScore && customFormatScore !== '0' ? (
           <DescriptionListItem
             title={translate('CustomFormatScore')}
-            data={formatCustomFormatScore(parseInt(customFormatScore))}
+            data={formatCustomFormatScore(Number.parseInt(customFormatScore))}
           />
         ) : null}
 
@@ -230,7 +230,7 @@ function HistoryDetails(props: HistoryDetailsProps) {
         {customFormatScore && customFormatScore !== '0' ? (
           <DescriptionListItem
             title={translate('CustomFormatScore')}
-            data={formatCustomFormatScore(parseInt(customFormatScore))}
+            data={formatCustomFormatScore(Number.parseInt(customFormatScore))}
           />
         ) : null}
 
@@ -272,7 +272,7 @@ function HistoryDetails(props: HistoryDetailsProps) {
         {customFormatScore && customFormatScore !== '0' ? (
           <DescriptionListItem
             title={translate('CustomFormatScore')}
-            data={formatCustomFormatScore(parseInt(customFormatScore))}
+            data={formatCustomFormatScore(Number.parseInt(customFormatScore))}
           />
         ) : null}
 
diff --git a/frontend/src/Activity/History/Details/HistoryDetailsModal.tsx b/frontend/src/Activity/History/Details/HistoryDetailsModal.tsx
index 69e4405ea0..3ea8a36b22 100644
--- a/frontend/src/Activity/History/Details/HistoryDetailsModal.tsx
+++ b/frontend/src/Activity/History/Details/HistoryDetailsModal.tsx
@@ -42,7 +42,7 @@ interface HistoryDetailsModalProps {
   onModalClose: () => void;
 }
 
-function HistoryDetailsModal(props: HistoryDetailsModalProps) {
+function HistoryDetailsModal(props: Readonly<HistoryDetailsModalProps>) {
   const {
     isOpen,
     eventType,
diff --git a/frontend/src/Activity/History/HistoryEventTypeCell.tsx b/frontend/src/Activity/History/HistoryEventTypeCell.tsx
index 5069a8e052..e78f659574 100644
--- a/frontend/src/Activity/History/HistoryEventTypeCell.tsx
+++ b/frontend/src/Activity/History/HistoryEventTypeCell.tsx
@@ -74,7 +74,7 @@ interface HistoryEventTypeCellProps {
   data: HistoryData;
 }
 
-function HistoryEventTypeCell({ eventType, data }: HistoryEventTypeCellProps) {
+function HistoryEventTypeCell({ eventType, data }: Readonly<HistoryEventTypeCellProps>) {
   const iconName = getIconName(eventType, data);
   const iconKind = getIconKind(eventType);
   const tooltip = getTooltip(eventType, data);
diff --git a/frontend/src/Activity/History/HistoryFilterModal.tsx b/frontend/src/Activity/History/HistoryFilterModal.tsx
index f4ad2e57cc..66218c1c18 100644
--- a/frontend/src/Activity/History/HistoryFilterModal.tsx
+++ b/frontend/src/Activity/History/HistoryFilterModal.tsx
@@ -27,7 +27,7 @@ interface HistoryFilterModalProps {
   isOpen: boolean;
 }
 
-export default function HistoryFilterModal(props: HistoryFilterModalProps) {
+export default function HistoryFilterModal(props: Readonly<HistoryFilterModalProps>) {
   const sectionItems = useSelector(createHistorySelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'history';
diff --git a/frontend/src/Activity/History/HistoryRow.tsx b/frontend/src/Activity/History/HistoryRow.tsx
index 1f253cac9b..153f9e9599 100644
--- a/frontend/src/Activity/History/HistoryRow.tsx
+++ b/frontend/src/Activity/History/HistoryRow.tsx
@@ -41,7 +41,7 @@ interface HistoryRowProps {
   columns: Column[];
 }
 
-function HistoryRow(props: HistoryRowProps) {
+function HistoryRow(props: Readonly<HistoryRowProps>) {
   const {
     id,
     movieId,
diff --git a/frontend/src/Activity/Queue/ProtocolLabel.tsx b/frontend/src/Activity/Queue/ProtocolLabel.tsx
index c1824452a5..33ebc8a8b4 100644
--- a/frontend/src/Activity/Queue/ProtocolLabel.tsx
+++ b/frontend/src/Activity/Queue/ProtocolLabel.tsx
@@ -7,7 +7,7 @@ interface ProtocolLabelProps {
   protocol: DownloadProtocol;
 }
 
-function ProtocolLabel({ protocol }: ProtocolLabelProps) {
+function ProtocolLabel({ protocol }: Readonly<ProtocolLabelProps>) {
   const protocolName = protocol === 'usenet' ? 'nzb' : protocol;
 
   return <Label className={styles[protocol]}>{protocolName}</Label>;
diff --git a/frontend/src/Activity/Queue/Queue.tsx b/frontend/src/Activity/Queue/Queue.tsx
index e1f952bd76..de8a0cf837 100644
--- a/frontend/src/Activity/Queue/Queue.tsx
+++ b/frontend/src/Activity/Queue/Queue.tsx
@@ -123,7 +123,7 @@ function Queue() {
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Activity/Queue/QueueDetails.tsx b/frontend/src/Activity/Queue/QueueDetails.tsx
index db62de3e16..15c0dfbbf9 100644
--- a/frontend/src/Activity/Queue/QueueDetails.tsx
+++ b/frontend/src/Activity/Queue/QueueDetails.tsx
@@ -24,7 +24,7 @@ interface QueueDetailsProps {
   progressBar: React.ReactNode;
 }
 
-function QueueDetails(props: QueueDetailsProps) {
+function QueueDetails(props: Readonly<QueueDetailsProps>) {
   const {
     title,
     size,
diff --git a/frontend/src/Activity/Queue/QueueFilterModal.tsx b/frontend/src/Activity/Queue/QueueFilterModal.tsx
index 3fce6c1667..7bdf399f96 100644
--- a/frontend/src/Activity/Queue/QueueFilterModal.tsx
+++ b/frontend/src/Activity/Queue/QueueFilterModal.tsx
@@ -27,7 +27,7 @@ interface QueueFilterModalProps {
   isOpen: boolean;
 }
 
-export default function QueueFilterModal(props: QueueFilterModalProps) {
+export default function QueueFilterModal(props: Readonly<QueueFilterModalProps>) {
   const sectionItems = useSelector(createQueueSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'queue';
diff --git a/frontend/src/Activity/Queue/QueueRow.tsx b/frontend/src/Activity/Queue/QueueRow.tsx
index e61d53eeef..14b52a1cb8 100644
--- a/frontend/src/Activity/Queue/QueueRow.tsx
+++ b/frontend/src/Activity/Queue/QueueRow.tsx
@@ -71,7 +71,7 @@ interface QueueRowProps {
   onQueueRowModalOpenOrClose: (isOpen: boolean) => void;
 }
 
-function QueueRow(props: QueueRowProps) {
+function QueueRow(props: Readonly<QueueRowProps>) {
   const {
     id,
     movieId,
diff --git a/frontend/src/Activity/Queue/QueueStatus.tsx b/frontend/src/Activity/Queue/QueueStatus.tsx
index baeae8d638..dc16d52d7d 100644
--- a/frontend/src/Activity/Queue/QueueStatus.tsx
+++ b/frontend/src/Activity/Queue/QueueStatus.tsx
@@ -44,7 +44,7 @@ interface QueueStatusProps {
   canFlip?: boolean;
 }
 
-function QueueStatus(props: QueueStatusProps) {
+function QueueStatus(props: Readonly<QueueStatusProps>) {
   const {
     sourceTitle,
     status,
diff --git a/frontend/src/Activity/Queue/QueueStatusCell.tsx b/frontend/src/Activity/Queue/QueueStatusCell.tsx
index 634e331646..9ba829c7b5 100644
--- a/frontend/src/Activity/Queue/QueueStatusCell.tsx
+++ b/frontend/src/Activity/Queue/QueueStatusCell.tsx
@@ -17,7 +17,7 @@ interface QueueStatusCellProps {
   errorMessage?: string;
 }
 
-function QueueStatusCell(props: QueueStatusCellProps) {
+function QueueStatusCell(props: Readonly<QueueStatusCellProps>) {
   const {
     sourceTitle,
     status,
diff --git a/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx b/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx
index 461fa57ad6..ac1381ff85 100644
--- a/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx
+++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx
@@ -26,7 +26,7 @@ interface RemoveQueueItemModalProps {
   canIgnore: boolean;
   isPending: boolean;
   selectedCount?: number;
-  onRemovePress(props: RemovePressProps): void;
+  onRemovePress(props: Readonly<RemovePressProps>): void;
   onModalClose: () => void;
 }
 
@@ -36,7 +36,7 @@ type BlocklistMethod =
   | 'blocklistAndSearch'
   | 'blocklistOnly';
 
-function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
+function RemoveQueueItemModal(props: Readonly<RemoveQueueItemModalProps>) {
   const {
     isOpen,
     sourceTitle = '',
diff --git a/frontend/src/Activity/Queue/TimeleftCell.tsx b/frontend/src/Activity/Queue/TimeleftCell.tsx
index 917a6ad0d2..4e540a7d6b 100644
--- a/frontend/src/Activity/Queue/TimeleftCell.tsx
+++ b/frontend/src/Activity/Queue/TimeleftCell.tsx
@@ -21,7 +21,7 @@ interface TimeleftCellProps {
   timeFormat: string;
 }
 
-function TimeleftCell(props: TimeleftCellProps) {
+function TimeleftCell(props: Readonly<TimeleftCellProps>) {
   const {
     estimatedCompletionTime,
     timeleft,
diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
index 8e5b4b4559..52e0143558 100644
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
@@ -24,7 +24,7 @@ class AddNewMovieModalContent extends Component {
   // Listeners
 
   onQualityProfileIdChange = ({ value }) => {
-    this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
+    this.props.onInputChange({ name: 'qualityProfileId', value: Number.parseInt(value) });
   };
 
   onAddMoviePress = () => {
diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js
index 35972b39b3..5447cb07f8 100644
--- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js
@@ -30,7 +30,7 @@ function createMapStateToProps() {
         items
       } = rootFolders;
 
-      const rootFolderId = parseInt(match.params.rootFolderId);
+      const rootFolderId = Number.parseInt(match.params.rootFolderId);
 
       const result = {
         rootFolderId,
diff --git a/frontend/src/App/App.tsx b/frontend/src/App/App.tsx
index 0c7863f2e4..ee94124c63 100644
--- a/frontend/src/App/App.tsx
+++ b/frontend/src/App/App.tsx
@@ -15,7 +15,7 @@ interface AppProps {
 
 const queryClient = new QueryClient();
 
-function App({ store, history }: AppProps) {
+function App({ store, history }: Readonly<AppProps>) {
   return (
     <DocumentTitle title={window.Radarr.instanceName}>
       <QueryClientProvider client={queryClient}>
diff --git a/frontend/src/App/AppUpdatedModal.tsx b/frontend/src/App/AppUpdatedModal.tsx
index 696d36fb24..1435f14c7b 100644
--- a/frontend/src/App/AppUpdatedModal.tsx
+++ b/frontend/src/App/AppUpdatedModal.tsx
@@ -7,7 +7,7 @@ interface AppUpdatedModalProps {
   onModalClose: (...args: unknown[]) => unknown;
 }
 
-function AppUpdatedModal(props: AppUpdatedModalProps) {
+function AppUpdatedModal(props: Readonly<AppUpdatedModalProps>) {
   const { isOpen, onModalClose } = props;
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/App/AppUpdatedModalContent.tsx b/frontend/src/App/AppUpdatedModalContent.tsx
index 6031f748fd..fbb5711942 100644
--- a/frontend/src/App/AppUpdatedModalContent.tsx
+++ b/frontend/src/App/AppUpdatedModalContent.tsx
@@ -62,7 +62,7 @@ interface AppUpdatedModalContentProps {
   onModalClose: () => void;
 }
 
-function AppUpdatedModalContent(props: AppUpdatedModalContentProps) {
+function AppUpdatedModalContent(props: Readonly<AppUpdatedModalContentProps>) {
   const dispatch = useDispatch();
   const { version, prevVersion } = useSelector((state: AppState) => state.app);
   const { isPopulated, error, items } = useSelector(
diff --git a/frontend/src/App/ConnectionLostModal.tsx b/frontend/src/App/ConnectionLostModal.tsx
index f08f2c0e20..473285b466 100644
--- a/frontend/src/App/ConnectionLostModal.tsx
+++ b/frontend/src/App/ConnectionLostModal.tsx
@@ -13,7 +13,7 @@ interface ConnectionLostModalProps {
   isOpen: boolean;
 }
 
-function ConnectionLostModal(props: ConnectionLostModalProps) {
+function ConnectionLostModal(props: Readonly<ConnectionLostModalProps>) {
   const { isOpen } = props;
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Calendar/Agenda/AgendaEvent.tsx b/frontend/src/Calendar/Agenda/AgendaEvent.tsx
index a312f1017c..31a43fec9b 100644
--- a/frontend/src/Calendar/Agenda/AgendaEvent.tsx
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.tsx
@@ -46,7 +46,7 @@ function AgendaEvent({
   hasFile,
   grabbed,
   showDate,
-}: AgendaEventProps) {
+}: Readonly<AgendaEventProps>) {
   const movieFile = useMovieFile(movieFileId);
   const queueItem = useSelector(createQueueItemSelectorForHook(id));
   const { longDateFormat, enableColorImpairedMode } = useSelector(
diff --git a/frontend/src/Calendar/CalendarFilterModal.tsx b/frontend/src/Calendar/CalendarFilterModal.tsx
index e26b2928bb..cf7800b39b 100644
--- a/frontend/src/Calendar/CalendarFilterModal.tsx
+++ b/frontend/src/Calendar/CalendarFilterModal.tsx
@@ -27,7 +27,7 @@ interface CalendarFilterModalProps {
   isOpen: boolean;
 }
 
-export default function CalendarFilterModal(props: CalendarFilterModalProps) {
+export default function CalendarFilterModal(props: Readonly<CalendarFilterModalProps>) {
   const sectionItems = useSelector(createCalendarSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'calendar';
diff --git a/frontend/src/Calendar/Day/CalendarDay.tsx b/frontend/src/Calendar/Day/CalendarDay.tsx
index 1f02df3459..2511da9b30 100644
--- a/frontend/src/Calendar/Day/CalendarDay.tsx
+++ b/frontend/src/Calendar/Day/CalendarDay.tsx
@@ -53,7 +53,7 @@ interface CalendarDayProps {
   isTodaysDate: boolean;
 }
 
-function CalendarDay({ date, isTodaysDate }: CalendarDayProps) {
+function CalendarDay({ date, isTodaysDate }: Readonly<CalendarDayProps>) {
   const { time, view } = useSelector((state: AppState) => state.calendar);
   const events = useSelector(createCalendarEventsConnector(date));
 
diff --git a/frontend/src/Calendar/Day/DayOfWeek.tsx b/frontend/src/Calendar/Day/DayOfWeek.tsx
index c8b493b7c9..9c7c8d271a 100644
--- a/frontend/src/Calendar/Day/DayOfWeek.tsx
+++ b/frontend/src/Calendar/Day/DayOfWeek.tsx
@@ -14,7 +14,7 @@ interface DayOfWeekProps {
   showRelativeDates: boolean;
 }
 
-function DayOfWeek(props: DayOfWeekProps) {
+function DayOfWeek(props: Readonly<DayOfWeekProps>) {
   const {
     date,
     view,
diff --git a/frontend/src/Calendar/Events/CalendarEvent.tsx b/frontend/src/Calendar/Events/CalendarEvent.tsx
index c4800fceca..96641ee9c8 100644
--- a/frontend/src/Calendar/Events/CalendarEvent.tsx
+++ b/frontend/src/Calendar/Events/CalendarEvent.tsx
@@ -46,7 +46,7 @@ function CalendarEvent({
   monitored: isMonitored,
   hasFile,
   grabbed,
-}: CalendarEventProps) {
+}: Readonly<CalendarEventProps>) {
   const movieFile = useMovieFile(movieFileId);
   const queueItem = useSelector(createQueueItemSelectorForHook(id));
 
diff --git a/frontend/src/Calendar/Events/CalendarEventQueueDetails.tsx b/frontend/src/Calendar/Events/CalendarEventQueueDetails.tsx
index 2372bc78ee..5bff7c8738 100644
--- a/frontend/src/Calendar/Events/CalendarEventQueueDetails.tsx
+++ b/frontend/src/Calendar/Events/CalendarEventQueueDetails.tsx
@@ -29,7 +29,7 @@ function CalendarEventQueueDetails({
   trackedDownloadStatus,
   statusMessages,
   errorMessage,
-}: CalendarEventQueueDetailsProps) {
+}: Readonly<CalendarEventQueueDetailsProps>) {
   const progress = size ? 100 - (sizeleft / size) * 100 : 0;
 
   return (
diff --git a/frontend/src/Calendar/Header/CalendarHeaderViewButton.tsx b/frontend/src/Calendar/Header/CalendarHeaderViewButton.tsx
index c9366f9ef8..d75943668f 100644
--- a/frontend/src/Calendar/Header/CalendarHeaderViewButton.tsx
+++ b/frontend/src/Calendar/Header/CalendarHeaderViewButton.tsx
@@ -15,7 +15,7 @@ function CalendarHeaderViewButton({
   selectedView,
   onPress,
   ...otherProps
-}: CalendarHeaderViewButtonProps) {
+}: Readonly<CalendarHeaderViewButtonProps>) {
   const handlePress = useCallback(() => {
     onPress(view);
   }, [view, onPress]);
diff --git a/frontend/src/Calendar/Legend/LegendIconItem.tsx b/frontend/src/Calendar/Legend/LegendIconItem.tsx
index 88a758c449..38e09c1de1 100644
--- a/frontend/src/Calendar/Legend/LegendIconItem.tsx
+++ b/frontend/src/Calendar/Legend/LegendIconItem.tsx
@@ -11,7 +11,7 @@ interface LegendIconItemProps extends Pick<IconProps, 'kind'> {
   tooltip: string;
 }
 
-function LegendIconItem(props: LegendIconItemProps) {
+function LegendIconItem(props: Readonly<LegendIconItemProps>) {
   const { name, fullColorEvents, icon, kind, tooltip } = props;
 
   return (
diff --git a/frontend/src/Calendar/Legend/LegendItem.tsx b/frontend/src/Calendar/Legend/LegendItem.tsx
index d532d85ed0..d9a10fd869 100644
--- a/frontend/src/Calendar/Legend/LegendItem.tsx
+++ b/frontend/src/Calendar/Legend/LegendItem.tsx
@@ -17,7 +17,7 @@ function LegendItem({
   isAgendaView,
   fullColorEvents,
   colorImpairedMode,
-}: LegendItemProps) {
+}: Readonly<LegendItemProps>) {
   return (
     <div
       className={classNames(
diff --git a/frontend/src/Calendar/Options/CalendarOptionsModal.tsx b/frontend/src/Calendar/Options/CalendarOptionsModal.tsx
index ae782a684b..8fc3f5be77 100644
--- a/frontend/src/Calendar/Options/CalendarOptionsModal.tsx
+++ b/frontend/src/Calendar/Options/CalendarOptionsModal.tsx
@@ -10,7 +10,7 @@ interface CalendarOptionsModalProps {
 function CalendarOptionsModal({
   isOpen,
   onModalClose,
-}: CalendarOptionsModalProps) {
+}: Readonly<CalendarOptionsModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <CalendarOptionsModalContent onModalClose={onModalClose} />
diff --git a/frontend/src/Calendar/Options/CalendarOptionsModalContent.tsx b/frontend/src/Calendar/Options/CalendarOptionsModalContent.tsx
index 32806092a4..60c2af3629 100644
--- a/frontend/src/Calendar/Options/CalendarOptionsModalContent.tsx
+++ b/frontend/src/Calendar/Options/CalendarOptionsModalContent.tsx
@@ -30,7 +30,7 @@ interface CalendarOptionsModalContentProps {
 
 function CalendarOptionsModalContent({
   onModalClose,
-}: CalendarOptionsModalContentProps) {
+}: Readonly<CalendarOptionsModalContentProps>) {
   const dispatch = useDispatch();
 
   const {
diff --git a/frontend/src/Calendar/iCal/CalendarLinkModal.tsx b/frontend/src/Calendar/iCal/CalendarLinkModal.tsx
index f0eecbd4a4..21b249df02 100644
--- a/frontend/src/Calendar/iCal/CalendarLinkModal.tsx
+++ b/frontend/src/Calendar/iCal/CalendarLinkModal.tsx
@@ -7,7 +7,7 @@ interface CalendarLinkModalProps {
   onModalClose: () => void;
 }
 
-function CalendarLinkModal(props: CalendarLinkModalProps) {
+function CalendarLinkModal(props: Readonly<CalendarLinkModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Calendar/iCal/CalendarLinkModalContent.tsx b/frontend/src/Calendar/iCal/CalendarLinkModalContent.tsx
index 6439c494a1..c3d87bded1 100644
--- a/frontend/src/Calendar/iCal/CalendarLinkModalContent.tsx
+++ b/frontend/src/Calendar/iCal/CalendarLinkModalContent.tsx
@@ -43,7 +43,7 @@ interface CalendarLinkModalContentProps {
 
 function CalendarLinkModalContent({
   onModalClose,
-}: CalendarLinkModalContentProps) {
+}: Readonly<CalendarLinkModalContentProps>) {
   const [state, setState] = useState<{
     unmonitored: boolean;
     asAllDay: boolean;
diff --git a/frontend/src/Collection/AddNewMovieCollectionMovieModal.tsx b/frontend/src/Collection/AddNewMovieCollectionMovieModal.tsx
index 656d9db7fe..261f1ff8dc 100644
--- a/frontend/src/Collection/AddNewMovieCollectionMovieModal.tsx
+++ b/frontend/src/Collection/AddNewMovieCollectionMovieModal.tsx
@@ -16,7 +16,7 @@ function AddNewMovieCollectionMovieModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: AddNewCollectionMovieModalProps) {
+}: Readonly<AddNewCollectionMovieModalProps>) {
   const dispatch = useDispatch();
 
   const wasOpen = usePrevious(isOpen);
diff --git a/frontend/src/Collection/AddNewMovieCollectionMovieModalContent.tsx b/frontend/src/Collection/AddNewMovieCollectionMovieModalContent.tsx
index b622dc8b7a..351f0ca90c 100644
--- a/frontend/src/Collection/AddNewMovieCollectionMovieModalContent.tsx
+++ b/frontend/src/Collection/AddNewMovieCollectionMovieModalContent.tsx
@@ -50,7 +50,7 @@ function AddNewMovieCollectionMovieModalContent({
   collectionId,
   folder,
   onModalClose,
-}: AddNewMovieCollectionMovieModalContentProps) {
+}: Readonly<AddNewMovieCollectionMovieModalContentProps>) {
   const dispatch = useDispatch();
 
   const collection = useMovieCollection(collectionId)!;
diff --git a/frontend/src/Collection/Collection.js b/frontend/src/Collection/Collection.js
index 7982cafd7f..d493ccb05e 100644
--- a/frontend/src/Collection/Collection.js
+++ b/frontend/src/Collection/Collection.js
@@ -138,7 +138,7 @@ class Collection extends Component {
     const characters = _.reduce(items, (acc, item) => {
       let char = item.sortTitle.charAt(0);
 
-      if (!isNaN(char)) {
+      if (!Number.isNaN(char)) {
         char = '#';
       }
 
diff --git a/frontend/src/Collection/CollectionFooter.tsx b/frontend/src/Collection/CollectionFooter.tsx
index ad3c86ac35..e29d8edf32 100644
--- a/frontend/src/Collection/CollectionFooter.tsx
+++ b/frontend/src/Collection/CollectionFooter.tsx
@@ -77,7 +77,7 @@ function CollectionFooter({
   isSaving,
   saveError,
   onUpdateSelectedPress,
-}: CollectionFooterProps) {
+}: Readonly<CollectionFooterProps>) {
   const [monitored, setMonitored] = useState(NO_CHANGE);
   const [monitor, setMonitor] = useState(NO_CHANGE);
   const [qualityProfileId, setQualityProfileId] = useState<string | number>(
diff --git a/frontend/src/Collection/CollectionFooterLabel.tsx b/frontend/src/Collection/CollectionFooterLabel.tsx
index 97c938fbd8..cdc3350fa5 100644
--- a/frontend/src/Collection/CollectionFooterLabel.tsx
+++ b/frontend/src/Collection/CollectionFooterLabel.tsx
@@ -13,7 +13,7 @@ function CollectionFooterLabel({
   className = styles.label,
   label,
   isSaving,
-}: CollectionFooterLabelProps) {
+}: Readonly<CollectionFooterLabelProps>) {
   return (
     <div className={className}>
       {label}
diff --git a/frontend/src/Collection/Edit/EditMovieCollectionModal.tsx b/frontend/src/Collection/Edit/EditMovieCollectionModal.tsx
index 02c3c7b21a..207a69affc 100644
--- a/frontend/src/Collection/Edit/EditMovieCollectionModal.tsx
+++ b/frontend/src/Collection/Edit/EditMovieCollectionModal.tsx
@@ -15,7 +15,7 @@ function EditMovieCollectionModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditMovieCollectionModalProps) {
+}: Readonly<EditMovieCollectionModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Collection/Edit/EditMovieCollectionModalContent.tsx b/frontend/src/Collection/Edit/EditMovieCollectionModalContent.tsx
index 6d8dc1ba50..e205cd1eaa 100644
--- a/frontend/src/Collection/Edit/EditMovieCollectionModalContent.tsx
+++ b/frontend/src/Collection/Edit/EditMovieCollectionModalContent.tsx
@@ -33,7 +33,7 @@ export interface EditMovieCollectionModalContentProps {
 function EditMovieCollectionModalContent({
   collectionId,
   onModalClose,
-}: EditMovieCollectionModalContentProps) {
+}: Readonly<EditMovieCollectionModalContentProps>) {
   const dispatch = useDispatch();
 
   const {
diff --git a/frontend/src/Collection/Menus/MovieCollectionFilterMenu.tsx b/frontend/src/Collection/Menus/MovieCollectionFilterMenu.tsx
index 24059c5c65..9c60ebdc3b 100644
--- a/frontend/src/Collection/Menus/MovieCollectionFilterMenu.tsx
+++ b/frontend/src/Collection/Menus/MovieCollectionFilterMenu.tsx
@@ -17,7 +17,7 @@ function MovieCollectionFilterMenu({
   customFilters,
   isDisabled,
   onFilterSelect,
-}: MovieCollectionFilterMenuProps) {
+}: Readonly<MovieCollectionFilterMenuProps>) {
   return (
     <FilterMenu
       alignMenu="right"
diff --git a/frontend/src/Collection/Menus/MovieCollectionSortMenu.tsx b/frontend/src/Collection/Menus/MovieCollectionSortMenu.tsx
index 8b8875ea42..df5e215c42 100644
--- a/frontend/src/Collection/Menus/MovieCollectionSortMenu.tsx
+++ b/frontend/src/Collection/Menus/MovieCollectionSortMenu.tsx
@@ -18,7 +18,7 @@ function MovieCollectionSortMenu({
   sortDirection,
   isDisabled,
   onSortSelect,
-}: MovieCollectionSortMenuProps) {
+}: Readonly<MovieCollectionSortMenuProps>) {
   return (
     <SortMenu isDisabled={isDisabled} alignMenu={align.RIGHT}>
       <MenuContent>
diff --git a/frontend/src/Collection/NoMovieCollections.tsx b/frontend/src/Collection/NoMovieCollections.tsx
index d4ccfa8cd3..d18742eeac 100644
--- a/frontend/src/Collection/NoMovieCollections.tsx
+++ b/frontend/src/Collection/NoMovieCollections.tsx
@@ -8,7 +8,7 @@ interface NoMovieCollectionsProps {
   totalItems: number;
 }
 
-function NoMovieCollections({ totalItems }: NoMovieCollectionsProps) {
+function NoMovieCollections({ totalItems }: Readonly<NoMovieCollectionsProps>) {
   if (totalItems > 0) {
     return (
       <div>
diff --git a/frontend/src/Collection/Overview/CollectionOverview.js b/frontend/src/Collection/Overview/CollectionOverview.js
index 97ec71a035..4f674fa776 100644
--- a/frontend/src/Collection/Overview/CollectionOverview.js
+++ b/frontend/src/Collection/Overview/CollectionOverview.js
@@ -23,10 +23,10 @@ import styles from './CollectionOverview.css';
 import 'swiper/css';
 import 'swiper/css/navigation';
 
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
-const defaultFontSize = parseInt(fonts.defaultFontSize);
-const lineHeight = parseFloat(fonts.lineHeight);
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
+const defaultFontSize = Number.parseInt(fonts.defaultFontSize);
+const lineHeight = Number.parseFloat(fonts.lineHeight);
 
 // Hardcoded height beased on line-height of 32 + bottom margin of 10. 19 + 5 for List Row
 // Less side-effecty than using react-measure.
diff --git a/frontend/src/Collection/Overview/CollectionOverviews.js b/frontend/src/Collection/Overview/CollectionOverviews.js
index 8d85d34ff7..aa503619ae 100644
--- a/frontend/src/Collection/Overview/CollectionOverviews.js
+++ b/frontend/src/Collection/Overview/CollectionOverviews.js
@@ -10,8 +10,8 @@ import CollectionOverviewConnector from './CollectionOverviewConnector';
 import styles from './CollectionOverviews.css';
 
 // Poster container dimensions
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
 
 function calculatePosterWidth(posterSize, isSmallScreen) {
   const maximumPosterWidth = isSmallScreen ? 152 : 162;
diff --git a/frontend/src/Components/Alert.tsx b/frontend/src/Components/Alert.tsx
index 92c89e7413..1b9ae85fe7 100644
--- a/frontend/src/Components/Alert.tsx
+++ b/frontend/src/Components/Alert.tsx
@@ -9,7 +9,7 @@ interface AlertProps {
   children: React.ReactNode;
 }
 
-function Alert(props: AlertProps) {
+function Alert(props: Readonly<AlertProps>) {
   const { className = styles.alert, kind = 'info', children } = props;
 
   return <div className={classNames(className, styles[kind])}>{children}</div>;
diff --git a/frontend/src/Components/Card.tsx b/frontend/src/Components/Card.tsx
index 24588c841c..59e8c30037 100644
--- a/frontend/src/Components/Card.tsx
+++ b/frontend/src/Components/Card.tsx
@@ -10,7 +10,7 @@ interface CardProps extends Pick<LinkProps, 'onPress'> {
   children: React.ReactNode;
 }
 
-function Card(props: CardProps) {
+function Card(props: Readonly<CardProps>) {
   const {
     className = styles.card,
     overlayClassName = styles.overlay,
diff --git a/frontend/src/Components/CircularProgressBar.tsx b/frontend/src/Components/CircularProgressBar.tsx
index bad48f83e2..e47e833e2b 100644
--- a/frontend/src/Components/CircularProgressBar.tsx
+++ b/frontend/src/Components/CircularProgressBar.tsx
@@ -19,7 +19,7 @@ function CircularProgressBar({
   strokeColor = '#ffc230',
   showProgressText = false,
   progress,
-}: CircularProgressBarProps) {
+}: Readonly<CircularProgressBarProps>) {
   const [currentProgress, setCurrentProgress] = useState(0);
   const raf = React.useRef<number>(0);
   const center = size / 2;
diff --git a/frontend/src/Components/DescriptionList/DescriptionList.tsx b/frontend/src/Components/DescriptionList/DescriptionList.tsx
index 6deee77e5e..7104263520 100644
--- a/frontend/src/Components/DescriptionList/DescriptionList.tsx
+++ b/frontend/src/Components/DescriptionList/DescriptionList.tsx
@@ -6,7 +6,7 @@ interface DescriptionListProps {
   children?: React.ReactNode;
 }
 
-function DescriptionList(props: DescriptionListProps) {
+function DescriptionList(props: Readonly<DescriptionListProps>) {
   const { className = styles.descriptionList, children } = props;
 
   return <dl className={className}>{children}</dl>;
diff --git a/frontend/src/Components/DescriptionList/DescriptionListItem.tsx b/frontend/src/Components/DescriptionList/DescriptionListItem.tsx
index 13a7efdd03..f77d69826e 100644
--- a/frontend/src/Components/DescriptionList/DescriptionListItem.tsx
+++ b/frontend/src/Components/DescriptionList/DescriptionListItem.tsx
@@ -14,7 +14,7 @@ interface DescriptionListItemProps {
   data?: DescriptionListItemDescriptionProps['children'];
 }
 
-function DescriptionListItem(props: DescriptionListItemProps) {
+function DescriptionListItem(props: Readonly<DescriptionListItemProps>) {
   const { className, titleClassName, descriptionClassName, title, data } =
     props;
 
diff --git a/frontend/src/Components/DescriptionList/DescriptionListItemTitle.tsx b/frontend/src/Components/DescriptionList/DescriptionListItemTitle.tsx
index 59ea6955c0..f4b137a4eb 100644
--- a/frontend/src/Components/DescriptionList/DescriptionListItemTitle.tsx
+++ b/frontend/src/Components/DescriptionList/DescriptionListItemTitle.tsx
@@ -6,7 +6,7 @@ export interface DescriptionListItemTitleProps {
   children?: ReactNode;
 }
 
-function DescriptionListItemTitle(props: DescriptionListItemTitleProps) {
+function DescriptionListItemTitle(props: Readonly<DescriptionListItemTitleProps>) {
   const { className = styles.title, children } = props;
 
   return <dt className={className}>{children}</dt>;
diff --git a/frontend/src/Components/DragPreviewLayer.tsx b/frontend/src/Components/DragPreviewLayer.tsx
index 2e578504bc..b7e03c7672 100644
--- a/frontend/src/Components/DragPreviewLayer.tsx
+++ b/frontend/src/Components/DragPreviewLayer.tsx
@@ -10,7 +10,7 @@ function DragPreviewLayer({
   className = styles.dragLayer,
   children,
   ...otherProps
-}: DragPreviewLayerProps) {
+}: Readonly<DragPreviewLayerProps>) {
   return (
     <div className={className} {...otherProps}>
       {children}
diff --git a/frontend/src/Components/Error/ErrorBoundary.tsx b/frontend/src/Components/Error/ErrorBoundary.tsx
index 3dd9ebff2f..f2eb179488 100644
--- a/frontend/src/Components/Error/ErrorBoundary.tsx
+++ b/frontend/src/Components/Error/ErrorBoundary.tsx
@@ -14,7 +14,7 @@ interface ErrorBoundaryState {
 
 // Class component until componentDidCatch is supported in functional components
 class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
-  constructor(props: ErrorBoundaryProps) {
+  constructor(props: Readonly<ErrorBoundaryProps>) {
     super(props);
 
     this.state = {
diff --git a/frontend/src/Components/Error/ErrorBoundaryError.tsx b/frontend/src/Components/Error/ErrorBoundaryError.tsx
index 708172dda7..1a4d71745d 100644
--- a/frontend/src/Components/Error/ErrorBoundaryError.tsx
+++ b/frontend/src/Components/Error/ErrorBoundaryError.tsx
@@ -14,7 +14,7 @@ export interface ErrorBoundaryErrorProps {
   };
 }
 
-function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
+function ErrorBoundaryError(props: Readonly<ErrorBoundaryErrorProps>) {
   const {
     className = styles.container,
     messageClassName = styles.message,
diff --git a/frontend/src/Components/FieldSet.tsx b/frontend/src/Components/FieldSet.tsx
index c2ff03a7f5..791b603a86 100644
--- a/frontend/src/Components/FieldSet.tsx
+++ b/frontend/src/Components/FieldSet.tsx
@@ -10,7 +10,7 @@ interface FieldSetProps {
   children?: React.ReactNode;
 }
 
-function FieldSet({ size = sizes.MEDIUM, legend, children }: FieldSetProps) {
+function FieldSet({ size = sizes.MEDIUM, legend, children }: Readonly<FieldSetProps>) {
   return (
     <fieldset className={styles.fieldSet}>
       <legend
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModal.tsx b/frontend/src/Components/FileBrowser/FileBrowserModal.tsx
index 0925890de2..e07da77614 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserModal.tsx
+++ b/frontend/src/Components/FileBrowser/FileBrowserModal.tsx
@@ -10,7 +10,7 @@ interface FileBrowserModalProps extends FileBrowserModalContentProps {
   onModalClose: () => void;
 }
 
-function FileBrowserModal(props: FileBrowserModalProps) {
+function FileBrowserModal(props: Readonly<FileBrowserModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.tsx b/frontend/src/Components/FileBrowser/FileBrowserModalContent.tsx
index 7b2b9acf48..9b0d814e2f 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.tsx
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.tsx
@@ -46,7 +46,7 @@ export interface FileBrowserModalContentProps {
   onModalClose: () => void;
 }
 
-function FileBrowserModalContent(props: FileBrowserModalContentProps) {
+function FileBrowserModalContent(props: Readonly<FileBrowserModalContentProps>) {
   const { name, value, includeFiles = true, onChange, onModalClose } = props;
 
   const dispatch = useDispatch();
diff --git a/frontend/src/Components/FileBrowser/FileBrowserRow.tsx b/frontend/src/Components/FileBrowser/FileBrowserRow.tsx
index fe47f1664f..d39d140d95 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserRow.tsx
+++ b/frontend/src/Components/FileBrowser/FileBrowserRow.tsx
@@ -28,7 +28,7 @@ interface FileBrowserRowProps {
   onPress: (path: string) => void;
 }
 
-function FileBrowserRow(props: FileBrowserRowProps) {
+function FileBrowserRow(props: Readonly<FileBrowserRowProps>) {
   const { type, name, path, onPress } = props;
 
   const handlePress = useCallback(() => {
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js
index edfcfc7f79..a7b5f319b3 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js
@@ -50,7 +50,7 @@ function getValue(input, selectedFilterBuilderProp) {
         case 'tib':
           return convertToBytes(value, 4, true);
         default:
-          return parseInt(value);
+          return Number.parseInt(value);
       }
     }
   }
diff --git a/frontend/src/Components/Filter/Builder/LanguageFilterBuilderRowValue.tsx b/frontend/src/Components/Filter/Builder/LanguageFilterBuilderRowValue.tsx
index e828fd8483..01daeda274 100644
--- a/frontend/src/Components/Filter/Builder/LanguageFilterBuilderRowValue.tsx
+++ b/frontend/src/Components/Filter/Builder/LanguageFilterBuilderRowValue.tsx
@@ -4,7 +4,7 @@ import createLanguagesSelector from 'Store/Selectors/createLanguagesSelector';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
 
-function LanguageFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+function LanguageFilterBuilderRowValue(props: Readonly<FilterBuilderRowValueProps>) {
   const { items } = useSelector(createLanguagesSelector());
 
   return <FilterBuilderRowValue {...props} tagList={items} />;
diff --git a/frontend/src/Components/Filter/Builder/MovieFilterBuilderRowValue.tsx b/frontend/src/Components/Filter/Builder/MovieFilterBuilderRowValue.tsx
index 509d4e2a21..0b658687a1 100644
--- a/frontend/src/Components/Filter/Builder/MovieFilterBuilderRowValue.tsx
+++ b/frontend/src/Components/Filter/Builder/MovieFilterBuilderRowValue.tsx
@@ -6,7 +6,7 @@ import sortByProp from 'Utilities/Array/sortByProp';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
 
-function MovieFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+function MovieFilterBuilderRowValue(props: Readonly<FilterBuilderRowValueProps>) {
   const allMovies: Movie[] = useSelector(createAllMoviesSelector());
 
   const tagList = allMovies
diff --git a/frontend/src/Components/Filter/Builder/QueueStatusFilterBuilderRowValue.tsx b/frontend/src/Components/Filter/Builder/QueueStatusFilterBuilderRowValue.tsx
index 1127493a5c..d5ea15b73f 100644
--- a/frontend/src/Components/Filter/Builder/QueueStatusFilterBuilderRowValue.tsx
+++ b/frontend/src/Components/Filter/Builder/QueueStatusFilterBuilderRowValue.tsx
@@ -60,7 +60,7 @@ const statusTagList = [
   },
 ];
 
-function QueueStatusFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+function QueueStatusFilterBuilderRowValue(props: Readonly<FilterBuilderRowValueProps>) {
   return <FilterBuilderRowValue {...props} tagList={statusTagList} />;
 }
 
diff --git a/frontend/src/Components/Form/AutoCompleteInput.tsx b/frontend/src/Components/Form/AutoCompleteInput.tsx
index 226b40c458..378edc3f94 100644
--- a/frontend/src/Components/Form/AutoCompleteInput.tsx
+++ b/frontend/src/Components/Form/AutoCompleteInput.tsx
@@ -21,7 +21,7 @@ function AutoCompleteInput({
   values,
   onChange,
   ...otherProps
-}: AutoCompleteInputProps) {
+}: Readonly<AutoCompleteInputProps>) {
   const [suggestions, setSuggestions] = useState<string[]>([]);
 
   const getSuggestionValue = useCallback((item: string) => {
diff --git a/frontend/src/Components/Form/CaptchaInput.tsx b/frontend/src/Components/Form/CaptchaInput.tsx
index 597b1ad4f0..75d0a3dd1f 100644
--- a/frontend/src/Components/Form/CaptchaInput.tsx
+++ b/frontend/src/Components/Form/CaptchaInput.tsx
@@ -42,7 +42,7 @@ function CaptchaInput({
   siteKey,
   secretToken,
   onChange,
-}: CaptchaInputProps) {
+}: Readonly<CaptchaInputProps>) {
   const { token } = useSelector((state: AppState) => state.captcha);
   const dispatch = useDispatch();
   const previousToken = usePrevious(token);
diff --git a/frontend/src/Components/Form/CheckInput.tsx b/frontend/src/Components/Form/CheckInput.tsx
index 107beaa580..3d43fd1ab3 100644
--- a/frontend/src/Components/Form/CheckInput.tsx
+++ b/frontend/src/Components/Form/CheckInput.tsx
@@ -25,7 +25,7 @@ export interface CheckInputProps {
   onChange: (changes: CheckInputChanged) => void;
 }
 
-function CheckInput(props: CheckInputProps) {
+function CheckInput(props: Readonly<CheckInputProps>) {
   const {
     className = styles.input,
     containerClassName = styles.container,
diff --git a/frontend/src/Components/Form/Form.tsx b/frontend/src/Components/Form/Form.tsx
index 055c8f80a6..3883d569af 100644
--- a/frontend/src/Components/Form/Form.tsx
+++ b/frontend/src/Components/Form/Form.tsx
@@ -16,7 +16,7 @@ function Form({
   children,
   validationErrors = [],
   validationWarnings = [],
-}: FormProps) {
+}: Readonly<FormProps>) {
   return (
     <div id={id}>
       {validationErrors.length || validationWarnings.length ? (
diff --git a/frontend/src/Components/Form/FormGroup.tsx b/frontend/src/Components/Form/FormGroup.tsx
index 1dd879897a..b76b0cfbfd 100644
--- a/frontend/src/Components/Form/FormGroup.tsx
+++ b/frontend/src/Components/Form/FormGroup.tsx
@@ -11,7 +11,7 @@ interface FormGroupProps extends ComponentPropsWithoutRef<'div'> {
   isAdvanced?: boolean;
 }
 
-function FormGroup(props: FormGroupProps) {
+function FormGroup(props: Readonly<FormGroupProps>) {
   const {
     className = styles.group,
     children,
diff --git a/frontend/src/Components/Form/FormInputButton.tsx b/frontend/src/Components/Form/FormInputButton.tsx
index 1235010ebb..0b53109a37 100644
--- a/frontend/src/Components/Form/FormInputButton.tsx
+++ b/frontend/src/Components/Form/FormInputButton.tsx
@@ -18,7 +18,7 @@ function FormInputButton({
   isSpinning = false,
   kind = kinds.PRIMARY,
   ...otherProps
-}: FormInputButtonProps) {
+}: Readonly<FormInputButtonProps>) {
   if (canSpin) {
     return (
       <SpinnerButton
diff --git a/frontend/src/Components/Form/FormInputHelpText.tsx b/frontend/src/Components/Form/FormInputHelpText.tsx
index 1531d9585b..a90a8fbed3 100644
--- a/frontend/src/Components/Form/FormInputHelpText.tsx
+++ b/frontend/src/Components/Form/FormInputHelpText.tsx
@@ -23,7 +23,7 @@ function FormInputHelpText({
   isError = false,
   isWarning = false,
   isCheckInput = false,
-}: FormInputHelpTextProps) {
+}: Readonly<FormInputHelpTextProps>) {
   return (
     <div
       className={classNames(
diff --git a/frontend/src/Components/Form/FormLabel.tsx b/frontend/src/Components/Form/FormLabel.tsx
index 4f29e6ac6e..3b010155b0 100644
--- a/frontend/src/Components/Form/FormLabel.tsx
+++ b/frontend/src/Components/Form/FormLabel.tsx
@@ -13,7 +13,7 @@ interface FormLabelProps {
   isAdvanced?: boolean;
 }
 
-function FormLabel(props: FormLabelProps) {
+function FormLabel(props: Readonly<FormLabelProps>) {
   const {
     children,
     className = styles.label,
diff --git a/frontend/src/Components/Form/KeyValueListInput.tsx b/frontend/src/Components/Form/KeyValueListInput.tsx
index f5c6ac19be..c19f4e1530 100644
--- a/frontend/src/Components/Form/KeyValueListInput.tsx
+++ b/frontend/src/Components/Form/KeyValueListInput.tsx
@@ -29,7 +29,7 @@ function KeyValueListInput({
   keyPlaceholder,
   valuePlaceholder,
   onChange,
-}: KeyValueListInputProps): JSX.Element {
+}: Readonly<KeyValueListInputProps>): JSX.Element {
   const [isFocused, setIsFocused] = useState(false);
 
   const handleItemChange = useCallback(
diff --git a/frontend/src/Components/Form/KeyValueListInputItem.tsx b/frontend/src/Components/Form/KeyValueListInputItem.tsx
index c63ad50a92..27823955b4 100644
--- a/frontend/src/Components/Form/KeyValueListInputItem.tsx
+++ b/frontend/src/Components/Form/KeyValueListInputItem.tsx
@@ -28,7 +28,7 @@ function KeyValueListInputItem({
   onRemove,
   onFocus,
   onBlur,
-}: KeyValueListInputItemProps): JSX.Element {
+}: Readonly<KeyValueListInputItemProps>): JSX.Element {
   const handleKeyChange = useCallback(
     ({ value: keyValue }: { value: string }) => {
       onChange(index, { key: keyValue, value });
diff --git a/frontend/src/Components/Form/NumberInput.tsx b/frontend/src/Components/Form/NumberInput.tsx
index 875b81b5c9..d4e2a26833 100644
--- a/frontend/src/Components/Form/NumberInput.tsx
+++ b/frontend/src/Components/Form/NumberInput.tsx
@@ -13,7 +13,7 @@ function parseValue(
     return null;
   }
 
-  let newValue = isFloat ? parseFloat(value) : parseInt(value);
+  let newValue = isFloat ? Number.parseFloat(value) : Number.parseInt(value);
 
   if (min != null && newValue != null && newValue < min) {
     newValue = min;
@@ -41,7 +41,7 @@ function NumberInput({
   max,
   onChange,
   ...otherProps
-}: NumberInputProps) {
+}: Readonly<NumberInputProps>) {
   const [value, setValue] = useState(
     inputValue == null ? '' : inputValue.toString()
   );
@@ -82,8 +82,7 @@ function NumberInput({
 
   useEffect(() => {
     if (
-      // @ts-expect-error inputValue may be null
-      !isNaN(inputValue) &&
+      !Number.isNaN(inputValue) &&
       inputValue !== previousValue &&
       !isFocused.current
     ) {
diff --git a/frontend/src/Components/Form/OAuthInput.tsx b/frontend/src/Components/Form/OAuthInput.tsx
index 19bc9ba23c..7e229c89a7 100644
--- a/frontend/src/Components/Form/OAuthInput.tsx
+++ b/frontend/src/Components/Form/OAuthInput.tsx
@@ -22,7 +22,7 @@ function OAuthInput({
   providerData,
   section,
   onChange,
-}: OAuthInputProps) {
+}: Readonly<OAuthInputProps>) {
   const dispatch = useDispatch();
   const { authorizing, error, result } = useSelector(
     (state: AppState) => state.oAuth
diff --git a/frontend/src/Components/Form/PasswordInput.tsx b/frontend/src/Components/Form/PasswordInput.tsx
index 98da46e7ec..6c088c42d0 100644
--- a/frontend/src/Components/Form/PasswordInput.tsx
+++ b/frontend/src/Components/Form/PasswordInput.tsx
@@ -7,7 +7,7 @@ function onCopy(e: SyntheticEvent) {
   e.nativeEvent.stopImmediatePropagation();
 }
 
-function PasswordInput(props: TextInputProps) {
+function PasswordInput(props: Readonly<TextInputProps>) {
   return <TextInput {...props} type="password" onCopy={onCopy} />;
 }
 
diff --git a/frontend/src/Components/Form/PathInput.tsx b/frontend/src/Components/Form/PathInput.tsx
index 015b835e31..24cb125aa7 100644
--- a/frontend/src/Components/Form/PathInput.tsx
+++ b/frontend/src/Components/Form/PathInput.tsx
@@ -61,7 +61,7 @@ function createPathsSelector() {
   );
 }
 
-function PathInput(props: PathInputProps) {
+function PathInput(props: Readonly<PathInputProps>) {
   const { includeFiles } = props;
 
   const dispatch = useDispatch();
@@ -91,7 +91,7 @@ function PathInput(props: PathInputProps) {
 
 export default PathInput;
 
-export function PathInputInternal(props: PathInputInternalProps) {
+export function PathInputInternal(props: Readonly<PathInputInternalProps>) {
   const {
     className = styles.inputWrapper,
     name,
diff --git a/frontend/src/Components/Form/Select/AvailabilitySelectInput.tsx b/frontend/src/Components/Form/Select/AvailabilitySelectInput.tsx
index cba94f5a61..a0a6d93540 100644
--- a/frontend/src/Components/Form/Select/AvailabilitySelectInput.tsx
+++ b/frontend/src/Components/Form/Select/AvailabilitySelectInput.tsx
@@ -42,7 +42,7 @@ const movieAvailabilityOptions: IMovieAvailabilityOption[] = [
   },
 ];
 
-function AvailabilitySelectInput(props: AvailabilitySelectInputProps) {
+function AvailabilitySelectInput(props: Readonly<AvailabilitySelectInputProps>) {
   const {
     includeNoChange = false,
     includeNoChangeDisabled = true,
diff --git a/frontend/src/Components/Form/Select/DownloadClientSelectInput.tsx b/frontend/src/Components/Form/Select/DownloadClientSelectInput.tsx
index 4dca13db74..42c99e4dc2 100644
--- a/frontend/src/Components/Form/Select/DownloadClientSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/DownloadClientSelectInput.tsx
@@ -67,7 +67,7 @@ function DownloadClientSelectInput({
   includeAny = false,
   protocol = 'torrent',
   ...otherProps
-}: DownloadClientSelectInputProps) {
+}: Readonly<DownloadClientSelectInputProps>) {
   const dispatch = useDispatch();
   const { isFetching, isPopulated, values } = useSelector(
     createDownloadClientsSelector(includeAny, protocol)
diff --git a/frontend/src/Components/Form/Select/EnhancedSelectInputOption.tsx b/frontend/src/Components/Form/Select/EnhancedSelectInputOption.tsx
index c866a5060a..42d5b2238b 100644
--- a/frontend/src/Components/Form/Select/EnhancedSelectInputOption.tsx
+++ b/frontend/src/Components/Form/Select/EnhancedSelectInputOption.tsx
@@ -34,7 +34,7 @@ function EnhancedSelectInputOption({
   isMobile,
   children,
   onSelect,
-}: EnhancedSelectInputOptionProps) {
+}: Readonly<EnhancedSelectInputOptionProps>) {
   const handlePress = useCallback(
     (event: SyntheticEvent) => {
       event.preventDefault();
diff --git a/frontend/src/Components/Form/Select/EnhancedSelectInputSelectedValue.tsx b/frontend/src/Components/Form/Select/EnhancedSelectInputSelectedValue.tsx
index 88afdb18a4..b27625bcea 100644
--- a/frontend/src/Components/Form/Select/EnhancedSelectInputSelectedValue.tsx
+++ b/frontend/src/Components/Form/Select/EnhancedSelectInputSelectedValue.tsx
@@ -12,7 +12,7 @@ function EnhancedSelectInputSelectedValue({
   className = styles.selectedValue,
   children,
   isDisabled = false,
-}: EnhancedSelectInputSelectedValueProps) {
+}: Readonly<EnhancedSelectInputSelectedValueProps>) {
   return (
     <div className={classNames(className, isDisabled && styles.isDisabled)}>
       {children}
diff --git a/frontend/src/Components/Form/Select/HintedSelectInputOption.tsx b/frontend/src/Components/Form/Select/HintedSelectInputOption.tsx
index 3bae0b0634..9aa61869ce 100644
--- a/frontend/src/Components/Form/Select/HintedSelectInputOption.tsx
+++ b/frontend/src/Components/Form/Select/HintedSelectInputOption.tsx
@@ -13,7 +13,7 @@ interface HintedSelectInputOptionProps
   isSelected?: boolean;
 }
 
-function HintedSelectInputOption(props: HintedSelectInputOptionProps) {
+function HintedSelectInputOption(props: Readonly<HintedSelectInputOptionProps>) {
   const {
     id,
     value,
diff --git a/frontend/src/Components/Form/Select/IndexerFlagsSelectInput.tsx b/frontend/src/Components/Form/Select/IndexerFlagsSelectInput.tsx
index e4f149d3ca..44d98fc809 100644
--- a/frontend/src/Components/Form/Select/IndexerFlagsSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/IndexerFlagsSelectInput.tsx
@@ -41,7 +41,7 @@ function IndexerFlagsSelectInput({
   indexerFlags,
   onChange,
   ...otherProps
-}: IndexerFlagsSelectInputProps) {
+}: Readonly<IndexerFlagsSelectInputProps>) {
   const { value, values } = useSelector(selectIndexerFlagsValues(indexerFlags));
 
   const handleChange = useCallback(
diff --git a/frontend/src/Components/Form/Select/IndexerSelectInput.tsx b/frontend/src/Components/Form/Select/IndexerSelectInput.tsx
index f4c7f4bb52..3c50a87568 100644
--- a/frontend/src/Components/Form/Select/IndexerSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/IndexerSelectInput.tsx
@@ -50,7 +50,7 @@ function IndexerSelectInput({
   value,
   includeAny = false,
   onChange,
-}: IndexerSelectInputProps) {
+}: Readonly<IndexerSelectInputProps>) {
   const dispatch = useDispatch();
   const { isFetching, isPopulated, values } = useSelector(
     createIndexersSelector(includeAny)
diff --git a/frontend/src/Components/Form/Select/LanguageSelectInput.tsx b/frontend/src/Components/Form/Select/LanguageSelectInput.tsx
index 179debb51d..fc482e197f 100644
--- a/frontend/src/Components/Form/Select/LanguageSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/LanguageSelectInput.tsx
@@ -15,7 +15,7 @@ function LanguageSelectInput({
   values,
   onChange,
   ...otherProps
-}: LanguageSelectInputProps) {
+}: Readonly<LanguageSelectInputProps>) {
   const mappedValues = useMemo(() => {
     const minId = values.reduce(
       (min: number, v) => (v.key < 1 ? v.key : min),
diff --git a/frontend/src/Components/Form/Select/MonitorMoviesSelectInput.tsx b/frontend/src/Components/Form/Select/MonitorMoviesSelectInput.tsx
index 69d105d6bf..6ca79850dd 100644
--- a/frontend/src/Components/Form/Select/MonitorMoviesSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/MonitorMoviesSelectInput.tsx
@@ -15,7 +15,7 @@ export interface MonitorMoviesSelectInputProps
   includeMixed?: boolean;
 }
 
-function MonitorMoviesSelectInput(props: MonitorMoviesSelectInputProps) {
+function MonitorMoviesSelectInput(props: Readonly<MonitorMoviesSelectInputProps>) {
   const {
     includeNoChange = false,
     includeMixed = false,
diff --git a/frontend/src/Components/Form/Select/ProviderOptionSelectInput.tsx b/frontend/src/Components/Form/Select/ProviderOptionSelectInput.tsx
index f85fcc8f3e..1f5fffe4cc 100644
--- a/frontend/src/Components/Form/Select/ProviderOptionSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/ProviderOptionSelectInput.tsx
@@ -86,7 +86,7 @@ function ProviderOptionSelectInput({
   providerData,
   selectOptionsProviderAction,
   ...otherProps
-}: ProviderOptionSelectInputProps) {
+}: Readonly<ProviderOptionSelectInputProps>) {
   const dispatch = useDispatch();
   const [isRefetchRequired, setIsRefetchRequired] = useState(false);
   const previousProviderData = usePrevious(providerData);
diff --git a/frontend/src/Components/Form/Select/QualityProfileSelectInput.tsx b/frontend/src/Components/Form/Select/QualityProfileSelectInput.tsx
index a1dcc6dbce..b31af8768e 100644
--- a/frontend/src/Components/Form/Select/QualityProfileSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/QualityProfileSelectInput.tsx
@@ -78,7 +78,7 @@ function QualityProfileSelectInput({
   includeMixed = false,
   onChange,
   ...otherProps
-}: QualityProfileSelectInputProps) {
+}: Readonly<QualityProfileSelectInputProps>) {
   const values = useSelector(
     createQualityProfilesSelector(
       includeNoChange,
diff --git a/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx b/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
index dc199d5ef7..92064405a8 100644
--- a/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
@@ -105,7 +105,7 @@ function RootFolderSelectInput({
   includeNoChangeDisabled = true,
   onChange,
   ...otherProps
-}: RootFolderSelectInputProps) {
+}: Readonly<RootFolderSelectInputProps>) {
   const dispatch = useDispatch();
   const { values, isSaving, saveError } = useSelector(
     createRootFolderOptionsSelector(
diff --git a/frontend/src/Components/Form/Select/RootFolderSelectInputOption.tsx b/frontend/src/Components/Form/Select/RootFolderSelectInputOption.tsx
index f386127842..e7856ccd45 100644
--- a/frontend/src/Components/Form/Select/RootFolderSelectInputOption.tsx
+++ b/frontend/src/Components/Form/Select/RootFolderSelectInputOption.tsx
@@ -27,7 +27,7 @@ function RootFolderSelectInputOption({
   isMobile,
   isWindows,
   ...otherProps
-}: RootFolderSelectInputOptionProps) {
+}: Readonly<RootFolderSelectInputOptionProps>) {
   const slashCharacter = isWindows ? '\\' : '/';
 
   return (
diff --git a/frontend/src/Components/Form/Select/RootFolderSelectInputSelectedValue.tsx b/frontend/src/Components/Form/Select/RootFolderSelectInputSelectedValue.tsx
index a262b13b19..d55181346e 100644
--- a/frontend/src/Components/Form/Select/RootFolderSelectInputSelectedValue.tsx
+++ b/frontend/src/Components/Form/Select/RootFolderSelectInputSelectedValue.tsx
@@ -20,7 +20,7 @@ function RootFolderSelectInputSelectedValue({
   includeFreeSpace = true,
   isWindows,
   ...otherProps
-}: RootFolderSelectInputSelectedValueProps) {
+}: Readonly<RootFolderSelectInputSelectedValueProps>) {
   const slashCharacter = isWindows ? '\\' : '/';
   const { value, freeSpace, isMissing } =
     values.find((v) => v.key === selectedValue) ||
diff --git a/frontend/src/Components/Form/Select/UMaskInput.tsx b/frontend/src/Components/Form/Select/UMaskInput.tsx
index 2f528ba912..08a6dc28b0 100644
--- a/frontend/src/Components/Form/Select/UMaskInput.tsx
+++ b/frontend/src/Components/Form/Select/UMaskInput.tsx
@@ -76,8 +76,8 @@ export interface UMaskInputProps {
   onBlur?: (event: SyntheticEvent) => void;
 }
 
-function UMaskInput({ name, value, onChange }: UMaskInputProps) {
-  const valueNum = parseInt(value, 8);
+function UMaskInput({ name, value, onChange }: Readonly<UMaskInputProps>) {
+  const valueNum = Number.parseInt(value, 8);
   const umaskNum = 0o777 & ~valueNum;
   const umask = umaskNum.toString(8).padStart(4, '0');
   const folderNum = 0o777 & ~umaskNum;
diff --git a/frontend/src/Components/Form/Tag/DeviceInput.tsx b/frontend/src/Components/Form/Tag/DeviceInput.tsx
index 2297760596..b233713181 100644
--- a/frontend/src/Components/Form/Tag/DeviceInput.tsx
+++ b/frontend/src/Components/Form/Tag/DeviceInput.tsx
@@ -65,7 +65,7 @@ function DeviceInput({
   provider,
   providerData,
   onChange,
-}: DeviceInputProps) {
+}: Readonly<DeviceInputProps>) {
   const dispatch = useDispatch();
   const { items, selectedDevices, isFetching } = useSelector(
     createDeviceTagsSelector(value)
diff --git a/frontend/src/Components/Form/Tag/MovieTagInput.tsx b/frontend/src/Components/Form/Tag/MovieTagInput.tsx
index 8797b50a04..74a2bc4c5f 100644
--- a/frontend/src/Components/Form/Tag/MovieTagInput.tsx
+++ b/frontend/src/Components/Form/Tag/MovieTagInput.tsx
@@ -23,7 +23,8 @@ const VALID_TAG_REGEX = new RegExp('[^-_a-z0-9]', 'i');
 function isValidTag(tagName: string) {
   try {
     return !VALID_TAG_REGEX.test(tagName);
-  } catch {
+  } catch (e) {
+    console.warn('Tag validation failed:', e);
     return false;
   }
 }
diff --git a/frontend/src/Components/Form/Tag/TagSelectInput.tsx b/frontend/src/Components/Form/Tag/TagSelectInput.tsx
index 139b7ba84e..e4aca9c3dd 100644
--- a/frontend/src/Components/Form/Tag/TagSelectInput.tsx
+++ b/frontend/src/Components/Form/Tag/TagSelectInput.tsx
@@ -26,7 +26,7 @@ function TagSelectInput({
   values,
   onChange,
   ...otherProps
-}: TagSelectInputProps) {
+}: Readonly<TagSelectInputProps>) {
   const { tags, tagList, allTags } = useMemo(() => {
     const sortedTags = values.sort((a, b) => a.key - b.key);
 
diff --git a/frontend/src/Components/Form/Tag/TextTagInput.tsx b/frontend/src/Components/Form/Tag/TextTagInput.tsx
index 6d26520301..f601c98091 100644
--- a/frontend/src/Components/Form/Tag/TextTagInput.tsx
+++ b/frontend/src/Components/Form/Tag/TextTagInput.tsx
@@ -23,7 +23,7 @@ function TextTagInput({
   value,
   onChange,
   ...otherProps
-}: TextTagInputProps) {
+}: Readonly<TextTagInputProps>) {
   const { tags, tagList, valueArray } = useMemo(() => {
     const tagsArray = Array.isArray(value) ? value : split(value);
 
diff --git a/frontend/src/Components/Form/TextArea.tsx b/frontend/src/Components/Form/TextArea.tsx
index 047817eb7f..6be27fbf57 100644
--- a/frontend/src/Components/Form/TextArea.tsx
+++ b/frontend/src/Components/Form/TextArea.tsx
@@ -37,7 +37,7 @@ function TextArea({
   onFocus,
   onChange,
   onSelectionChange,
-}: TextAreaProps) {
+}: Readonly<TextAreaProps>) {
   const inputRef = useRef<HTMLTextAreaElement>(null);
   const selectionTimeout = useRef<ReturnType<typeof setTimeout>>();
   const selectionStart = useRef<number | null>();
diff --git a/frontend/src/Components/Icon.tsx b/frontend/src/Components/Icon.tsx
index ff1597bcf3..622f77aae6 100644
--- a/frontend/src/Components/Icon.tsx
+++ b/frontend/src/Components/Icon.tsx
@@ -34,7 +34,7 @@ export default function Icon({
   isSpinning = false,
   fixedWidth = false,
   ...otherProps
-}: IconProps) {
+}: Readonly<IconProps>) {
   const icon = (
     <FontAwesomeIcon
       className={classNames(className, styles[kind])}
diff --git a/frontend/src/Components/ImdbRating.tsx b/frontend/src/Components/ImdbRating.tsx
index 68810b5baf..09627a0257 100644
--- a/frontend/src/Components/ImdbRating.tsx
+++ b/frontend/src/Components/ImdbRating.tsx
@@ -11,7 +11,7 @@ interface ImdbRatingProps {
   hideIcon?: boolean;
 }
 
-function ImdbRating(props: ImdbRatingProps) {
+function ImdbRating(props: Readonly<ImdbRatingProps>) {
   const { ratings, iconSize = 14, hideIcon = false } = props;
 
   const imdbImage =
diff --git a/frontend/src/Components/ImportListList.tsx b/frontend/src/Components/ImportListList.tsx
index fd2ee48419..65995bf3a9 100644
--- a/frontend/src/Components/ImportListList.tsx
+++ b/frontend/src/Components/ImportListList.tsx
@@ -8,7 +8,7 @@ interface ImportListListProps {
   lists: number[];
 }
 
-function ImportListList({ lists }: ImportListListProps) {
+function ImportListList({ lists }: Readonly<ImportListListProps>) {
   const allImportLists = useSelector(
     (state: AppState) => state.settings.importLists.items
   );
diff --git a/frontend/src/Components/InfoLabel.tsx b/frontend/src/Components/InfoLabel.tsx
index dadf5e4b6a..fd5413227c 100644
--- a/frontend/src/Components/InfoLabel.tsx
+++ b/frontend/src/Components/InfoLabel.tsx
@@ -21,7 +21,7 @@ function InfoLabel({
   outline = false,
   children,
   ...otherProps
-}: InfoLabelProps) {
+}: Readonly<InfoLabelProps>) {
   return (
     <span
       className={classNames(
diff --git a/frontend/src/Components/Label.tsx b/frontend/src/Components/Label.tsx
index 9ab360f420..98b6502186 100644
--- a/frontend/src/Components/Label.tsx
+++ b/frontend/src/Components/Label.tsx
@@ -18,7 +18,7 @@ export default function Label({
   size = sizes.SMALL,
   outline = false,
   ...otherProps
-}: LabelProps) {
+}: Readonly<LabelProps>) {
   return (
     <span
       className={classNames(
diff --git a/frontend/src/Components/Link/Button.tsx b/frontend/src/Components/Link/Button.tsx
index 610350a8dc..8aec74343e 100644
--- a/frontend/src/Components/Link/Button.tsx
+++ b/frontend/src/Components/Link/Button.tsx
@@ -20,7 +20,7 @@ export default function Button({
   kind = kinds.DEFAULT,
   size = sizes.MEDIUM,
   ...otherProps
-}: ButtonProps) {
+}: Readonly<ButtonProps>) {
   return (
     <Link
       className={classNames(
diff --git a/frontend/src/Components/Link/ClipboardButton.tsx b/frontend/src/Components/Link/ClipboardButton.tsx
index dfce115ac9..e325c4cfd2 100644
--- a/frontend/src/Components/Link/ClipboardButton.tsx
+++ b/frontend/src/Components/Link/ClipboardButton.tsx
@@ -17,7 +17,7 @@ export default function ClipboardButton({
   value,
   className = styles.button,
   ...otherProps
-}: ClipboardButtonProps) {
+}: Readonly<ClipboardButtonProps>) {
   const [state, setState] = useState<ClipboardState>(null);
 
   useEffect(() => {
diff --git a/frontend/src/Components/Link/IconButton.tsx b/frontend/src/Components/Link/IconButton.tsx
index b6951c00c2..3cba9fbfd2 100644
--- a/frontend/src/Components/Link/IconButton.tsx
+++ b/frontend/src/Components/Link/IconButton.tsx
@@ -19,7 +19,7 @@ export default function IconButton({
   size = 12,
   isSpinning,
   ...otherProps
-}: IconButtonProps) {
+}: Readonly<IconButtonProps>) {
   return (
     <Link
       className={classNames(
diff --git a/frontend/src/Components/Link/SpinnerButton.tsx b/frontend/src/Components/Link/SpinnerButton.tsx
index 3a5ab2b325..dd3cf35e0e 100644
--- a/frontend/src/Components/Link/SpinnerButton.tsx
+++ b/frontend/src/Components/Link/SpinnerButton.tsx
@@ -18,7 +18,7 @@ function SpinnerButton({
   spinnerIcon = icons.SPINNER,
   children,
   ...otherProps
-}: SpinnerButtonProps) {
+}: Readonly<SpinnerButtonProps>) {
   return (
     <Button
       className={classNames(
diff --git a/frontend/src/Components/Link/SpinnerErrorButton.tsx b/frontend/src/Components/Link/SpinnerErrorButton.tsx
index 221a12b610..6e395163ef 100644
--- a/frontend/src/Components/Link/SpinnerErrorButton.tsx
+++ b/frontend/src/Components/Link/SpinnerErrorButton.tsx
@@ -60,7 +60,7 @@ function SpinnerErrorButton({
   error,
   children,
   ...otherProps
-}: SpinnerErrorButtonProps) {
+}: Readonly<SpinnerErrorButtonProps>) {
   const wasSpinning = usePrevious(isSpinning);
   const updateTimeout = useRef<ReturnType<typeof setTimeout>>();
 
diff --git a/frontend/src/Components/Link/SpinnerIconButton.tsx b/frontend/src/Components/Link/SpinnerIconButton.tsx
index e0df823048..7aecf62b64 100644
--- a/frontend/src/Components/Link/SpinnerIconButton.tsx
+++ b/frontend/src/Components/Link/SpinnerIconButton.tsx
@@ -13,7 +13,7 @@ function SpinnerIconButton({
   isDisabled = false,
   isSpinning = false,
   ...otherProps
-}: SpinnerIconButtonProps) {
+}: Readonly<SpinnerIconButtonProps>) {
   return (
     <IconButton
       name={isSpinning ? spinningName || name : name}
diff --git a/frontend/src/Components/Loading/LoadingIndicator.tsx b/frontend/src/Components/Loading/LoadingIndicator.tsx
index 06b5ecf3c5..d0feeea08b 100644
--- a/frontend/src/Components/Loading/LoadingIndicator.tsx
+++ b/frontend/src/Components/Loading/LoadingIndicator.tsx
@@ -12,7 +12,7 @@ function LoadingIndicator({
   className = styles.loading,
   rippleClassName = styles.ripple,
   size = 50,
-}: LoadingIndicatorProps) {
+}: Readonly<LoadingIndicatorProps>) {
   const sizeInPx = `${size}px`;
   const width = sizeInPx;
   const height = sizeInPx;
diff --git a/frontend/src/Components/Markdown/InlineMarkdown.tsx b/frontend/src/Components/Markdown/InlineMarkdown.tsx
index 80e99336a1..543f9d0622 100644
--- a/frontend/src/Components/Markdown/InlineMarkdown.tsx
+++ b/frontend/src/Components/Markdown/InlineMarkdown.tsx
@@ -7,7 +7,7 @@ interface InlineMarkdownProps {
   blockClassName?: string;
 }
 
-function InlineMarkdown(props: InlineMarkdownProps) {
+function InlineMarkdown(props: Readonly<InlineMarkdownProps>) {
   const { className, data, blockClassName } = props;
 
   // For now only replace links or code blocks (not both)
diff --git a/frontend/src/Components/MediaTypeBadge.tsx b/frontend/src/Components/MediaTypeBadge.tsx
index 6b4f135fe5..3d4d0fa6c0 100644
--- a/frontend/src/Components/MediaTypeBadge.tsx
+++ b/frontend/src/Components/MediaTypeBadge.tsx
@@ -33,7 +33,7 @@ function getLabelForMediaType(mediaType?: MediaType) {
   }
 }
 
-function MediaTypeBadge({ mediaType, className }: MediaTypeBadgeProps) {
+function MediaTypeBadge({ mediaType, className }: Readonly<MediaTypeBadgeProps>) {
   return (
     <Label
       className={className}
diff --git a/frontend/src/Components/Menu/FilterMenu.tsx b/frontend/src/Components/Menu/FilterMenu.tsx
index cbf4f1d3f7..5653e9339c 100644
--- a/frontend/src/Components/Menu/FilterMenu.tsx
+++ b/frontend/src/Components/Menu/FilterMenu.tsx
@@ -31,7 +31,7 @@ function FilterMenu({
   filterModalConnectorComponentProps,
   onFilterSelect,
   ...otherProps
-}: FilterMenuProps) {
+}: Readonly<FilterMenuProps>) {
   const [isFilterModalOpen, setIsFilterModalOpen] = useState(false);
 
   const showCustomFilters = !!FilterModalConnectorComponent;
diff --git a/frontend/src/Components/Menu/FilterMenuContent.tsx b/frontend/src/Components/Menu/FilterMenuContent.tsx
index 2f0783774f..88b0acee99 100644
--- a/frontend/src/Components/Menu/FilterMenuContent.tsx
+++ b/frontend/src/Components/Menu/FilterMenuContent.tsx
@@ -24,7 +24,7 @@ function FilterMenuContent({
   onFilterSelect,
   onCustomFiltersPress,
   ...otherProps
-}: FilterMenuContentProps) {
+}: Readonly<FilterMenuContentProps>) {
   return (
     <MenuContent {...otherProps}>
       {filters.map((filter) => {
diff --git a/frontend/src/Components/Menu/FilterMenuItem.tsx b/frontend/src/Components/Menu/FilterMenuItem.tsx
index 0f27b04a57..4e0e812998 100644
--- a/frontend/src/Components/Menu/FilterMenuItem.tsx
+++ b/frontend/src/Components/Menu/FilterMenuItem.tsx
@@ -13,7 +13,7 @@ function FilterMenuItem({
   selectedFilterKey,
   onPress,
   ...otherProps
-}: FilterMenuItemProps) {
+}: Readonly<FilterMenuItemProps>) {
   const handlePress = useCallback(() => {
     onPress(filterKey);
   }, [filterKey, onPress]);
diff --git a/frontend/src/Components/Menu/Menu.tsx b/frontend/src/Components/Menu/Menu.tsx
index ca935a0e63..7c2a616ddd 100644
--- a/frontend/src/Components/Menu/Menu.tsx
+++ b/frontend/src/Components/Menu/Menu.tsx
@@ -48,7 +48,7 @@ function Menu({
   children,
   alignMenu = 'left',
   enforceMaxHeight = true,
-}: MenuProps) {
+}: Readonly<MenuProps>) {
   const updater = useRef<(() => void) | null>(null);
   const menuButtonId = useId();
   const menuContentId = useId();
diff --git a/frontend/src/Components/Menu/MenuButton.tsx b/frontend/src/Components/Menu/MenuButton.tsx
index 043b2c9156..d0121895cd 100644
--- a/frontend/src/Components/Menu/MenuButton.tsx
+++ b/frontend/src/Components/Menu/MenuButton.tsx
@@ -15,7 +15,7 @@ function MenuButton({
   children,
   isDisabled = false,
   ...otherProps
-}: MenuButtonProps) {
+}: Readonly<MenuButtonProps>) {
   return (
     <Link
       className={classNames(className, isDisabled && styles.isDisabled)}
diff --git a/frontend/src/Components/Menu/MenuContent.tsx b/frontend/src/Components/Menu/MenuContent.tsx
index f139454181..edd91e2446 100644
--- a/frontend/src/Components/Menu/MenuContent.tsx
+++ b/frontend/src/Components/Menu/MenuContent.tsx
@@ -18,7 +18,7 @@ function MenuContent({
   children,
   style,
   isOpen,
-}: MenuContentProps) {
+}: Readonly<MenuContentProps>) {
   const generatedId = useId();
 
   return (
diff --git a/frontend/src/Components/Menu/MenuItem.tsx b/frontend/src/Components/Menu/MenuItem.tsx
index 287b02d9e4..0cfac922d4 100644
--- a/frontend/src/Components/Menu/MenuItem.tsx
+++ b/frontend/src/Components/Menu/MenuItem.tsx
@@ -14,7 +14,7 @@ function MenuItem({
   children,
   isDisabled = false,
   ...otherProps
-}: MenuItemProps) {
+}: Readonly<MenuItemProps>) {
   return (
     <Link
       className={classNames(className, isDisabled && styles.isDisabled)}
diff --git a/frontend/src/Components/Menu/PageMenuButton.tsx b/frontend/src/Components/Menu/PageMenuButton.tsx
index 2476aa75ff..75fcfb37b3 100644
--- a/frontend/src/Components/Menu/PageMenuButton.tsx
+++ b/frontend/src/Components/Menu/PageMenuButton.tsx
@@ -17,7 +17,7 @@ function PageMenuButton({
   showIndicator = false,
   text,
   ...otherProps
-}: PageMenuButtonProps) {
+}: Readonly<PageMenuButtonProps>) {
   return (
     <MenuButton className={styles.menuButton} {...otherProps}>
       <Icon name={iconName} size={18} />
diff --git a/frontend/src/Components/Menu/SelectedMenuItem.tsx b/frontend/src/Components/Menu/SelectedMenuItem.tsx
index 8350af2adc..3b0249f4b0 100644
--- a/frontend/src/Components/Menu/SelectedMenuItem.tsx
+++ b/frontend/src/Components/Menu/SelectedMenuItem.tsx
@@ -19,7 +19,7 @@ function SelectedMenuItem({
   isSelected,
   onPress,
   ...otherProps
-}: SelectedMenuItemProps) {
+}: Readonly<SelectedMenuItemProps>) {
   const handlePress = useCallback(() => {
     onPress(name ?? '');
   }, [name, onPress]);
diff --git a/frontend/src/Components/Menu/SortMenu.tsx b/frontend/src/Components/Menu/SortMenu.tsx
index 7795910ae0..ffffd6ee69 100644
--- a/frontend/src/Components/Menu/SortMenu.tsx
+++ b/frontend/src/Components/Menu/SortMenu.tsx
@@ -18,7 +18,7 @@ function SortMenu({
   children,
   isDisabled = false,
   ...otherProps
-}: SortMenuProps) {
+}: Readonly<SortMenuProps>) {
   return (
     <Menu className={className} {...otherProps}>
       <ToolbarMenuButton
diff --git a/frontend/src/Components/Menu/SortMenuItem.tsx b/frontend/src/Components/Menu/SortMenuItem.tsx
index c9f50d3b75..c9680be68b 100644
--- a/frontend/src/Components/Menu/SortMenuItem.tsx
+++ b/frontend/src/Components/Menu/SortMenuItem.tsx
@@ -16,7 +16,7 @@ function SortMenuItem({
   sortKey,
   sortDirection,
   ...otherProps
-}: SortMenuItemProps) {
+}: Readonly<SortMenuItemProps>) {
   const isSelected = name === sortKey;
 
   return (
diff --git a/frontend/src/Components/Menu/ToolbarMenuButton.tsx b/frontend/src/Components/Menu/ToolbarMenuButton.tsx
index 92796cca66..4d9fd8af61 100644
--- a/frontend/src/Components/Menu/ToolbarMenuButton.tsx
+++ b/frontend/src/Components/Menu/ToolbarMenuButton.tsx
@@ -18,7 +18,7 @@ function ToolbarMenuButton({
   showIndicator = false,
   text,
   ...otherProps
-}: ToolbarMenuButtonProps) {
+}: Readonly<ToolbarMenuButtonProps>) {
   return (
     <MenuButton className={styles.menuButton} {...otherProps}>
       <div>
diff --git a/frontend/src/Components/Menu/ViewMenu.tsx b/frontend/src/Components/Menu/ViewMenu.tsx
index d0debb8f9b..a62e69c92c 100644
--- a/frontend/src/Components/Menu/ViewMenu.tsx
+++ b/frontend/src/Components/Menu/ViewMenu.tsx
@@ -16,7 +16,7 @@ function ViewMenu({
   children,
   isDisabled = false,
   ...otherProps
-}: ViewMenuProps) {
+}: Readonly<ViewMenuProps>) {
   return (
     <Menu {...otherProps}>
       <ToolbarMenuButton
diff --git a/frontend/src/Components/Menu/ViewMenuItem.tsx b/frontend/src/Components/Menu/ViewMenuItem.tsx
index 7407065bf4..4d94864297 100644
--- a/frontend/src/Components/Menu/ViewMenuItem.tsx
+++ b/frontend/src/Components/Menu/ViewMenuItem.tsx
@@ -12,7 +12,7 @@ function ViewMenuItem({
   name,
   selectedView,
   ...otherProps
-}: ViewMenuItemProps) {
+}: Readonly<ViewMenuItemProps>) {
   const isSelected = name === selectedView;
 
   return (
diff --git a/frontend/src/Components/MiddleTruncate.tsx b/frontend/src/Components/MiddleTruncate.tsx
index f635b0bc9c..f3caa7da7d 100644
--- a/frontend/src/Components/MiddleTruncate.tsx
+++ b/frontend/src/Components/MiddleTruncate.tsx
@@ -9,7 +9,7 @@ function getTruncatedText(text: string, length: number) {
   return `${text.slice(0, length)}...${text.slice(text.length - length)}`;
 }
 
-function MiddleTruncate({ text }: MiddleTruncateProps) {
+function MiddleTruncate({ text }: Readonly<MiddleTruncateProps>) {
   const [containerRef, { width: containerWidth }] = useMeasure();
   const [textRef, { width: textWidth }] = useMeasure();
   const [truncatedText, setTruncatedText] = useState(text);
diff --git a/frontend/src/Components/Modal/ConfirmModal.tsx b/frontend/src/Components/Modal/ConfirmModal.tsx
index 259d753bfe..587bf973a9 100644
--- a/frontend/src/Components/Modal/ConfirmModal.tsx
+++ b/frontend/src/Components/Modal/ConfirmModal.tsx
@@ -34,7 +34,7 @@ function ConfirmModal({
   isSpinning = false,
   onConfirm,
   onCancel,
-}: ConfirmModalProps) {
+}: Readonly<ConfirmModalProps>) {
   const { bindShortcut, unbindShortcut } = useKeyboardShortcuts();
 
   useEffect(() => {
diff --git a/frontend/src/Components/Modal/Modal.tsx b/frontend/src/Components/Modal/Modal.tsx
index cfc157f93c..f909561fba 100644
--- a/frontend/src/Components/Modal/Modal.tsx
+++ b/frontend/src/Components/Modal/Modal.tsx
@@ -67,7 +67,7 @@ function Modal({
   isOpen,
   closeOnBackgroundClick = true,
   onModalClose,
-}: ModalProps) {
+}: Readonly<ModalProps>) {
   const backgroundRef = useRef<HTMLDivElement>(null);
   const isBackdropPressed = useRef(false);
   const bodyScrollTop = useRef(0);
diff --git a/frontend/src/Components/Modal/ModalBody.tsx b/frontend/src/Components/Modal/ModalBody.tsx
index 18ef626d6f..ece9a1f507 100644
--- a/frontend/src/Components/Modal/ModalBody.tsx
+++ b/frontend/src/Components/Modal/ModalBody.tsx
@@ -15,7 +15,7 @@ function ModalBody({
   scrollDirection = 'vertical',
   children,
   ...otherProps
-}: ModalBodyProps) {
+}: Readonly<ModalBodyProps>) {
   let className = otherProps.className;
   const hasScroller = scrollDirection !== 'none';
 
diff --git a/frontend/src/Components/Modal/ModalContent.tsx b/frontend/src/Components/Modal/ModalContent.tsx
index 7d00fdb939..1da5d94fd0 100644
--- a/frontend/src/Components/Modal/ModalContent.tsx
+++ b/frontend/src/Components/Modal/ModalContent.tsx
@@ -18,7 +18,7 @@ function ModalContent({
   showCloseButton = true,
   onModalClose,
   ...otherProps
-}: ModalContentProps) {
+}: Readonly<ModalContentProps>) {
   return (
     <div className={className} {...otherProps}>
       {showCloseButton && (
diff --git a/frontend/src/Components/Modal/ModalError.tsx b/frontend/src/Components/Modal/ModalError.tsx
index 4a48089fbb..06099516bd 100644
--- a/frontend/src/Components/Modal/ModalError.tsx
+++ b/frontend/src/Components/Modal/ModalError.tsx
@@ -14,7 +14,7 @@ interface ModalErrorProps extends ErrorBoundaryErrorProps {
   onModalClose: () => void;
 }
 
-function ModalError({ onModalClose, ...otherProps }: ModalErrorProps) {
+function ModalError({ onModalClose, ...otherProps }: Readonly<ModalErrorProps>) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>{translate('Error')}</ModalHeader>
diff --git a/frontend/src/Components/Modal/ModalFooter.tsx b/frontend/src/Components/Modal/ModalFooter.tsx
index 801d51bc9e..fa0fd96ed5 100644
--- a/frontend/src/Components/Modal/ModalFooter.tsx
+++ b/frontend/src/Components/Modal/ModalFooter.tsx
@@ -5,7 +5,7 @@ interface ModalFooterProps extends React.HTMLAttributes<HTMLDivElement> {
   children?: React.ReactNode;
 }
 
-function ModalFooter({ children, ...otherProps }: ModalFooterProps) {
+function ModalFooter({ children, ...otherProps }: Readonly<ModalFooterProps>) {
   return (
     <div className={styles.modalFooter} {...otherProps}>
       {children}
diff --git a/frontend/src/Components/Modal/ModalHeader.tsx b/frontend/src/Components/Modal/ModalHeader.tsx
index 5e7f64ba57..729fbfff81 100644
--- a/frontend/src/Components/Modal/ModalHeader.tsx
+++ b/frontend/src/Components/Modal/ModalHeader.tsx
@@ -5,7 +5,7 @@ interface ModalHeaderProps extends React.HTMLAttributes<HTMLDivElement> {
   children?: React.ReactNode;
 }
 
-function ModalHeader({ children, ...otherProps }: ModalHeaderProps) {
+function ModalHeader({ children, ...otherProps }: Readonly<ModalHeaderProps>) {
   return (
     <div className={styles.modalHeader} {...otherProps}>
       {children}
diff --git a/frontend/src/Components/MonitorToggleButton.tsx b/frontend/src/Components/MonitorToggleButton.tsx
index 721bd87e19..b8a4864842 100644
--- a/frontend/src/Components/MonitorToggleButton.tsx
+++ b/frontend/src/Components/MonitorToggleButton.tsx
@@ -14,7 +14,7 @@ interface MonitorToggleButtonProps {
   onPress: (value: boolean, options: { shiftKey: boolean }) => unknown;
 }
 
-function MonitorToggleButton(props: MonitorToggleButtonProps) {
+function MonitorToggleButton(props: Readonly<MonitorToggleButtonProps>) {
   const {
     className = styles.toggleButton,
     monitored,
diff --git a/frontend/src/Components/MovieTagList.tsx b/frontend/src/Components/MovieTagList.tsx
index 02f180fe38..c31cb1c22a 100644
--- a/frontend/src/Components/MovieTagList.tsx
+++ b/frontend/src/Components/MovieTagList.tsx
@@ -7,7 +7,7 @@ interface MovieTagListProps {
   tags: number[];
 }
 
-function MovieTagList({ tags }: MovieTagListProps) {
+function MovieTagList({ tags }: Readonly<MovieTagListProps>) {
   const tagList = useSelector(createTagsSelector());
 
   return <TagList tags={tags} tagList={tagList} />;
diff --git a/frontend/src/Components/NotFound.tsx b/frontend/src/Components/NotFound.tsx
index 991fc91bb2..6e486a1e0c 100644
--- a/frontend/src/Components/NotFound.tsx
+++ b/frontend/src/Components/NotFound.tsx
@@ -7,7 +7,7 @@ interface NotFoundProps {
   message?: string;
 }
 
-function NotFound(props: NotFoundProps) {
+function NotFound(props: Readonly<NotFoundProps>) {
   const { message = translate('DefaultNotFoundMessage') } = props;
 
   return (
diff --git a/frontend/src/Components/Page/ErrorPage.tsx b/frontend/src/Components/Page/ErrorPage.tsx
index 963e79582e..000295f5c5 100644
--- a/frontend/src/Components/Page/ErrorPage.tsx
+++ b/frontend/src/Components/Page/ErrorPage.tsx
@@ -16,7 +16,7 @@ interface ErrorPageProps {
   systemStatusError?: Error;
 }
 
-function ErrorPage(props: ErrorPageProps) {
+function ErrorPage(props: Readonly<ErrorPageProps>) {
   const {
     version,
     isLocalStorageSupported,
diff --git a/frontend/src/Components/Page/Header/KeyboardShortcutsModal.tsx b/frontend/src/Components/Page/Header/KeyboardShortcutsModal.tsx
index b87b066daa..bb48bb5455 100644
--- a/frontend/src/Components/Page/Header/KeyboardShortcutsModal.tsx
+++ b/frontend/src/Components/Page/Header/KeyboardShortcutsModal.tsx
@@ -8,7 +8,7 @@ interface KeyboardShortcutsModalProps {
   onModalClose: () => void;
 }
 
-function KeyboardShortcutsModal(props: KeyboardShortcutsModalProps) {
+function KeyboardShortcutsModal(props: Readonly<KeyboardShortcutsModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.tsx b/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.tsx
index 23d635b8f7..ff56499aea 100644
--- a/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.tsx
+++ b/frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.tsx
@@ -52,7 +52,7 @@ interface KeyboardShortcutsModalContentProps {
 
 function KeyboardShortcutsModalContent({
   onModalClose,
-}: KeyboardShortcutsModalContentProps) {
+}: Readonly<KeyboardShortcutsModalContentProps>) {
   const { isOsx } = useSelector(createSystemStatusSelector());
   const allShortcuts = getShortcuts();
 
diff --git a/frontend/src/Components/Page/Header/MovieSearchInput.tsx b/frontend/src/Components/Page/Header/MovieSearchInput.tsx
index 5cba4b6997..2433b7024b 100644
--- a/frontend/src/Components/Page/Header/MovieSearchInput.tsx
+++ b/frontend/src/Components/Page/Header/MovieSearchInput.tsx
@@ -125,7 +125,7 @@ function MovieSearchInput() {
   const { bindShortcut, unbindShortcut } = useKeyboardShortcuts();
 
   const [value, setValue] = useState('');
-  const [requestLoading, setRequestLoading] = useState(false);
+  const [_requestLoading, setRequestLoading] = useState(false);
   const [suggestions, setSuggestions] = useState<MovieSuggestion[]>([]);
 
   const autosuggestRef = useRef<Autosuggest>(null);
@@ -133,6 +133,7 @@ function MovieSearchInput() {
   const worker = useRef<Worker | null>(null);
   const isLoading = useRef(false);
   const requestValue = useRef<string | null>(null);
+  const requestLoadingRef = useRef(false);
 
   const suggestionGroups = useMemo(() => {
     const result: Section[] = [];
@@ -164,15 +165,18 @@ function MovieSearchInput() {
 
       if (!isLoading.current) {
         requestValue.current = null;
+        requestLoadingRef.current = false;
         setRequestLoading(false);
       } else if (value === requestValue.current) {
         setSuggestions(suggestions);
         requestValue.current = null;
+        requestLoadingRef.current = false;
         setRequestLoading(false);
         isLoading.current = false;
         // setLoading(false);
       } else {
         setSuggestions(suggestions);
+        requestLoadingRef.current = true;
         setRequestLoading(true);
 
         const payload = {
@@ -192,9 +196,11 @@ function MovieSearchInput() {
     }
 
     requestValue.current = value;
-    setRequestLoading(true);
 
-    if (!requestLoading) {
+    if (!requestLoadingRef.current) {
+      requestLoadingRef.current = true;
+      setRequestLoading(true);
+
       const payload = {
         value,
         movies,
diff --git a/frontend/src/Components/Page/Header/MovieSearchResult.tsx b/frontend/src/Components/Page/Header/MovieSearchResult.tsx
index 71e8546545..5d0a7df415 100644
--- a/frontend/src/Components/Page/Header/MovieSearchResult.tsx
+++ b/frontend/src/Components/Page/Header/MovieSearchResult.tsx
@@ -15,7 +15,7 @@ interface MovieSearchResultProps extends SuggestedMovie {
   match: Match;
 }
 
-function MovieSearchResult(props: MovieSearchResultProps) {
+function MovieSearchResult(props: Readonly<MovieSearchResultProps>) {
   const { match, title, year, images, alternateTitles, tmdbId, imdbId, tags } =
     props;
 
diff --git a/frontend/src/Components/Page/Header/PageHeader.tsx b/frontend/src/Components/Page/Header/PageHeader.tsx
index 9ec5b26f57..e16ee9c22c 100644
--- a/frontend/src/Components/Page/Header/PageHeader.tsx
+++ b/frontend/src/Components/Page/Header/PageHeader.tsx
@@ -16,7 +16,7 @@ interface PageHeaderProps {
   isSmallScreen: boolean;
 }
 
-function PageHeader({ isSmallScreen }: PageHeaderProps) {
+function PageHeader({ isSmallScreen }: Readonly<PageHeaderProps>) {
   const dispatch = useDispatch();
 
   const { isSidebarVisible } = useSelector((state: AppState) => state.app);
diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx
index 0de636f70f..8c6adfee83 100644
--- a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx
+++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx
@@ -16,7 +16,7 @@ interface PageHeaderActionsMenuProps {
   onKeyboardShortcutsPress(): void;
 }
 
-function PageHeaderActionsMenu(props: PageHeaderActionsMenuProps) {
+function PageHeaderActionsMenu(props: Readonly<PageHeaderActionsMenuProps>) {
   const { onKeyboardShortcutsPress } = props;
 
   const dispatch = useDispatch();
diff --git a/frontend/src/Components/Page/Page.tsx b/frontend/src/Components/Page/Page.tsx
index d23b74cef6..ed8a415914 100644
--- a/frontend/src/Components/Page/Page.tsx
+++ b/frontend/src/Components/Page/Page.tsx
@@ -21,7 +21,7 @@ interface PageProps {
   children: React.ReactNode;
 }
 
-function Page({ children }: PageProps) {
+function Page({ children }: Readonly<PageProps>) {
   const dispatch = useDispatch();
   const { hasError, errors, isPopulated, isLocalStorageSupported } =
     useAppPage();
diff --git a/frontend/src/Components/Page/PageContent.tsx b/frontend/src/Components/Page/PageContent.tsx
index 694bbb0381..e046ac86bd 100644
--- a/frontend/src/Components/Page/PageContent.tsx
+++ b/frontend/src/Components/Page/PageContent.tsx
@@ -14,7 +14,7 @@ function PageContent({
   className = styles.content,
   title,
   children,
-}: PageContentProps) {
+}: Readonly<PageContentProps>) {
   return (
     <ErrorBoundary errorComponent={PageContentError}>
       <DocumentTitle
diff --git a/frontend/src/Components/Page/PageContentError.tsx b/frontend/src/Components/Page/PageContentError.tsx
index fe675abe6e..1eb908a4e8 100644
--- a/frontend/src/Components/Page/PageContentError.tsx
+++ b/frontend/src/Components/Page/PageContentError.tsx
@@ -6,7 +6,7 @@ import translate from 'Utilities/String/translate';
 import PageContentBody from './PageContentBody';
 import styles from './PageContentError.css';
 
-function PageContentError(props: ErrorBoundaryErrorProps) {
+function PageContentError(props: Readonly<ErrorBoundaryErrorProps>) {
   return (
     <div className={styles.content}>
       <PageContentBody>
diff --git a/frontend/src/Components/Page/PageContentFooter.tsx b/frontend/src/Components/Page/PageContentFooter.tsx
index bc44aa7a61..2d86f74499 100644
--- a/frontend/src/Components/Page/PageContentFooter.tsx
+++ b/frontend/src/Components/Page/PageContentFooter.tsx
@@ -9,7 +9,7 @@ interface PageContentFooterProps {
 function PageContentFooter({
   className = styles.contentFooter,
   children,
-}: PageContentFooterProps) {
+}: Readonly<PageContentFooterProps>) {
   return <div className={className}>{children}</div>;
 }
 
diff --git a/frontend/src/Components/Page/PageJumpBar.tsx b/frontend/src/Components/Page/PageJumpBar.tsx
index ff6a149846..971b9686a3 100644
--- a/frontend/src/Components/Page/PageJumpBar.tsx
+++ b/frontend/src/Components/Page/PageJumpBar.tsx
@@ -4,7 +4,7 @@ import dimensions from 'Styles/Variables/dimensions';
 import PageJumpBarItem, { PageJumpBarItemProps } from './PageJumpBarItem';
 import styles from './PageJumpBar.css';
 
-const ITEM_HEIGHT = parseInt(dimensions.jumpBarItemHeight);
+const ITEM_HEIGHT = Number.parseInt(dimensions.jumpBarItemHeight);
 
 export interface PageJumpBarItems {
   characters: Record<string, number>;
@@ -21,7 +21,7 @@ function PageJumpBar({
   items,
   minimumItems = 5,
   onItemPress,
-}: PageJumpBarProps) {
+}: Readonly<PageJumpBarProps>) {
   const [jumpBarRef, { height }] = useMeasure();
 
   const visibleItems = useMemo(() => {
diff --git a/frontend/src/Components/Page/PageJumpBarItem.tsx b/frontend/src/Components/Page/PageJumpBarItem.tsx
index 76389066d9..af7c4663f9 100644
--- a/frontend/src/Components/Page/PageJumpBarItem.tsx
+++ b/frontend/src/Components/Page/PageJumpBarItem.tsx
@@ -7,7 +7,7 @@ export interface PageJumpBarItemProps {
   onItemPress: (label: string) => void;
 }
 
-function PageJumpBarItem({ label, onItemPress }: PageJumpBarItemProps) {
+function PageJumpBarItem({ label, onItemPress }: Readonly<PageJumpBarItemProps>) {
   const handlePress = useCallback(() => {
     onItemPress(label);
   }, [label, onItemPress]);
diff --git a/frontend/src/Components/Page/PageSectionContent.tsx b/frontend/src/Components/Page/PageSectionContent.tsx
index f3470fe7e3..7ca6c7fd73 100644
--- a/frontend/src/Components/Page/PageSectionContent.tsx
+++ b/frontend/src/Components/Page/PageSectionContent.tsx
@@ -18,7 +18,7 @@ function PageSectionContent({
   error,
   errorMessage,
   children,
-}: PageSectionContentProps) {
+}: Readonly<PageSectionContentProps>) {
   if (isFetching && !isPopulated) {
     return <LoadingIndicator />;
   }
diff --git a/frontend/src/Components/Page/Sidebar/Messages/Message.tsx b/frontend/src/Components/Page/Sidebar/Messages/Message.tsx
index f2a1cc7e07..2da958c066 100644
--- a/frontend/src/Components/Page/Sidebar/Messages/Message.tsx
+++ b/frontend/src/Components/Page/Sidebar/Messages/Message.tsx
@@ -15,7 +15,7 @@ interface MessageProps {
   type: Extract<MessageType, keyof typeof styles>;
 }
 
-function Message({ id, hideAfter, name, message, type }: MessageProps) {
+function Message({ id, hideAfter, name, message, type }: Readonly<MessageProps>) {
   const dispatch = useDispatch();
   const dismissTimeout = useRef<ReturnType<typeof setTimeout>>();
 
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.tsx b/frontend/src/Components/Page/Sidebar/PageSidebar.tsx
index f64473c31a..bd9acd383a 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.tsx
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.tsx
@@ -23,8 +23,8 @@ import Messages from './Messages/Messages';
 import PageSidebarItem from './PageSidebarItem';
 import styles from './PageSidebar.css';
 
-const HEADER_HEIGHT = parseInt(dimensions.headerHeight);
-const SIDEBAR_WIDTH = parseInt(dimensions.sidebarWidth);
+const HEADER_HEIGHT = Number.parseInt(dimensions.headerHeight);
+const SIDEBAR_WIDTH = Number.parseInt(dimensions.sidebarWidth);
 
 interface SidebarItem {
   iconName?: IconName;
@@ -219,7 +219,7 @@ interface PageSidebarProps {
   isSidebarVisible: boolean;
 }
 
-function PageSidebar({ isSidebarVisible, isSmallScreen }: PageSidebarProps) {
+function PageSidebar({ isSidebarVisible, isSmallScreen }: Readonly<PageSidebarProps>) {
   const dispatch = useDispatch();
   const location = useLocation();
   const sidebarRef = useRef(null);
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarItem.tsx b/frontend/src/Components/Page/Sidebar/PageSidebarItem.tsx
index 37d9bafa0b..4ef1f418d8 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebarItem.tsx
+++ b/frontend/src/Components/Page/Sidebar/PageSidebarItem.tsx
@@ -28,7 +28,7 @@ function PageSidebarItem({
   statusComponent: StatusComponent,
   children,
   onPress,
-}: PageSidebarItemProps) {
+}: Readonly<PageSidebarItemProps>) {
   const handlePress = useCallback(() => {
     if (isChildItem || !isParentItem) {
       onPress?.();
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarStatus.tsx b/frontend/src/Components/Page/Sidebar/PageSidebarStatus.tsx
index 02e1d221c7..ebcfa56af3 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebarStatus.tsx
+++ b/frontend/src/Components/Page/Sidebar/PageSidebarStatus.tsx
@@ -12,7 +12,7 @@ function PageSidebarStatus({
   count,
   errors,
   warnings,
-}: PageSidebarStatusProps) {
+}: Readonly<PageSidebarStatusProps>) {
   if (!count) {
     return null;
   }
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbar.tsx b/frontend/src/Components/Page/Toolbar/PageToolbar.tsx
index c465a3a797..29e1e59702 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbar.tsx
+++ b/frontend/src/Components/Page/Toolbar/PageToolbar.tsx
@@ -9,7 +9,7 @@ interface PageToolbarProps {
 function PageToolbar({
   className = styles.toolbar,
   children,
-}: PageToolbarProps) {
+}: Readonly<PageToolbarProps>) {
   return <div className={className}>{children}</div>;
 }
 
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarButton.tsx b/frontend/src/Components/Page/Toolbar/PageToolbarButton.tsx
index 5e7fb8cac5..381f4491c4 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarButton.tsx
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarButton.tsx
@@ -23,7 +23,7 @@ function PageToolbarButton({
   isSpinning = false,
   overflowComponent,
   ...otherProps
-}: PageToolbarButtonProps) {
+}: Readonly<PageToolbarButtonProps>) {
   return (
     <Link
       className={classNames(
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarOverflowMenuItem.tsx b/frontend/src/Components/Page/Toolbar/PageToolbarOverflowMenuItem.tsx
index dad52ee191..dfd32c553a 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarOverflowMenuItem.tsx
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarOverflowMenuItem.tsx
@@ -15,7 +15,7 @@ interface PageToolbarOverflowMenuItemProps {
   onPress?: (event: SyntheticEvent<Element, Event>) => void;
 }
 
-function PageToolbarOverflowMenuItem(props: PageToolbarOverflowMenuItemProps) {
+function PageToolbarOverflowMenuItem(props: Readonly<PageToolbarOverflowMenuItemProps>) {
   const {
     iconName,
     spinningName,
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarSection.tsx b/frontend/src/Components/Page/Toolbar/PageToolbarSection.tsx
index 9fec4d0330..be3878998a 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarSection.tsx
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarSection.tsx
@@ -12,8 +12,8 @@ import { PageToolbarButtonProps } from './PageToolbarButton';
 import PageToolbarOverflowMenuItem from './PageToolbarOverflowMenuItem';
 import styles from './PageToolbarSection.css';
 
-const BUTTON_WIDTH = parseInt(dimensions.toolbarButtonWidth);
-const SEPARATOR_MARGIN = parseInt(dimensions.toolbarSeparatorMargin);
+const BUTTON_WIDTH = Number.parseInt(dimensions.toolbarButtonWidth);
+const SEPARATOR_MARGIN = Number.parseInt(dimensions.toolbarSeparatorMargin);
 const SEPARATOR_WIDTH = 2 * SEPARATOR_MARGIN + 1;
 
 export interface PageToolbarSectionProps {
@@ -28,7 +28,7 @@ function PageToolbarSection({
   children,
   alignContent = 'left',
   collapseButtons = true,
-}: PageToolbarSectionProps) {
+}: Readonly<PageToolbarSectionProps>) {
   const [sectionRef, { width }] = useMeasure();
   const isMeasured = width > 0;
 
diff --git a/frontend/src/Components/Portal.tsx b/frontend/src/Components/Portal.tsx
index 1cc1c7da6f..8e92da3522 100644
--- a/frontend/src/Components/Portal.tsx
+++ b/frontend/src/Components/Portal.tsx
@@ -7,7 +7,7 @@ interface PortalProps {
 
 const defaultTarget = document.getElementById('portal-root');
 
-function Portal(props: PortalProps) {
+function Portal(props: Readonly<PortalProps>) {
   const { children, target = defaultTarget } = props;
 
   if (!target) {
diff --git a/frontend/src/Components/ProgressBar.tsx b/frontend/src/Components/ProgressBar.tsx
index 07b20d8a4f..01d064e7f5 100644
--- a/frontend/src/Components/ProgressBar.tsx
+++ b/frontend/src/Components/ProgressBar.tsx
@@ -30,7 +30,7 @@ function ProgressBar({
   kind = 'primary',
   size = 'medium',
   width,
-}: ProgressBarProps) {
+}: Readonly<ProgressBarProps>) {
   const progressPercent = `${progress.toFixed(precision)}%`;
   const progressText = text || progressPercent;
   const actualWidth = width ? `${width}px` : '100%';
diff --git a/frontend/src/Components/RottenTomatoRating.tsx b/frontend/src/Components/RottenTomatoRating.tsx
index 83af2959b6..375a702c5e 100644
--- a/frontend/src/Components/RottenTomatoRating.tsx
+++ b/frontend/src/Components/RottenTomatoRating.tsx
@@ -9,7 +9,7 @@ interface RottenTomatoRatingProps {
   hideIcon?: boolean;
 }
 
-function RottenTomatoRating(props: RottenTomatoRatingProps) {
+function RottenTomatoRating(props: Readonly<RottenTomatoRatingProps>) {
   const { ratings, iconSize = 14, hideIcon = false } = props;
 
   const rtRotten =
diff --git a/frontend/src/Components/Router/Switch.tsx b/frontend/src/Components/Router/Switch.tsx
index 0324716816..10f615c99d 100644
--- a/frontend/src/Components/Router/Switch.tsx
+++ b/frontend/src/Components/Router/Switch.tsx
@@ -11,7 +11,7 @@ interface SwitchProps {
   children: ReactNode;
 }
 
-function Switch({ children }: SwitchProps) {
+function Switch({ children }: Readonly<SwitchProps>) {
   return (
     <RouterSwitch>
       {Children.map(children, (child) => {
diff --git a/frontend/src/Components/Scroller/OverlayScroller.tsx b/frontend/src/Components/Scroller/OverlayScroller.tsx
index 3fd10a4e6a..61c5928552 100644
--- a/frontend/src/Components/Scroller/OverlayScroller.tsx
+++ b/frontend/src/Components/Scroller/OverlayScroller.tsx
@@ -22,7 +22,7 @@ interface ScrollbarTrackProps {
   props: ComponentPropsWithoutRef<'div'>;
 }
 
-function OverlayScroller(props: OverlayScrollerProps) {
+function OverlayScroller(props: Readonly<OverlayScrollerProps>) {
   const {
     autoHide = false,
     autoScroll = true,
@@ -62,7 +62,7 @@ function OverlayScroller(props: OverlayScrollerProps) {
   );
 
   const renderTrackHorizontal = useCallback(
-    ({ style, props: trackProps }: ScrollbarTrackProps) => {
+    ({ style, props: trackProps }: Readonly<ScrollbarTrackProps>) => {
       const finalStyle = {
         ...style,
         right: 2,
@@ -80,7 +80,7 @@ function OverlayScroller(props: OverlayScrollerProps) {
   );
 
   const renderTrackVertical = useCallback(
-    ({ style, props: trackProps }: ScrollbarTrackProps) => {
+    ({ style, props: trackProps }: Readonly<ScrollbarTrackProps>) => {
       const finalStyle = {
         ...style,
         right: 2,
diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index 81c2f453f0..aa563ca073 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -261,8 +261,6 @@ class SignalRConnector extends Component {
     const action = body.action;
     const section = 'movieCollections';
 
-    console.log(body);
-
     if (action === 'updated') {
       this.props.dispatchUpdateItem({ section, ...body.resource });
     } else if (action === 'deleted') {
diff --git a/frontend/src/Components/SpinnerIcon.tsx b/frontend/src/Components/SpinnerIcon.tsx
index dfb7b4b5a4..0158666fc3 100644
--- a/frontend/src/Components/SpinnerIcon.tsx
+++ b/frontend/src/Components/SpinnerIcon.tsx
@@ -12,7 +12,7 @@ export default function SpinnerIcon({
   spinningName = icons.SPINNER,
   isSpinning,
   ...otherProps
-}: SpinnerIconProps) {
+}: Readonly<SpinnerIconProps>) {
   return (
     <Icon
       name={(isSpinning && spinningName) || name}
diff --git a/frontend/src/Components/Table/Cells/RelativeDateCell.tsx b/frontend/src/Components/Table/Cells/RelativeDateCell.tsx
index 4f4d94596e..f3b176728b 100644
--- a/frontend/src/Components/Table/Cells/RelativeDateCell.tsx
+++ b/frontend/src/Components/Table/Cells/RelativeDateCell.tsx
@@ -15,7 +15,7 @@ interface RelativeDateCellProps {
   component?: React.ElementType;
 }
 
-function RelativeDateCell(props: RelativeDateCellProps) {
+function RelativeDateCell(props: Readonly<RelativeDateCellProps>) {
   const {
     className = styles.cell,
     date,
diff --git a/frontend/src/Components/Table/Cells/TableRowCell.tsx b/frontend/src/Components/Table/Cells/TableRowCell.tsx
index aed6932223..8c83633c1a 100644
--- a/frontend/src/Components/Table/Cells/TableRowCell.tsx
+++ b/frontend/src/Components/Table/Cells/TableRowCell.tsx
@@ -6,6 +6,6 @@ export type TableRowCellProps = ComponentPropsWithoutRef<'td'>;
 export default function TableRowCell({
   className = styles.cell,
   ...tdProps
-}: TableRowCellProps) {
+}: Readonly<TableRowCellProps>) {
   return <td className={className} {...tdProps} />;
 }
diff --git a/frontend/src/Components/Table/Cells/TableRowCellButton.tsx b/frontend/src/Components/Table/Cells/TableRowCellButton.tsx
index c80a3d626f..2d7fc1ac82 100644
--- a/frontend/src/Components/Table/Cells/TableRowCellButton.tsx
+++ b/frontend/src/Components/Table/Cells/TableRowCellButton.tsx
@@ -8,7 +8,7 @@ interface TableRowCellButtonProps extends LinkProps {
   children: ReactNode;
 }
 
-function TableRowCellButton(props: TableRowCellButtonProps) {
+function TableRowCellButton(props: Readonly<TableRowCellButtonProps>) {
   const { className = styles.cell, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Components/Table/Cells/TableSelectCell.tsx b/frontend/src/Components/Table/Cells/TableSelectCell.tsx
index 1f9e4b2000..eb79f555f4 100644
--- a/frontend/src/Components/Table/Cells/TableSelectCell.tsx
+++ b/frontend/src/Components/Table/Cells/TableSelectCell.tsx
@@ -18,7 +18,7 @@ function TableSelectCell({
   isSelected = false,
   onSelectedChange,
   ...otherProps
-}: TableSelectCellProps) {
+}: Readonly<TableSelectCellProps>) {
   const initialIsSelected = useRef(isSelected);
   const handleSelectedChange = useRef(onSelectedChange);
 
diff --git a/frontend/src/Components/Table/Cells/VirtualTableRowCell.tsx b/frontend/src/Components/Table/Cells/VirtualTableRowCell.tsx
index 6a3307c2aa..f7e1cdfa7a 100644
--- a/frontend/src/Components/Table/Cells/VirtualTableRowCell.tsx
+++ b/frontend/src/Components/Table/Cells/VirtualTableRowCell.tsx
@@ -9,7 +9,7 @@ export interface VirtualTableRowCellProps {
 function VirtualTableRowCell({
   className = styles.cell,
   children,
-}: VirtualTableRowCellProps) {
+}: Readonly<VirtualTableRowCellProps>) {
   return <div className={className}>{children}</div>;
 }
 
diff --git a/frontend/src/Components/Table/Cells/VirtualTableSelectCell.tsx b/frontend/src/Components/Table/Cells/VirtualTableSelectCell.tsx
index 73cb7e523d..e75b3dc6f0 100644
--- a/frontend/src/Components/Table/Cells/VirtualTableSelectCell.tsx
+++ b/frontend/src/Components/Table/Cells/VirtualTableSelectCell.tsx
@@ -22,7 +22,7 @@ function VirtualTableSelectCell({
   isDisabled,
   onSelectedChange,
   ...otherProps
-}: VirtualTableSelectCellProps) {
+}: Readonly<VirtualTableSelectCellProps>) {
   const handleChange = useCallback(
     ({ value, shiftKey }: CheckInputChanged) => {
       onSelectedChange({ id, value, shiftKey });
diff --git a/frontend/src/Components/Table/Table.tsx b/frontend/src/Components/Table/Table.tsx
index c72b68b96a..096c49e2cd 100644
--- a/frontend/src/Components/Table/Table.tsx
+++ b/frontend/src/Components/Table/Table.tsx
@@ -47,7 +47,7 @@ function Table({
   onSortPress,
   onTableOptionChange,
   onSelectAllChange,
-}: TableProps) {
+}: Readonly<TableProps>) {
   return (
     <Scroller
       className={classNames(
diff --git a/frontend/src/Components/Table/TableBody.tsx b/frontend/src/Components/Table/TableBody.tsx
index 3bd267d5d6..66504a32a2 100644
--- a/frontend/src/Components/Table/TableBody.tsx
+++ b/frontend/src/Components/Table/TableBody.tsx
@@ -4,7 +4,7 @@ interface TableBodyProps {
   children?: React.ReactNode;
 }
 
-function TableBody({ children }: TableBodyProps) {
+function TableBody({ children }: Readonly<TableBodyProps>) {
   return <tbody>{children}</tbody>;
 }
 
diff --git a/frontend/src/Components/Table/TableHeader.tsx b/frontend/src/Components/Table/TableHeader.tsx
index ad00b1d606..6883bd4008 100644
--- a/frontend/src/Components/Table/TableHeader.tsx
+++ b/frontend/src/Components/Table/TableHeader.tsx
@@ -4,7 +4,7 @@ interface TableHeaderProps {
   children?: React.ReactNode;
 }
 
-function TableHeader({ children }: TableHeaderProps) {
+function TableHeader({ children }: Readonly<TableHeaderProps>) {
   return (
     <thead>
       <tr>{children}</tr>
diff --git a/frontend/src/Components/Table/TableHeaderCell.tsx b/frontend/src/Components/Table/TableHeaderCell.tsx
index 13b8cf0f7e..e2a2c919c1 100644
--- a/frontend/src/Components/Table/TableHeaderCell.tsx
+++ b/frontend/src/Components/Table/TableHeaderCell.tsx
@@ -34,7 +34,7 @@ function TableHeaderCell({
   children,
   onSortPress,
   ...otherProps
-}: TableHeaderCellProps) {
+}: Readonly<TableHeaderCellProps>) {
   const isSorting = isSortable && sortKey === name;
   const sortIcon =
     sortDirection === sortDirections.ASCENDING
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
index f308220222..823b25f2e5 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragPreview.js
@@ -7,10 +7,10 @@ import dimensions from 'Styles/Variables/dimensions.js';
 import TableOptionsColumn from './TableOptionsColumn';
 import styles from './TableOptionsColumnDragPreview.css';
 
-const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
-const formLabelLargeWidth = parseInt(dimensions.formLabelLargeWidth);
-const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
-const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
+const formGroupSmallWidth = Number.parseInt(dimensions.formGroupSmallWidth);
+const formLabelLargeWidth = Number.parseInt(dimensions.formLabelLargeWidth);
+const formLabelRightMarginWidth = Number.parseInt(dimensions.formLabelRightMarginWidth);
+const dragHandleWidth = Number.parseInt(dimensions.dragHandleWidth);
 
 function collectDragLayer(monitor) {
   return {
diff --git a/frontend/src/Components/Table/TablePager.tsx b/frontend/src/Components/Table/TablePager.tsx
index d21833de16..fbb8d835c3 100644
--- a/frontend/src/Components/Table/TablePager.tsx
+++ b/frontend/src/Components/Table/TablePager.tsx
@@ -31,7 +31,7 @@ function TablePager({
   onNextPagePress,
   onLastPagePress,
   onPageSelect,
-}: TablePagerProps) {
+}: Readonly<TablePagerProps>) {
   const [isShowingPageSelect, setIsShowingPageSelect] = useState(false);
 
   const isFirstPage = page === 1;
diff --git a/frontend/src/Components/Table/TableRow.tsx b/frontend/src/Components/Table/TableRow.tsx
index 3898da8531..1278f67de9 100644
--- a/frontend/src/Components/Table/TableRow.tsx
+++ b/frontend/src/Components/Table/TableRow.tsx
@@ -12,7 +12,7 @@ function TableRow({
   children,
   overlayContent,
   ...otherProps
-}: TableRowProps) {
+}: Readonly<TableRowProps>) {
   return (
     <tr className={className} {...otherProps}>
       {children}
diff --git a/frontend/src/Components/Table/TableRowButton.tsx b/frontend/src/Components/Table/TableRowButton.tsx
index 15aeac2a8e..f483def884 100644
--- a/frontend/src/Components/Table/TableRowButton.tsx
+++ b/frontend/src/Components/Table/TableRowButton.tsx
@@ -3,7 +3,7 @@ import Link, { LinkProps } from 'Components/Link/Link';
 import TableRow from './TableRow';
 import styles from './TableRowButton.css';
 
-function TableRowButton(props: LinkProps) {
+function TableRowButton(props: Readonly<LinkProps>) {
   return <Link className={styles.row} component={TableRow} {...props} />;
 }
 
diff --git a/frontend/src/Components/Table/TableSelectAllHeaderCell.tsx b/frontend/src/Components/Table/TableSelectAllHeaderCell.tsx
index 418d3adceb..0cfe4df614 100644
--- a/frontend/src/Components/Table/TableSelectAllHeaderCell.tsx
+++ b/frontend/src/Components/Table/TableSelectAllHeaderCell.tsx
@@ -14,7 +14,7 @@ function TableSelectAllHeaderCell({
   allSelected,
   allUnselected,
   onSelectAllChange,
-}: TableSelectAllHeaderCellProps) {
+}: Readonly<TableSelectAllHeaderCellProps>) {
   const value = useMemo(() => {
     if (allSelected) {
       return true;
diff --git a/frontend/src/Components/Table/VirtualTableHeader.tsx b/frontend/src/Components/Table/VirtualTableHeader.tsx
index 5e9db83dc7..715fe4e955 100644
--- a/frontend/src/Components/Table/VirtualTableHeader.tsx
+++ b/frontend/src/Components/Table/VirtualTableHeader.tsx
@@ -5,7 +5,7 @@ interface VirtualTableHeaderProps {
   children?: React.ReactNode;
 }
 
-function VirtualTableHeader({ children }: VirtualTableHeaderProps) {
+function VirtualTableHeader({ children }: Readonly<VirtualTableHeaderProps>) {
   return <div className={styles.header}>{children}</div>;
 }
 
diff --git a/frontend/src/Components/Table/VirtualTableHeaderCell.tsx b/frontend/src/Components/Table/VirtualTableHeaderCell.tsx
index fdaa53612e..76f2d27ae2 100644
--- a/frontend/src/Components/Table/VirtualTableHeaderCell.tsx
+++ b/frontend/src/Components/Table/VirtualTableHeaderCell.tsx
@@ -26,7 +26,7 @@ function VirtualTableHeaderCell({
   children,
   onSortPress,
   ...otherProps
-}: VirtualTableHeaderCellProps) {
+}: Readonly<VirtualTableHeaderCellProps>) {
   const isSorting = isSortable && sortKey === name;
   const sortIcon =
     sortDirection === sortDirections.ASCENDING
diff --git a/frontend/src/Components/Table/VirtualTableRow.tsx b/frontend/src/Components/Table/VirtualTableRow.tsx
index dcdb3da4f6..a213c08552 100644
--- a/frontend/src/Components/Table/VirtualTableRow.tsx
+++ b/frontend/src/Components/Table/VirtualTableRow.tsx
@@ -12,7 +12,7 @@ function VirtualTableRow({
   children,
   style,
   ...otherProps
-}: VirtualTableRowProps) {
+}: Readonly<VirtualTableRowProps>) {
   return (
     <div className={className} style={style} {...otherProps}>
       {children}
diff --git a/frontend/src/Components/Table/VirtualTableRowButton.tsx b/frontend/src/Components/Table/VirtualTableRowButton.tsx
index 6dde9dc41f..8b669fc633 100644
--- a/frontend/src/Components/Table/VirtualTableRowButton.tsx
+++ b/frontend/src/Components/Table/VirtualTableRowButton.tsx
@@ -3,7 +3,7 @@ import Link, { LinkProps } from 'Components/Link/Link';
 import VirtualTableRow from './VirtualTableRow';
 import styles from './VirtualTableRowButton.css';
 
-function VirtualTableRowButton(props: LinkProps) {
+function VirtualTableRowButton(props: Readonly<LinkProps>) {
   return <Link className={styles.row} component={VirtualTableRow} {...props} />;
 }
 
diff --git a/frontend/src/Components/Table/VirtualTableSelectAllHeaderCell.tsx b/frontend/src/Components/Table/VirtualTableSelectAllHeaderCell.tsx
index be91ef58fb..b13e96a4ef 100644
--- a/frontend/src/Components/Table/VirtualTableSelectAllHeaderCell.tsx
+++ b/frontend/src/Components/Table/VirtualTableSelectAllHeaderCell.tsx
@@ -14,7 +14,7 @@ function VirtualTableSelectAllHeaderCell({
   allSelected,
   allUnselected,
   onSelectAllChange,
-}: VirtualTableSelectAllHeaderCellProps) {
+}: Readonly<VirtualTableSelectAllHeaderCellProps>) {
   const value = useMemo(() => {
     if (allSelected) {
       return true;
diff --git a/frontend/src/Components/TagList.tsx b/frontend/src/Components/TagList.tsx
index 9f04d01a8f..d940bc88c6 100644
--- a/frontend/src/Components/TagList.tsx
+++ b/frontend/src/Components/TagList.tsx
@@ -10,7 +10,7 @@ interface TagListProps {
   tagList: Tag[];
 }
 
-function TagList({ tags, tagList }: TagListProps) {
+function TagList({ tags, tagList }: Readonly<TagListProps>) {
   const sortedTags = tags
     .map((tagId) => tagList.find((tag) => tag.id === tagId))
     .filter((tag) => !!tag)
diff --git a/frontend/src/Components/TmdbRating.tsx b/frontend/src/Components/TmdbRating.tsx
index b70298582b..90bdd1fb92 100644
--- a/frontend/src/Components/TmdbRating.tsx
+++ b/frontend/src/Components/TmdbRating.tsx
@@ -11,7 +11,7 @@ interface TmdbRatingProps {
   hideIcon?: boolean;
 }
 
-function TmdbRating(props: TmdbRatingProps) {
+function TmdbRating(props: Readonly<TmdbRatingProps>) {
   const { ratings, iconSize = 14, hideIcon = false } = props;
 
   const tmdbImage =
diff --git a/frontend/src/Components/Tooltip/Popover.tsx b/frontend/src/Components/Tooltip/Popover.tsx
index 4c6781343f..d5ec0dfed1 100644
--- a/frontend/src/Components/Tooltip/Popover.tsx
+++ b/frontend/src/Components/Tooltip/Popover.tsx
@@ -7,7 +7,7 @@ interface PopoverProps extends Omit<TooltipProps, 'tooltip' | 'bodyClassName'> {
   body: React.ReactNode;
 }
 
-function Popover({ title, body, ...otherProps }: PopoverProps) {
+function Popover({ title, body, ...otherProps }: Readonly<PopoverProps>) {
   return (
     <Tooltip
       {...otherProps}
diff --git a/frontend/src/Components/Tooltip/Tooltip.tsx b/frontend/src/Components/Tooltip/Tooltip.tsx
index 43150c755e..8d8a39bb78 100644
--- a/frontend/src/Components/Tooltip/Tooltip.tsx
+++ b/frontend/src/Components/Tooltip/Tooltip.tsx
@@ -23,7 +23,7 @@ export interface TooltipProps {
   position?: (typeof tooltipPositions.all)[number];
   canFlip?: boolean;
 }
-function Tooltip(props: TooltipProps) {
+function Tooltip(props: Readonly<TooltipProps>) {
   const {
     className,
     bodyClassName = styles.body,
@@ -84,11 +84,11 @@ function Tooltip(props: TooltipProps) {
   const maxWidth = useMemo(() => {
     const windowWidth = window.innerWidth;
 
-    if (windowWidth >= parseInt(dimensions.breakpointLarge)) {
+    if (windowWidth >= Number.parseInt(dimensions.breakpointLarge)) {
       return 800;
-    } else if (windowWidth >= parseInt(dimensions.breakpointMedium)) {
+    } else if (windowWidth >= Number.parseInt(dimensions.breakpointMedium)) {
       return 650;
-    } else if (windowWidth >= parseInt(dimensions.breakpointSmall)) {
+    } else if (windowWidth >= Number.parseInt(dimensions.breakpointSmall)) {
       return 500;
     }
 
diff --git a/frontend/src/Components/TraktRating.tsx b/frontend/src/Components/TraktRating.tsx
index 83ca1e0edd..2a4059f7f4 100644
--- a/frontend/src/Components/TraktRating.tsx
+++ b/frontend/src/Components/TraktRating.tsx
@@ -11,7 +11,7 @@ interface TraktRatingProps {
   hideIcon?: boolean;
 }
 
-function TraktRating(props: TraktRatingProps) {
+function TraktRating(props: Readonly<TraktRatingProps>) {
   const { ratings, iconSize = 14, hideIcon = false } = props;
 
   const traktImage =
diff --git a/frontend/src/Components/withScrollPosition.tsx b/frontend/src/Components/withScrollPosition.tsx
index f688a6253d..9da215ee68 100644
--- a/frontend/src/Components/withScrollPosition.tsx
+++ b/frontend/src/Components/withScrollPosition.tsx
@@ -16,7 +16,7 @@ function withScrollPosition(
   WrappedComponent: React.FC<WrappedComponentProps>,
   scrollPositionKey: string
 ) {
-  function ScrollPosition(props: ScrollPositionProps) {
+  function ScrollPosition(props: Readonly<ScrollPositionProps>) {
     const { history } = props;
 
     const initialScrollTop =
diff --git a/frontend/src/DiscoverMovie/DiscoverMovie.js b/frontend/src/DiscoverMovie/DiscoverMovie.js
index cd8bfc230a..2dab093070 100644
--- a/frontend/src/DiscoverMovie/DiscoverMovie.js
+++ b/frontend/src/DiscoverMovie/DiscoverMovie.js
@@ -162,7 +162,7 @@ class DiscoverMovie extends Component {
     const characters = _.reduce(items, (acc, item) => {
       let char = item.sortTitle.charAt(0);
 
-      if (!isNaN(char)) {
+      if (!Number.isNaN(char)) {
         char = '#';
       }
 
diff --git a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js
index 442a1f26e9..8b6555e008 100644
--- a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js
+++ b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js
@@ -19,10 +19,10 @@ import translate from 'Utilities/String/translate';
 import DiscoverMovieOverviewInfo from './DiscoverMovieOverviewInfo';
 import styles from './DiscoverMovieOverview.css';
 
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
-const defaultFontSize = parseInt(fonts.defaultFontSize);
-const lineHeight = parseFloat(fonts.lineHeight);
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
+const defaultFontSize = Number.parseInt(fonts.defaultFontSize);
+const lineHeight = Number.parseFloat(fonts.lineHeight);
 
 // Hardcoded height beased on line-height of 32 + bottom margin of 10. 19 + 5 for List Row
 // Less side-effecty than using react-measure.
diff --git a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js
index 0117cf94ef..f9630e351f 100644
--- a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js
+++ b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js
@@ -7,7 +7,7 @@ import translate from 'Utilities/String/translate';
 import DiscoverMovieOverviewInfoRow from './DiscoverMovieOverviewInfoRow';
 import styles from './DiscoverMovieOverviewInfo.css';
 
-const infoRowHeight = parseInt(dimensions.movieIndexOverviewInfoRowHeight);
+const infoRowHeight = Number.parseInt(dimensions.movieIndexOverviewInfoRowHeight);
 
 const rows = [
   {
diff --git a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviews.js b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviews.js
index 10ff397630..043c3e785e 100644
--- a/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviews.js
+++ b/frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviews.js
@@ -10,8 +10,8 @@ import DiscoverMovieOverviewConnector from './DiscoverMovieOverviewConnector';
 import styles from './DiscoverMovieOverviews.css';
 
 // Poster container dimensions
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
 
 function calculatePosterWidth(posterSize, isSmallScreen) {
   const maximumPosterWidth = isSmallScreen ? 152 : 162;
diff --git a/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosters.js b/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosters.js
index 20eaab27f0..5649c82f48 100644
--- a/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosters.js
+++ b/frontend/src/DiscoverMovie/Posters/DiscoverMoviePosters.js
@@ -10,10 +10,10 @@ import DiscoverMoviePosterConnector from './DiscoverMoviePosterConnector';
 import styles from './DiscoverMoviePosters.css';
 
 // Poster container dimensions
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
-const progressBarHeight = parseInt(dimensions.progressBarSmallHeight);
-const detailedProgressBarHeight = parseInt(dimensions.progressBarMediumHeight);
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
+const progressBarHeight = Number.parseInt(dimensions.progressBarSmallHeight);
+const detailedProgressBarHeight = Number.parseInt(dimensions.progressBarMediumHeight);
 
 const additionalColumnCount = {
   small: 3,
diff --git a/frontend/src/FirstRun/AuthenticationRequiredModal.tsx b/frontend/src/FirstRun/AuthenticationRequiredModal.tsx
index 1b4b519ce7..9c6d879966 100644
--- a/frontend/src/FirstRun/AuthenticationRequiredModal.tsx
+++ b/frontend/src/FirstRun/AuthenticationRequiredModal.tsx
@@ -13,7 +13,7 @@ interface AuthenticationRequiredModalProps {
 
 export default function AuthenticationRequiredModal({
   isOpen,
-}: AuthenticationRequiredModalProps) {
+}: Readonly<AuthenticationRequiredModalProps>) {
   return (
     <Modal
       size={sizes.MEDIUM}
diff --git a/frontend/src/InteractiveImport/Folder/FavoriteFolderRow.tsx b/frontend/src/InteractiveImport/Folder/FavoriteFolderRow.tsx
index e39635623c..a2b7bcc6ac 100644
--- a/frontend/src/InteractiveImport/Folder/FavoriteFolderRow.tsx
+++ b/frontend/src/InteractiveImport/Folder/FavoriteFolderRow.tsx
@@ -13,7 +13,7 @@ interface FavoriteFolderRowProps {
   onPress: (folder: string) => unknown;
 }
 
-function FavoriteFolderRow({ folder, onPress }: FavoriteFolderRowProps) {
+function FavoriteFolderRow({ folder, onPress }: Readonly<FavoriteFolderRowProps>) {
   const dispatch = useDispatch();
 
   const handlePress = useCallback(() => {
diff --git a/frontend/src/InteractiveImport/Folder/RecentFolderRow.tsx b/frontend/src/InteractiveImport/Folder/RecentFolderRow.tsx
index 31d164e1a3..7edc3f0aad 100644
--- a/frontend/src/InteractiveImport/Folder/RecentFolderRow.tsx
+++ b/frontend/src/InteractiveImport/Folder/RecentFolderRow.tsx
@@ -25,7 +25,7 @@ function RecentFolderRow({
   lastUsed,
   isFavorite,
   onPress,
-}: RecentFolderRowProps) {
+}: Readonly<RecentFolderRowProps>) {
   const dispatch = useDispatch();
 
   const handlePress = useCallback(() => {
diff --git a/frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx b/frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx
index 9136554cc7..ceeb769346 100644
--- a/frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx
+++ b/frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx
@@ -10,7 +10,7 @@ interface SelectIndexerFlagsModalProps {
   onModalClose(): void;
 }
 
-function SelectIndexerFlagsModal(props: SelectIndexerFlagsModalProps) {
+function SelectIndexerFlagsModal(props: Readonly<SelectIndexerFlagsModalProps>) {
   const {
     isOpen,
     indexerFlags,
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx
index 3f01418cf9..50ddde9b98 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx
@@ -66,7 +66,7 @@ interface InteractiveImportRowProps {
   onValidRowChange(id: number, isValid: boolean): void;
 }
 
-function InteractiveImportRow(props: InteractiveImportRowProps) {
+function InteractiveImportRow(props: Readonly<InteractiveImportRowProps>) {
   const {
     id,
     allowMovieChange,
diff --git a/frontend/src/InteractiveImport/InteractiveImportModal.tsx b/frontend/src/InteractiveImport/InteractiveImportModal.tsx
index 28f8a823e7..2737708c51 100644
--- a/frontend/src/InteractiveImport/InteractiveImportModal.tsx
+++ b/frontend/src/InteractiveImport/InteractiveImportModal.tsx
@@ -17,7 +17,7 @@ interface InteractiveImportModalProps
   onModalClose(): void;
 }
 
-function InteractiveImportModal(props: InteractiveImportModalProps) {
+function InteractiveImportModal(props: Readonly<InteractiveImportModalProps>) {
   const {
     isOpen,
     folder,
diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModal.tsx b/frontend/src/InteractiveImport/Language/SelectLanguageModal.tsx
index c16cd85555..5cd0fb7b14 100644
--- a/frontend/src/InteractiveImport/Language/SelectLanguageModal.tsx
+++ b/frontend/src/InteractiveImport/Language/SelectLanguageModal.tsx
@@ -12,7 +12,7 @@ interface SelectLanguageModalProps {
   onModalClose(): void;
 }
 
-function SelectLanguageModal(props: SelectLanguageModalProps) {
+function SelectLanguageModal(props: Readonly<SelectLanguageModalProps>) {
   const { isOpen, languageIds, modalTitle, onLanguagesSelect, onModalClose } =
     props;
 
diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.tsx b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.tsx
index a0ae1e4dc3..acf4b153e6 100644
--- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.tsx
+++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.tsx
@@ -45,7 +45,7 @@ function createFilteredLanguagesSelector() {
   });
 }
 
-function SelectLanguageModalContent(props: SelectLanguageModalContentProps) {
+function SelectLanguageModalContent(props: Readonly<SelectLanguageModalContentProps>) {
   const { modalTitle, onLanguagesSelect, onModalClose } = props;
 
   const { isFetching, isPopulated, error, items } = useSelector(
@@ -56,7 +56,7 @@ function SelectLanguageModalContent(props: SelectLanguageModalContentProps) {
 
   const onLanguageChange = useCallback(
     ({ name, value }: { name: string; value: boolean }) => {
-      const changedId = parseInt(name);
+      const changedId = Number.parseInt(name);
 
       let newLanguages = [...languageIds];
 
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModal.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieModal.tsx
index 6090dbfae0..29f84ecd61 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieModal.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieModal.tsx
@@ -10,7 +10,7 @@ interface SelectMovieModalProps {
   onModalClose(): void;
 }
 
-function SelectMovieModal(props: SelectMovieModalProps) {
+function SelectMovieModal(props: Readonly<SelectMovieModalProps>) {
   const { isOpen, modalTitle, onMovieSelect, onModalClose } = props;
 
   return (
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
index ebb9aac133..bbeb955a1b 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx
@@ -51,7 +51,7 @@ const columns = [
   },
 ];
 
-const bodyPadding = parseInt(dimensions.pageContentBodyPadding);
+const bodyPadding = Number.parseInt(dimensions.pageContentBodyPadding);
 
 interface SelectMovieModalContentProps {
   modalTitle: string;
@@ -99,7 +99,7 @@ function Row({ index, style, data }: ListChildComponentProps<RowItemData>) {
   );
 }
 
-function SelectMovieModalContent(props: SelectMovieModalContentProps) {
+function SelectMovieModalContent(props: Readonly<SelectMovieModalContentProps>) {
   const { modalTitle, onMovieSelect, onModalClose } = props;
 
   const listRef = useRef<List<RowItemData>>(null);
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
index f8b8a6a66c..44cdbe8a8b 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieModalTableHeader.tsx
@@ -8,7 +8,7 @@ interface SelectMovieModalTableHeaderProps {
   columns: Column[];
 }
 
-function SelectMovieModalTableHeader(props: SelectMovieModalTableHeaderProps) {
+function SelectMovieModalTableHeader(props: Readonly<SelectMovieModalTableHeaderProps>) {
   const { columns } = props;
 
   return (
diff --git a/frontend/src/InteractiveImport/Movie/SelectMovieRow.tsx b/frontend/src/InteractiveImport/Movie/SelectMovieRow.tsx
index 643262810b..ec38ebc5f8 100644
--- a/frontend/src/InteractiveImport/Movie/SelectMovieRow.tsx
+++ b/frontend/src/InteractiveImport/Movie/SelectMovieRow.tsx
@@ -10,7 +10,7 @@ interface SelectMovieRowProps {
   year: number;
 }
 
-function SelectMovieRow({ title, year, tmdbId, imdbId }: SelectMovieRowProps) {
+function SelectMovieRow({ title, year, tmdbId, imdbId }: Readonly<SelectMovieRowProps>) {
   return (
     <>
       <VirtualTableRowCell className={styles.title}>
diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModal.tsx b/frontend/src/InteractiveImport/Quality/SelectQualityModal.tsx
index 89401142fa..ab5f6ce327 100644
--- a/frontend/src/InteractiveImport/Quality/SelectQualityModal.tsx
+++ b/frontend/src/InteractiveImport/Quality/SelectQualityModal.tsx
@@ -13,7 +13,7 @@ interface SelectQualityModalProps {
   onModalClose(): void;
 }
 
-function SelectQualityModal(props: SelectQualityModalProps) {
+function SelectQualityModal(props: Readonly<SelectQualityModalProps>) {
   const {
     isOpen,
     qualityId,
diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.tsx b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.tsx
index 21882f304b..07445d54b5 100644
--- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.tsx
+++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.tsx
@@ -56,7 +56,7 @@ interface SelectQualityModalContentProps {
   onModalClose(): void;
 }
 
-function SelectQualityModalContent(props: SelectQualityModalContentProps) {
+function SelectQualityModalContent(props: Readonly<SelectQualityModalContentProps>) {
   const { modalTitle, onQualitySelect, onModalClose } = props;
 
   const [qualityId, setQualityId] = useState(props.qualityId);
diff --git a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.tsx b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.tsx
index 175f84fd59..5709830b87 100644
--- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.tsx
+++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.tsx
@@ -10,7 +10,7 @@ interface SelectReleaseGroupModalProps {
   onModalClose(): void;
 }
 
-function SelectReleaseGroupModal(props: SelectReleaseGroupModalProps) {
+function SelectReleaseGroupModal(props: Readonly<SelectReleaseGroupModalProps>) {
   const {
     isOpen,
     releaseGroup,
diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.tsx b/frontend/src/InteractiveSearch/InteractiveSearch.tsx
index 068dc83c07..874c0f4a4f 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearch.tsx
+++ b/frontend/src/InteractiveSearch/InteractiveSearch.tsx
@@ -125,7 +125,7 @@ interface InteractiveSearchProps {
   searchPayload: InteractiveSearchPayload;
 }
 
-function InteractiveSearch({ searchPayload }: InteractiveSearchProps) {
+function InteractiveSearch({ searchPayload }: Readonly<InteractiveSearchProps>) {
   const {
     isFetching,
     isPopulated,
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchFilterModal.tsx b/frontend/src/InteractiveSearch/InteractiveSearchFilterModal.tsx
index 358367074d..98c1edcb8e 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchFilterModal.tsx
+++ b/frontend/src/InteractiveSearch/InteractiveSearchFilterModal.tsx
@@ -29,7 +29,7 @@ interface InteractiveSearchFilterModalProps {
 
 export default function InteractiveSearchFilterModal({
   ...otherProps
-}: InteractiveSearchFilterModalProps) {
+}: Readonly<InteractiveSearchFilterModalProps>) {
   const sectionItems = useSelector(createReleasesSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
 
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.tsx b/frontend/src/InteractiveSearch/InteractiveSearchRow.tsx
index c848b6e32f..f198ad27ae 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.tsx
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.tsx
@@ -110,7 +110,7 @@ interface InteractiveSearchRowProps extends Release {
   onGrabPress(...args: unknown[]): void;
 }
 
-function InteractiveSearchRow(props: InteractiveSearchRowProps) {
+function InteractiveSearchRow(props: Readonly<InteractiveSearchRowProps>) {
   const {
     guid,
     indexerId,
diff --git a/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientModal.tsx b/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientModal.tsx
index 7d623decdd..b22dfa139f 100644
--- a/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientModal.tsx
+++ b/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientModal.tsx
@@ -12,7 +12,7 @@ interface SelectDownloadClientModalProps {
   onModalClose(): void;
 }
 
-function SelectDownloadClientModal(props: SelectDownloadClientModalProps) {
+function SelectDownloadClientModal(props: Readonly<SelectDownloadClientModalProps>) {
   const { isOpen, protocol, modalTitle, onDownloadClientSelect, onModalClose } =
     props;
 
diff --git a/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientRow.tsx b/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientRow.tsx
index 6f98d60b41..1d52f8ae58 100644
--- a/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientRow.tsx
+++ b/frontend/src/InteractiveSearch/OverrideMatch/DownloadClient/SelectDownloadClientRow.tsx
@@ -10,7 +10,7 @@ interface SelectSeasonRowProps {
   onDownloadClientSelect(downloadClientId: number): unknown;
 }
 
-function SelectDownloadClientRow(props: SelectSeasonRowProps) {
+function SelectDownloadClientRow(props: Readonly<SelectSeasonRowProps>) {
   const { id, name, priority, onDownloadClientSelect } = props;
 
   const onSeasonSelectWrapper = useCallback(() => {
diff --git a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchData.tsx b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchData.tsx
index 82d6bd812f..5160e0f700 100644
--- a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchData.tsx
+++ b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchData.tsx
@@ -10,7 +10,7 @@ interface OverrideMatchDataProps {
   onPress: () => void;
 }
 
-function OverrideMatchData(props: OverrideMatchDataProps) {
+function OverrideMatchData(props: Readonly<OverrideMatchDataProps>) {
   const { value, isDisabled = false, isOptional, onPress } = props;
 
   return (
diff --git a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModal.tsx b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModal.tsx
index d296e626ce..43dc8ce926 100644
--- a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModal.tsx
+++ b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModal.tsx
@@ -20,7 +20,7 @@ interface OverrideMatchModalProps {
   onModalClose(): void;
 }
 
-function OverrideMatchModal(props: OverrideMatchModalProps) {
+function OverrideMatchModal(props: Readonly<OverrideMatchModalProps>) {
   const {
     isOpen,
     title,
diff --git a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModalContent.tsx b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModalContent.tsx
index 8f83218563..65a867ec9e 100644
--- a/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModalContent.tsx
+++ b/frontend/src/InteractiveSearch/OverrideMatch/OverrideMatchModalContent.tsx
@@ -47,7 +47,7 @@ interface OverrideMatchModalContentProps {
   onModalClose(): void;
 }
 
-function OverrideMatchModalContent(props: OverrideMatchModalContentProps) {
+function OverrideMatchModalContent(props: Readonly<OverrideMatchModalContentProps>) {
   const modalTitle = translate('ManualGrab');
   const {
     indexerId,
diff --git a/frontend/src/InteractiveSearch/Peers.tsx b/frontend/src/InteractiveSearch/Peers.tsx
index 9c0caca582..6e7d3cf546 100644
--- a/frontend/src/InteractiveSearch/Peers.tsx
+++ b/frontend/src/InteractiveSearch/Peers.tsx
@@ -35,7 +35,7 @@ interface PeersProps {
   leechers?: number;
 }
 
-function Peers(props: PeersProps) {
+function Peers(props: Readonly<PeersProps>) {
   const { seeders, leechers } = props;
 
   const kind = getKind(seeders);
diff --git a/frontend/src/Movie/Delete/DeleteMovieModal.tsx b/frontend/src/Movie/Delete/DeleteMovieModal.tsx
index 6daffefb49..90227bbe13 100644
--- a/frontend/src/Movie/Delete/DeleteMovieModal.tsx
+++ b/frontend/src/Movie/Delete/DeleteMovieModal.tsx
@@ -13,7 +13,7 @@ function DeleteMovieModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: DeleteMovieModalProps) {
+}: Readonly<DeleteMovieModalProps>) {
   return (
     <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={onModalClose}>
       <DeleteMovieModalContent {...otherProps} onModalClose={onModalClose} />
diff --git a/frontend/src/Movie/Delete/DeleteMovieModalContent.tsx b/frontend/src/Movie/Delete/DeleteMovieModalContent.tsx
index bfbddf0551..8425b34d98 100644
--- a/frontend/src/Movie/Delete/DeleteMovieModalContent.tsx
+++ b/frontend/src/Movie/Delete/DeleteMovieModalContent.tsx
@@ -28,7 +28,7 @@ export interface DeleteMovieModalContentProps {
 function DeleteMovieModalContent({
   movieId,
   onModalClose,
-}: DeleteMovieModalContentProps) {
+}: Readonly<DeleteMovieModalContentProps>) {
   const dispatch = useDispatch();
   const {
     title,
diff --git a/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.tsx b/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.tsx
index 9c1d319f9a..982703d11a 100644
--- a/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.tsx
+++ b/frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.tsx
@@ -26,7 +26,7 @@ export interface MovieCastPosterProps
   onImportListSelect(): void;
 }
 
-function MovieCastPoster(props: MovieCastPosterProps) {
+function MovieCastPoster(props: Readonly<MovieCastPosterProps>) {
   const {
     tmdbId,
     personName,
diff --git a/frontend/src/Movie/Details/Credits/Cast/MovieCastPosters.tsx b/frontend/src/Movie/Details/Credits/Cast/MovieCastPosters.tsx
index 73bbd22d66..b69e09e371 100644
--- a/frontend/src/Movie/Details/Credits/Cast/MovieCastPosters.tsx
+++ b/frontend/src/Movie/Details/Credits/Cast/MovieCastPosters.tsx
@@ -8,7 +8,7 @@ interface MovieCastPostersProps {
   isSmallScreen: boolean;
 }
 
-function MovieCastPosters({ isSmallScreen }: MovieCastPostersProps) {
+function MovieCastPosters({ isSmallScreen }: Readonly<MovieCastPostersProps>) {
   const { items: castCredits } = useSelector(
     createMovieCreditsSelector('cast')
   );
diff --git a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.tsx b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.tsx
index 961d48002e..2747dd67c0 100644
--- a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.tsx
+++ b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.tsx
@@ -26,7 +26,7 @@ export interface MovieCrewPosterProps
   onImportListSelect(): void;
 }
 
-function MovieCrewPoster(props: MovieCrewPosterProps) {
+function MovieCrewPoster(props: Readonly<MovieCrewPosterProps>) {
   const {
     tmdbId,
     personName,
diff --git a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPosters.tsx b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPosters.tsx
index 286798c8ab..6576344226 100644
--- a/frontend/src/Movie/Details/Credits/Crew/MovieCrewPosters.tsx
+++ b/frontend/src/Movie/Details/Credits/Crew/MovieCrewPosters.tsx
@@ -8,7 +8,7 @@ interface MovieCrewPostersProps {
   isSmallScreen: boolean;
 }
 
-function MovieCrewPosters({ isSmallScreen }: MovieCrewPostersProps) {
+function MovieCrewPosters({ isSmallScreen }: Readonly<MovieCrewPostersProps>) {
   const { items: crewCredits } = useSelector(
     createMovieCreditsSelector('crew')
   );
diff --git a/frontend/src/Movie/Details/Credits/MovieCreditPoster.tsx b/frontend/src/Movie/Details/Credits/MovieCreditPoster.tsx
index cf763a352f..3d9fd7c475 100644
--- a/frontend/src/Movie/Details/Credits/MovieCreditPoster.tsx
+++ b/frontend/src/Movie/Details/Credits/MovieCreditPoster.tsx
@@ -21,7 +21,7 @@ function MovieCreditPoster({
   tmdbId,
   personName,
   ...otherProps
-}: MovieCreditPosterProps) {
+}: Readonly<MovieCreditPosterProps>) {
   const importList = useSelector(createMovieCreditImportListSelector(tmdbId));
 
   const dispatch = useDispatch();
diff --git a/frontend/src/Movie/Details/Credits/MovieCreditPosters.tsx b/frontend/src/Movie/Details/Credits/MovieCreditPosters.tsx
index 1fe07595b0..058e8177ca 100644
--- a/frontend/src/Movie/Details/Credits/MovieCreditPosters.tsx
+++ b/frontend/src/Movie/Details/Credits/MovieCreditPosters.tsx
@@ -12,8 +12,8 @@ import 'swiper/css';
 import 'swiper/css/navigation';
 
 // Poster container dimensions
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(
   dimensions.movieIndexColumnPaddingSmallScreen
 );
 
@@ -23,7 +23,7 @@ interface MovieCreditPostersProps {
   isSmallScreen: boolean;
 }
 
-function MovieCreditPosters(props: MovieCreditPostersProps) {
+function MovieCreditPosters(props: Readonly<MovieCreditPostersProps>) {
   const { items, itemComponent, isSmallScreen } = props;
 
   const posterWidth = 162;
diff --git a/frontend/src/Movie/Details/MovieDetails.tsx b/frontend/src/Movie/Details/MovieDetails.tsx
index e4aec44d34..9ad1743962 100644
--- a/frontend/src/Movie/Details/MovieDetails.tsx
+++ b/frontend/src/Movie/Details/MovieDetails.tsx
@@ -101,8 +101,8 @@ import MovieTags from './MovieTags';
 import MovieTitlesTable from './Titles/MovieTitlesTable';
 import styles from './MovieDetails.css';
 
-const defaultFontSize = parseInt(fonts.defaultFontSize);
-const lineHeight = parseFloat(fonts.lineHeight);
+const defaultFontSize = Number.parseInt(fonts.defaultFontSize);
+const lineHeight = Number.parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images: Image[]) {
   const image = images.find((image) => image.coverType === 'fanart');
@@ -155,7 +155,7 @@ interface MovieDetailsProps {
   movieId: number;
 }
 
-function MovieDetails({ movieId }: MovieDetailsProps) {
+function MovieDetails({ movieId }: Readonly<MovieDetailsProps>) {
   const dispatch = useDispatch();
   const history = useHistory();
 
@@ -417,12 +417,6 @@ function MovieDetails({ movieId }: MovieDetailsProps) {
     touchStart.current = null;
   }, []);
 
-  const handleTouchMove = useCallback(() => {
-    if (!touchStart.current) {
-      return;
-    }
-  }, []);
-
   const handleKeyUp = useCallback(
     (event: KeyboardEvent) => {
       if (
@@ -495,23 +489,15 @@ function MovieDetails({ movieId }: MovieDetailsProps) {
     window.addEventListener('touchstart', handleTouchStart);
     window.addEventListener('touchend', handleTouchEnd);
     window.addEventListener('touchcancel', handleTouchCancel);
-    window.addEventListener('touchmove', handleTouchMove);
     window.addEventListener('keyup', handleKeyUp);
 
     return () => {
       window.removeEventListener('touchstart', handleTouchStart);
       window.removeEventListener('touchend', handleTouchEnd);
       window.removeEventListener('touchcancel', handleTouchCancel);
-      window.removeEventListener('touchmove', handleTouchMove);
       window.removeEventListener('keyup', handleKeyUp);
     };
-  }, [
-    handleTouchStart,
-    handleTouchEnd,
-    handleTouchCancel,
-    handleTouchMove,
-    handleKeyUp,
-  ]);
+  }, [handleTouchStart, handleTouchEnd, handleTouchCancel, handleKeyUp]);
 
   if (!movie) {
     return null;
diff --git a/frontend/src/Movie/Details/MovieDetailsLinks.tsx b/frontend/src/Movie/Details/MovieDetailsLinks.tsx
index c433789e04..0813569e93 100644
--- a/frontend/src/Movie/Details/MovieDetailsLinks.tsx
+++ b/frontend/src/Movie/Details/MovieDetailsLinks.tsx
@@ -11,7 +11,7 @@ type MovieDetailsLinksProps = Pick<
   'tmdbId' | 'imdbId' | 'youTubeTrailerId'
 >;
 
-function MovieDetailsLinks(props: MovieDetailsLinksProps) {
+function MovieDetailsLinks(props: Readonly<MovieDetailsLinksProps>) {
   const { tmdbId, imdbId, youTubeTrailerId } = props;
 
   return (
diff --git a/frontend/src/Movie/Details/MovieReleaseDates.tsx b/frontend/src/Movie/Details/MovieReleaseDates.tsx
index 0805026ab3..310d89e75d 100644
--- a/frontend/src/Movie/Details/MovieReleaseDates.tsx
+++ b/frontend/src/Movie/Details/MovieReleaseDates.tsx
@@ -20,7 +20,7 @@ function MovieReleaseDates({
   inCinemas,
   digitalRelease,
   physicalRelease,
-}: MovieReleaseDatesProps) {
+}: Readonly<MovieReleaseDatesProps>) {
   const { showRelativeDates, shortDateFormat, longDateFormat, timeFormat } =
     useSelector(createUISettingsSelector());
 
diff --git a/frontend/src/Movie/Details/MovieStatusLabel.tsx b/frontend/src/Movie/Details/MovieStatusLabel.tsx
index 21aa0e78c7..d79ed74ed5 100644
--- a/frontend/src/Movie/Details/MovieStatusLabel.tsx
+++ b/frontend/src/Movie/Details/MovieStatusLabel.tsx
@@ -67,7 +67,7 @@ function MovieStatusLabel({
   hasMovieFiles,
   status,
   useLabel = false,
-}: MovieStatusLabelProps) {
+}: Readonly<MovieStatusLabelProps>) {
   const queueItem = useSelector(createQueueItemSelectorForHook(movieId));
 
   let movieStatus = getMovieStatus(
diff --git a/frontend/src/Movie/Details/MovieTags.tsx b/frontend/src/Movie/Details/MovieTags.tsx
index 39ffc670c7..678b741833 100644
--- a/frontend/src/Movie/Details/MovieTags.tsx
+++ b/frontend/src/Movie/Details/MovieTags.tsx
@@ -9,7 +9,7 @@ interface MovieTagsProps {
   movieId: number;
 }
 
-function MovieTags({ movieId }: MovieTagsProps) {
+function MovieTags({ movieId }: Readonly<MovieTagsProps>) {
   const movie = useMovie(movieId)!;
   const tagList = useTags();
 
diff --git a/frontend/src/Movie/Details/Titles/MovieTitlesRow.tsx b/frontend/src/Movie/Details/Titles/MovieTitlesRow.tsx
index aea4f9d729..50dc23a3f1 100644
--- a/frontend/src/Movie/Details/Titles/MovieTitlesRow.tsx
+++ b/frontend/src/Movie/Details/Titles/MovieTitlesRow.tsx
@@ -8,7 +8,7 @@ interface MovieTitlesRowProps {
   sourceType: string;
 }
 
-function MovieTitlesRow({ title, sourceType }: MovieTitlesRowProps) {
+function MovieTitlesRow({ title, sourceType }: Readonly<MovieTitlesRowProps>) {
   return (
     <TableRow>
       <TableRowCell>{title}</TableRowCell>
diff --git a/frontend/src/Movie/Details/Titles/MovieTitlesTable.tsx b/frontend/src/Movie/Details/Titles/MovieTitlesTable.tsx
index 7622e95bcf..c69cb1d8d0 100644
--- a/frontend/src/Movie/Details/Titles/MovieTitlesTable.tsx
+++ b/frontend/src/Movie/Details/Titles/MovieTitlesTable.tsx
@@ -49,7 +49,7 @@ interface MovieTitlesProps {
   movieId: number;
 }
 
-function MovieTitlesTable({ movieId }: MovieTitlesProps) {
+function MovieTitlesTable({ movieId }: Readonly<MovieTitlesProps>) {
   const { isFetching, isPopulated, error, items } = useSelector(
     movieAlternativeTitlesSelector(movieId)
   );
diff --git a/frontend/src/Movie/Edit/EditMovieModal.tsx b/frontend/src/Movie/Edit/EditMovieModal.tsx
index f4fcb50933..c88b52d327 100644
--- a/frontend/src/Movie/Edit/EditMovieModal.tsx
+++ b/frontend/src/Movie/Edit/EditMovieModal.tsx
@@ -14,7 +14,7 @@ function EditMovieModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditMovieModalProps) {
+}: Readonly<EditMovieModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Movie/Edit/EditMovieModalContent.tsx b/frontend/src/Movie/Edit/EditMovieModalContent.tsx
index d0b347dfc6..8334b628b1 100644
--- a/frontend/src/Movie/Edit/EditMovieModalContent.tsx
+++ b/frontend/src/Movie/Edit/EditMovieModalContent.tsx
@@ -43,7 +43,7 @@ function EditMovieModalContent({
   movieId,
   onModalClose,
   onDeleteMoviePress,
-}: EditMovieModalContentProps) {
+}: Readonly<EditMovieModalContentProps>) {
   const dispatch = useDispatch();
   const {
     title,
diff --git a/frontend/src/Movie/Edit/RootFolder/RootFolderModal.tsx b/frontend/src/Movie/Edit/RootFolder/RootFolderModal.tsx
index f10066e3d4..d78dd67a6f 100644
--- a/frontend/src/Movie/Edit/RootFolder/RootFolderModal.tsx
+++ b/frontend/src/Movie/Edit/RootFolder/RootFolderModal.tsx
@@ -14,7 +14,7 @@ function RootFolderModal({
   movieId,
   onSavePress,
   onModalClose,
-}: RootFolderModalProps) {
+}: Readonly<RootFolderModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <RootFolderModalContent
diff --git a/frontend/src/Movie/Edit/RootFolder/RootFolderModalContent.tsx b/frontend/src/Movie/Edit/RootFolder/RootFolderModalContent.tsx
index f7de5870cd..1b43e35e5d 100644
--- a/frontend/src/Movie/Edit/RootFolder/RootFolderModalContent.tsx
+++ b/frontend/src/Movie/Edit/RootFolder/RootFolderModalContent.tsx
@@ -30,7 +30,7 @@ interface MovieFolder {
   folder: string;
 }
 
-function RootFolderModalContent(props: RootFolderModalContentProps) {
+function RootFolderModalContent(props: Readonly<RootFolderModalContentProps>) {
   const { movieId, onSavePress, onModalClose } = props;
   const { isWindows } = useSelector(createSystemStatusSelector());
 
diff --git a/frontend/src/Movie/History/MovieHistoryModal.tsx b/frontend/src/Movie/History/MovieHistoryModal.tsx
index e6f6a07d6a..2a7ff05640 100644
--- a/frontend/src/Movie/History/MovieHistoryModal.tsx
+++ b/frontend/src/Movie/History/MovieHistoryModal.tsx
@@ -13,7 +13,7 @@ function MovieHistoryModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: MovieHistoryModalProps) {
+}: Readonly<MovieHistoryModalProps>) {
   return (
     <Modal
       isOpen={isOpen}
diff --git a/frontend/src/Movie/History/MovieHistoryModalContent.tsx b/frontend/src/Movie/History/MovieHistoryModalContent.tsx
index fd428196ef..3a4aee11c9 100644
--- a/frontend/src/Movie/History/MovieHistoryModalContent.tsx
+++ b/frontend/src/Movie/History/MovieHistoryModalContent.tsx
@@ -77,7 +77,7 @@ export interface MovieHistoryModalContentProps {
 function MovieHistoryModalContent({
   movieId,
   onModalClose,
-}: MovieHistoryModalContentProps) {
+}: Readonly<MovieHistoryModalContentProps>) {
   const dispatch = useDispatch();
 
   const { isFetching, isPopulated, error, items } = useSelector(
diff --git a/frontend/src/Movie/History/MovieHistoryRow.tsx b/frontend/src/Movie/History/MovieHistoryRow.tsx
index eff5e78879..4af806ba09 100644
--- a/frontend/src/Movie/History/MovieHistoryRow.tsx
+++ b/frontend/src/Movie/History/MovieHistoryRow.tsx
@@ -46,7 +46,7 @@ function MovieHistoryRow({
   data,
   downloadId,
   onMarkAsFailedPress,
-}: MovieHistoryRowProps) {
+}: Readonly<MovieHistoryRowProps>) {
   const [isDetailsModalOpen, setIsDetailsModalOpen] = useState(false);
   const [isMarkAsFailedModalOpen, setIsMarkAsFailedModalOpen] = useState(false);
 
diff --git a/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.tsx b/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.tsx
index 57a26cfed6..c0c0e004e9 100644
--- a/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.tsx
+++ b/frontend/src/Movie/Index/Menus/MovieIndexFilterMenu.tsx
@@ -11,7 +11,7 @@ interface MovieIndexFilterMenuProps {
   onFilterSelect: (filter: number | string) => void;
 }
 
-function MovieIndexFilterMenu(props: MovieIndexFilterMenuProps) {
+function MovieIndexFilterMenu(props: Readonly<MovieIndexFilterMenuProps>) {
   const {
     selectedFilterKey,
     filters,
diff --git a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
index 600dd653ec..5006bcecb7 100644
--- a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
+++ b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
@@ -13,7 +13,7 @@ interface MovieIndexSortMenuProps {
   onSortSelect(sortKey: string): void;
 }
 
-function MovieIndexSortMenu(props: MovieIndexSortMenuProps) {
+function MovieIndexSortMenu(props: Readonly<MovieIndexSortMenuProps>) {
   const { sortKey, sortDirection, isDisabled, onSortSelect } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.tsx b/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.tsx
index d4638d450d..371b573b10 100644
--- a/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.tsx
+++ b/frontend/src/Movie/Index/Menus/MovieIndexViewMenu.tsx
@@ -11,7 +11,7 @@ interface MovieIndexViewMenuProps {
   onViewSelect(value: string): void;
 }
 
-function MovieIndexViewMenu(props: MovieIndexViewMenuProps) {
+function MovieIndexViewMenu(props: Readonly<MovieIndexViewMenuProps>) {
   const { view, isDisabled, onViewSelect } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/MovieIndex.tsx b/frontend/src/Movie/Index/MovieIndex.tsx
index 8ac8db9a32..b9d7ae433f 100644
--- a/frontend/src/Movie/Index/MovieIndex.tsx
+++ b/frontend/src/Movie/Index/MovieIndex.tsx
@@ -76,7 +76,7 @@ interface MovieIndexProps {
   initialScrollTop?: number;
 }
 
-const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
+const MovieIndex = withScrollPosition((props: Readonly<MovieIndexProps>) => {
   const history = useHistory();
 
   const {
@@ -206,7 +206,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
     const characters = items.reduce((acc: Record<string, number>, item) => {
       let char = item.sortTitle.charAt(0);
 
-      if (!isNaN(Number(char))) {
+      if (!Number.isNaN(Number(char))) {
         char = '#';
       }
 
diff --git a/frontend/src/Movie/Index/MovieIndexSearchButton.tsx b/frontend/src/Movie/Index/MovieIndexSearchButton.tsx
index 79aa10f86d..f87a0bc594 100644
--- a/frontend/src/Movie/Index/MovieIndexSearchButton.tsx
+++ b/frontend/src/Movie/Index/MovieIndexSearchButton.tsx
@@ -19,7 +19,7 @@ interface MovieIndexSearchButtonProps {
   overflowComponent: React.FunctionComponent<never>;
 }
 
-function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
+function MovieIndexSearchButton(props: Readonly<MovieIndexSearchButtonProps>) {
   const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
   const {
     items,
diff --git a/frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx b/frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx
index 2e80ba3078..219edbbda3 100644
--- a/frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx
+++ b/frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx
@@ -17,7 +17,7 @@ interface MovieIndexSearchMenuItemProps {
   selectedFilterKey: string;
 }
 
-function MovieIndexSearchMenuItem(props: MovieIndexSearchMenuItemProps) {
+function MovieIndexSearchMenuItem(props: Readonly<MovieIndexSearchMenuItemProps>) {
   const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
   const {
     items,
diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverview.tsx b/frontend/src/Movie/Index/Overview/MovieIndexOverview.tsx
index 2fe8713bf4..4330b13e46 100644
--- a/frontend/src/Movie/Index/Overview/MovieIndexOverview.tsx
+++ b/frontend/src/Movie/Index/Overview/MovieIndexOverview.tsx
@@ -25,12 +25,12 @@ import MovieIndexOverviewInfo from './MovieIndexOverviewInfo';
 import selectOverviewOptions from './selectOverviewOptions';
 import styles from './MovieIndexOverview.css';
 
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(
   dimensions.movieIndexColumnPaddingSmallScreen
 );
-const defaultFontSize = parseInt(fonts.defaultFontSize);
-const lineHeight = parseFloat(fonts.lineHeight);
+const defaultFontSize = Number.parseInt(fonts.defaultFontSize);
+const lineHeight = Number.parseFloat(fonts.lineHeight);
 
 // Hardcoded height beased on line-height of 32 + bottom margin of 10.
 // Less side-effecty than using react-measure.
@@ -46,7 +46,7 @@ interface MovieIndexOverviewProps {
   isSmallScreen: boolean;
 }
 
-function MovieIndexOverview(props: MovieIndexOverviewProps) {
+function MovieIndexOverview(props: Readonly<MovieIndexOverviewProps>) {
   const {
     movieId,
     sortKey,
diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.tsx b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.tsx
index 226f15775d..010e9b34d6 100644
--- a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.tsx
+++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfo.tsx
@@ -41,7 +41,7 @@ interface MovieIndexOverviewInfoProps {
   sortKey: string;
 }
 
-const infoRowHeight = parseInt(dimensions.movieIndexOverviewInfoRowHeight);
+const infoRowHeight = Number.parseInt(dimensions.movieIndexOverviewInfoRowHeight);
 
 const rows = [
   {
@@ -148,7 +148,7 @@ function getInfoRowProps(
   return null;
 }
 
-function MovieIndexOverviewInfo(props: MovieIndexOverviewInfoProps) {
+function MovieIndexOverviewInfo(props: Readonly<MovieIndexOverviewInfoProps>) {
   const height = props.height;
 
   const uiSettings = useSelector(createUISettingsSelector());
diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfoRow.tsx b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfoRow.tsx
index bd6ad9f9e8..24e0f5142c 100644
--- a/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfoRow.tsx
+++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviewInfoRow.tsx
@@ -8,7 +8,7 @@ interface MovieIndexOverviewInfoRowProps {
   label: string;
 }
 
-function MovieIndexOverviewInfoRow(props: MovieIndexOverviewInfoRowProps) {
+function MovieIndexOverviewInfoRow(props: Readonly<MovieIndexOverviewInfoRowProps>) {
   const { title, iconName, label } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Overview/MovieIndexOverviews.tsx b/frontend/src/Movie/Index/Overview/MovieIndexOverviews.tsx
index 96cd73eb71..0691797e03 100644
--- a/frontend/src/Movie/Index/Overview/MovieIndexOverviews.tsx
+++ b/frontend/src/Movie/Index/Overview/MovieIndexOverviews.tsx
@@ -10,14 +10,14 @@ import MovieIndexOverview from './MovieIndexOverview';
 import selectOverviewOptions from './selectOverviewOptions';
 
 // Poster container dimensions
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(
   dimensions.movieIndexColumnPaddingSmallScreen
 );
-const progressBarHeight = parseInt(dimensions.progressBarSmallHeight);
-const detailedProgressBarHeight = parseInt(dimensions.progressBarMediumHeight);
-const bodyPadding = parseInt(dimensions.pageContentBodyPadding);
-const bodyPaddingSmallScreen = parseInt(
+const progressBarHeight = Number.parseInt(dimensions.progressBarSmallHeight);
+const detailedProgressBarHeight = Number.parseInt(dimensions.progressBarMediumHeight);
+const bodyPadding = Number.parseInt(dimensions.pageContentBodyPadding);
+const bodyPaddingSmallScreen = Number.parseInt(
   dimensions.pageContentBodyPaddingSmallScreen
 );
 
@@ -62,7 +62,7 @@ function getWindowScrollTopPosition() {
   return document.documentElement.scrollTop || document.body.scrollTop || 0;
 }
 
-function MovieIndexOverviews(props: MovieIndexOverviewsProps) {
+function MovieIndexOverviews(props: Readonly<MovieIndexOverviewsProps>) {
   const {
     items,
     sortKey,
diff --git a/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModal.tsx b/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModal.tsx
index 78e2389062..1a405241cc 100644
--- a/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModal.tsx
+++ b/frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModal.tsx
@@ -11,7 +11,7 @@ function MovieIndexOverviewOptionsModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: MovieIndexOverviewOptionsModalProps) {
+}: Readonly<MovieIndexOverviewOptionsModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <MovieIndexOverviewOptionsModalContent
diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx b/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx
index e6908d87b4..e4d04c24c9 100644
--- a/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx
@@ -23,11 +23,10 @@ import { Statistics } from 'Movie/Movie';
 import MoviePoster from 'Movie/MoviePoster';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import formatDate from 'Utilities/Date/formatDate';
-import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import translate from 'Utilities/String/translate';
 import createMovieIndexItemSelector from '../createMovieIndexItemSelector';
 import MovieIndexPosterInfo from './MovieIndexPosterInfo';
+import PosterDateRow from './PosterDateRow';
 import selectPosterOptions from './selectPosterOptions';
 import styles from './MovieIndexPoster.css';
 
@@ -39,7 +38,7 @@ interface MovieIndexPosterProps {
   posterHeight: number;
 }
 
-function MovieIndexPoster(props: MovieIndexPosterProps) {
+function MovieIndexPoster(props: Readonly<MovieIndexPosterProps>) {
   const { movieId, sortKey, isSelectMode, posterWidth, posterHeight } = props;
 
   const { movie, qualityProfile, isRefreshingMovie, isSearchingMovie } =
@@ -254,81 +253,49 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
         </div>
       ) : null}
 
-      {showCinemaRelease && inCinemas ? (
-        <div
-          className={styles.title}
-          title={`${translate('InCinemas')}: ${formatDate(
-            inCinemas,
-            longDateFormat
-          )}`}
-        >
-          <Icon name={icons.IN_CINEMAS} />{' '}
-          {getRelativeDate({
-            date: inCinemas,
-            shortDateFormat,
-            showRelativeDates,
-            timeFormat,
-            timeForToday: false,
-          })}
-        </div>
-      ) : null}
+      <PosterDateRow
+        show={showCinemaRelease}
+        date={inCinemas}
+        icon={icons.IN_CINEMAS}
+        label={translate('InCinemas')}
+        shortDateFormat={shortDateFormat}
+        longDateFormat={longDateFormat}
+        showRelativeDates={showRelativeDates}
+        timeFormat={timeFormat}
+      />
 
-      {showDigitalRelease && digitalRelease ? (
-        <div
-          className={styles.title}
-          title={`${translate('DigitalRelease')}: ${formatDate(
-            digitalRelease,
-            longDateFormat
-          )}`}
-        >
-          <Icon name={icons.MOVIE_FILE} />{' '}
-          {getRelativeDate({
-            date: digitalRelease,
-            shortDateFormat,
-            showRelativeDates,
-            timeFormat,
-            timeForToday: false,
-          })}
-        </div>
-      ) : null}
+      <PosterDateRow
+        show={showDigitalRelease}
+        date={digitalRelease}
+        icon={icons.MOVIE_FILE}
+        label={translate('DigitalRelease')}
+        shortDateFormat={shortDateFormat}
+        longDateFormat={longDateFormat}
+        showRelativeDates={showRelativeDates}
+        timeFormat={timeFormat}
+      />
 
-      {showPhysicalRelease && physicalRelease ? (
-        <div
-          className={styles.title}
-          title={`${translate('PhysicalRelease')}: ${formatDate(
-            physicalRelease,
-            longDateFormat
-          )}`}
-        >
-          <Icon name={icons.DISC} />{' '}
-          {getRelativeDate({
-            date: physicalRelease,
-            shortDateFormat,
-            showRelativeDates,
-            timeFormat,
-            timeForToday: false,
-          })}
-        </div>
-      ) : null}
+      <PosterDateRow
+        show={showPhysicalRelease}
+        date={physicalRelease}
+        icon={icons.DISC}
+        label={translate('PhysicalRelease')}
+        shortDateFormat={shortDateFormat}
+        longDateFormat={longDateFormat}
+        showRelativeDates={showRelativeDates}
+        timeFormat={timeFormat}
+      />
 
-      {showReleaseDate && releaseDate ? (
-        <div
-          className={styles.title}
-          title={`${translate('ReleaseDate')}: ${formatDate(
-            releaseDate,
-            longDateFormat
-          )}`}
-        >
-          <Icon name={icons.CALENDAR} />{' '}
-          {getRelativeDate({
-            date: releaseDate,
-            shortDateFormat,
-            showRelativeDates,
-            timeFormat,
-            timeForToday: false,
-          })}
-        </div>
-      ) : null}
+      <PosterDateRow
+        show={showReleaseDate}
+        date={releaseDate}
+        icon={icons.CALENDAR}
+        label={translate('ReleaseDate')}
+        shortDateFormat={shortDateFormat}
+        longDateFormat={longDateFormat}
+        showRelativeDates={showRelativeDates}
+        timeFormat={timeFormat}
+      />
 
       {showTmdbRating && !!ratings.tmdb ? (
         <div className={styles.title}>
diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx
index 3150f6bceb..9b01ea2d2c 100644
--- a/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.tsx
@@ -49,7 +49,7 @@ interface MovieIndexPosterInfoProps {
   showTags: boolean;
 }
 
-function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
+function MovieIndexPosterInfo(props: Readonly<MovieIndexPosterInfoProps>) {
   const {
     studio,
     showQualityProfile,
diff --git a/frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx b/frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx
index cef7ec4617..417dd77490 100644
--- a/frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx
+++ b/frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx
@@ -11,16 +11,16 @@ import Movie from 'Movie/Movie';
 import dimensions from 'Styles/Variables/dimensions';
 import getIndexOfFirstCharacter from 'Utilities/Array/getIndexOfFirstCharacter';
 
-const bodyPadding = parseInt(dimensions.pageContentBodyPadding);
-const bodyPaddingSmallScreen = parseInt(
+const bodyPadding = Number.parseInt(dimensions.pageContentBodyPadding);
+const bodyPaddingSmallScreen = Number.parseInt(
   dimensions.pageContentBodyPaddingSmallScreen
 );
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(
+const columnPadding = Number.parseInt(dimensions.movieIndexColumnPadding);
+const columnPaddingSmallScreen = Number.parseInt(
   dimensions.movieIndexColumnPaddingSmallScreen
 );
-const progressBarHeight = parseInt(dimensions.progressBarSmallHeight);
-const detailedProgressBarHeight = parseInt(dimensions.progressBarMediumHeight);
+const progressBarHeight = Number.parseInt(dimensions.progressBarSmallHeight);
+const detailedProgressBarHeight = Number.parseInt(dimensions.progressBarMediumHeight);
 
 const ADDITIONAL_COLUMN_COUNT: Record<string, number> = {
   small: 3,
@@ -100,7 +100,7 @@ function getWindowScrollTopPosition() {
   return document.documentElement.scrollTop || document.body.scrollTop || 0;
 }
 
-export default function MovieIndexPosters(props: MovieIndexPostersProps) {
+export default function MovieIndexPosters(props: Readonly<MovieIndexPostersProps>) {
   const {
     scrollerRef,
     items,
diff --git a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModal.tsx b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModal.tsx
index 8a8d9b4cc1..11f57b2399 100644
--- a/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModal.tsx
+++ b/frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModal.tsx
@@ -10,7 +10,7 @@ interface MovieIndexPosterOptionsModalProps {
 function MovieIndexPosterOptionsModal({
   isOpen,
   onModalClose,
-}: MovieIndexPosterOptionsModalProps) {
+}: Readonly<MovieIndexPosterOptionsModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <MovieIndexPosterOptionsModalContent onModalClose={onModalClose} />
diff --git a/frontend/src/Movie/Index/Posters/PosterDateRow.tsx b/frontend/src/Movie/Index/Posters/PosterDateRow.tsx
new file mode 100644
index 0000000000..707f158652
--- /dev/null
+++ b/frontend/src/Movie/Index/Posters/PosterDateRow.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import Icon, { IconName } from 'Components/Icon';
+import formatDate from 'Utilities/Date/formatDate';
+import getRelativeDate from 'Utilities/Date/getRelativeDate';
+import styles from './MovieIndexPoster.css';
+
+interface PosterDateRowProps {
+  show: boolean;
+  date?: string;
+  icon: IconName;
+  label: string;
+  shortDateFormat: string;
+  longDateFormat: string;
+  showRelativeDates: boolean;
+  timeFormat: string;
+}
+
+function PosterDateRow({
+  show,
+  date,
+  icon,
+  label,
+  shortDateFormat,
+  longDateFormat,
+  showRelativeDates,
+  timeFormat,
+}: Readonly<PosterDateRowProps>) {
+  if (!show || !date) {
+    return null;
+  }
+
+  return (
+    <div className={styles.title} title={`${label}: ${formatDate(date, longDateFormat)}`}>
+      <Icon name={icon} />{' '}
+      {getRelativeDate({
+        date,
+        shortDateFormat,
+        showRelativeDates,
+        timeFormat,
+        timeForToday: false,
+      })}
+    </div>
+  );
+}
+
+export default PosterDateRow;
diff --git a/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.tsx b/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.tsx
index aef82e2b8d..56f809ecfd 100644
--- a/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.tsx
+++ b/frontend/src/Movie/Index/ProgressBar/MovieIndexProgressBar.tsx
@@ -35,7 +35,7 @@ function MovieIndexProgressBar({
   detailedProgressBar,
   bottomRadius,
   isStandAlone,
-}: MovieIndexProgressBarProps) {
+}: Readonly<MovieIndexProgressBarProps>) {
   const queueDetails: MovieQueueDetails = useSelector(
     createMovieQueueItemsDetailsSelector(movieId)
   );
diff --git a/frontend/src/Movie/Index/Select/Delete/DeleteMovieModal.tsx b/frontend/src/Movie/Index/Select/Delete/DeleteMovieModal.tsx
index 91dd161919..3b82048a89 100644
--- a/frontend/src/Movie/Index/Select/Delete/DeleteMovieModal.tsx
+++ b/frontend/src/Movie/Index/Select/Delete/DeleteMovieModal.tsx
@@ -8,7 +8,7 @@ interface DeleteMovieModalProps {
   onModalClose(): void;
 }
 
-function DeleteMovieModal(props: DeleteMovieModalProps) {
+function DeleteMovieModal(props: Readonly<DeleteMovieModalProps>) {
   const { isOpen, movieIds, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx b/frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx
index 1563a8b6a7..9c04f156ca 100644
--- a/frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx
+++ b/frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx
@@ -30,7 +30,7 @@ const selectDeleteOptions = createSelector(
   (deleteOptions) => deleteOptions
 );
 
-function DeleteMovieModalContent(props: DeleteMovieModalContentProps) {
+function DeleteMovieModalContent(props: Readonly<DeleteMovieModalContentProps>) {
   const { movieIds, onModalClose } = props;
 
   const { addImportExclusion } = useSelector(selectDeleteOptions);
diff --git a/frontend/src/Movie/Index/Select/Edit/EditMoviesModal.tsx b/frontend/src/Movie/Index/Select/Edit/EditMoviesModal.tsx
index 9c0331f360..b8b0a945e9 100644
--- a/frontend/src/Movie/Index/Select/Edit/EditMoviesModal.tsx
+++ b/frontend/src/Movie/Index/Select/Edit/EditMoviesModal.tsx
@@ -9,7 +9,7 @@ interface EditMoviesModalProps {
   onModalClose(): void;
 }
 
-function EditMoviesModal(props: EditMoviesModalProps) {
+function EditMoviesModal(props: Readonly<EditMoviesModalProps>) {
   const { isOpen, movieIds, onSavePress, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx b/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
index 6736943209..7a54b3e7e1 100644
--- a/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
+++ b/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
@@ -51,7 +51,7 @@ const monitoredOptions = [
   },
 ];
 
-function EditMoviesModalContent(props: EditMoviesModalContentProps) {
+function EditMoviesModalContent(props: Readonly<EditMoviesModalContentProps>) {
   const { movieIds, onSavePress, onModalClose } = props;
 
   const [monitored, setMonitored] = useState(NO_CHANGE);
diff --git a/frontend/src/Movie/Index/Select/MovieIndexPosterSelect.tsx b/frontend/src/Movie/Index/Select/MovieIndexPosterSelect.tsx
index c08313e70d..57cbbea791 100644
--- a/frontend/src/Movie/Index/Select/MovieIndexPosterSelect.tsx
+++ b/frontend/src/Movie/Index/Select/MovieIndexPosterSelect.tsx
@@ -13,7 +13,7 @@ interface MovieIndexPosterSelectProps {
 function MovieIndexPosterSelect({
   movieId,
   titleSlug,
-}: MovieIndexPosterSelectProps) {
+}: Readonly<MovieIndexPosterSelectProps>) {
   const [selectState, selectDispatch] = useSelect();
   const isSelected = selectState.selectedState[movieId];
 
diff --git a/frontend/src/Movie/Index/Select/MovieIndexSelectAllButton.tsx b/frontend/src/Movie/Index/Select/MovieIndexSelectAllButton.tsx
index 0eb74427ca..b510af60c2 100644
--- a/frontend/src/Movie/Index/Select/MovieIndexSelectAllButton.tsx
+++ b/frontend/src/Movie/Index/Select/MovieIndexSelectAllButton.tsx
@@ -11,7 +11,7 @@ interface MovieIndexSelectAllButtonProps
   isSelectMode: boolean;
 }
 
-function MovieIndexSelectAllButton(props: MovieIndexSelectAllButtonProps) {
+function MovieIndexSelectAllButton(props: Readonly<MovieIndexSelectAllButtonProps>) {
   const { isSelectMode, overflowComponent } = props;
   const [selectState, selectDispatch] = useSelect();
   const { allSelected, allUnselected } = selectState;
diff --git a/frontend/src/Movie/Index/Select/MovieIndexSelectAllMenuItem.tsx b/frontend/src/Movie/Index/Select/MovieIndexSelectAllMenuItem.tsx
index b79afb4141..9ea57953ee 100644
--- a/frontend/src/Movie/Index/Select/MovieIndexSelectAllMenuItem.tsx
+++ b/frontend/src/Movie/Index/Select/MovieIndexSelectAllMenuItem.tsx
@@ -8,7 +8,7 @@ interface MovieIndexSelectAllMenuItemProps {
   isSelectMode: boolean;
 }
 
-function MovieIndexSelectAllMenuItem(props: MovieIndexSelectAllMenuItemProps) {
+function MovieIndexSelectAllMenuItem(props: Readonly<MovieIndexSelectAllMenuItemProps>) {
   const { isSelectMode } = props;
   const [selectState, selectDispatch] = useSelect();
   const { allSelected, allUnselected } = selectState;
diff --git a/frontend/src/Movie/Index/Select/MovieIndexSelectModeButton.tsx b/frontend/src/Movie/Index/Select/MovieIndexSelectModeButton.tsx
index 4b69003e0f..a48f67c2e2 100644
--- a/frontend/src/Movie/Index/Select/MovieIndexSelectModeButton.tsx
+++ b/frontend/src/Movie/Index/Select/MovieIndexSelectModeButton.tsx
@@ -9,7 +9,7 @@ interface MovieIndexSelectModeButtonProps extends PageToolbarButtonProps {
   onPress: () => void;
 }
 
-function MovieIndexSelectModeButton(props: MovieIndexSelectModeButtonProps) {
+function MovieIndexSelectModeButton(props: Readonly<MovieIndexSelectModeButtonProps>) {
   const { label, iconName, isSelectMode, overflowComponent, onPress } = props;
   const [, selectDispatch] = useSelect();
 
diff --git a/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModal.tsx b/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModal.tsx
index 8851b296c1..a991c99397 100644
--- a/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModal.tsx
+++ b/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModal.tsx
@@ -8,7 +8,7 @@ interface OrganizeMoviesModalProps {
   onModalClose: () => void;
 }
 
-function OrganizeMoviesModal(props: OrganizeMoviesModalProps) {
+function OrganizeMoviesModal(props: Readonly<OrganizeMoviesModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModalContent.tsx b/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModalContent.tsx
index 6ed7d62d4f..162630a582 100644
--- a/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModalContent.tsx
+++ b/frontend/src/Movie/Index/Select/Organize/OrganizeMoviesModalContent.tsx
@@ -21,7 +21,7 @@ interface OrganizeMoviesModalContentProps {
   onModalClose: () => void;
 }
 
-function OrganizeMoviesModalContent(props: OrganizeMoviesModalContentProps) {
+function OrganizeMoviesModalContent(props: Readonly<OrganizeMoviesModalContentProps>) {
   const { movieIds, onModalClose } = props;
 
   const allMovies: Movie[] = useSelector(createAllMoviesSelector());
diff --git a/frontend/src/Movie/Index/Select/Tags/TagsModal.tsx b/frontend/src/Movie/Index/Select/Tags/TagsModal.tsx
index 5ddcd515b7..7ddc71d459 100644
--- a/frontend/src/Movie/Index/Select/Tags/TagsModal.tsx
+++ b/frontend/src/Movie/Index/Select/Tags/TagsModal.tsx
@@ -9,7 +9,7 @@ interface TagsModalProps {
   onModalClose: () => void;
 }
 
-function TagsModal(props: TagsModalProps) {
+function TagsModal(props: Readonly<TagsModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Movie/Index/Select/Tags/TagsModalContent.tsx b/frontend/src/Movie/Index/Select/Tags/TagsModalContent.tsx
index 6ea14250b2..6bddd7be7c 100644
--- a/frontend/src/Movie/Index/Select/Tags/TagsModalContent.tsx
+++ b/frontend/src/Movie/Index/Select/Tags/TagsModalContent.tsx
@@ -25,7 +25,7 @@ interface TagsModalContentProps {
   onModalClose: () => void;
 }
 
-function TagsModalContent(props: TagsModalContentProps) {
+function TagsModalContent(props: Readonly<TagsModalContentProps>) {
   const { movieIds, onModalClose, onApplyTagsPress } = props;
 
   const allMovies: Movie[] = useSelector(createAllMoviesSelector());
diff --git a/frontend/src/Movie/Index/Table/MovieIndexRow.tsx b/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
index d546a8c511..07b75358a9 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
@@ -42,7 +42,7 @@ interface MovieIndexRowProps {
   isSelectMode: boolean;
 }
 
-function MovieIndexRow(props: MovieIndexRowProps) {
+function MovieIndexRow(props: Readonly<MovieIndexRowProps>) {
   const { movieId, columns, isSelectMode } = props;
 
   const { movie, qualityProfile, isRefreshingMovie, isSearchingMovie } =
@@ -129,7 +129,7 @@ function MovieIndexRow(props: MovieIndexRowProps) {
   }, [setIsDeleteMovieModalOpen]);
 
   const onSelectedChange = useCallback(
-    ({ id, value, shiftKey }: SelectStateInputProps) => {
+    ({ id, value, shiftKey }: Readonly<SelectStateInputProps>) => {
       selectDispatch({
         type: 'toggleSelected',
         id,
diff --git a/frontend/src/Movie/Index/Table/MovieIndexTable.tsx b/frontend/src/Movie/Index/Table/MovieIndexTable.tsx
index b2c6dea4bb..6c49b789ec 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexTable.tsx
+++ b/frontend/src/Movie/Index/Table/MovieIndexTable.tsx
@@ -15,8 +15,8 @@ import MovieIndexRow from './MovieIndexRow';
 import MovieIndexTableHeader from './MovieIndexTableHeader';
 import styles from './MovieIndexTable.css';
 
-const bodyPadding = parseInt(dimensions.pageContentBodyPadding);
-const bodyPaddingSmallScreen = parseInt(
+const bodyPadding = Number.parseInt(dimensions.pageContentBodyPadding);
+const bodyPaddingSmallScreen = Number.parseInt(
   dimensions.pageContentBodyPaddingSmallScreen
 );
 
@@ -75,7 +75,7 @@ function getWindowScrollTopPosition() {
   return document.documentElement.scrollTop || document.body.scrollTop || 0;
 }
 
-function MovieIndexTable(props: MovieIndexTableProps) {
+function MovieIndexTable(props: Readonly<MovieIndexTableProps>) {
   const {
     items,
     sortKey,
diff --git a/frontend/src/Movie/Index/Table/MovieIndexTableHeader.tsx b/frontend/src/Movie/Index/Table/MovieIndexTableHeader.tsx
index c448f8e884..c9eb10d530 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexTableHeader.tsx
+++ b/frontend/src/Movie/Index/Table/MovieIndexTableHeader.tsx
@@ -25,7 +25,7 @@ interface MovieIndexTableHeaderProps {
   isSelectMode: boolean;
 }
 
-function MovieIndexTableHeader(props: MovieIndexTableHeaderProps) {
+function MovieIndexTableHeader(props: Readonly<MovieIndexTableHeaderProps>) {
   const { columns, sortKey, sortDirection, isSelectMode } = props;
   const dispatch = useDispatch();
   const [selectState, selectDispatch] = useSelect();
diff --git a/frontend/src/Movie/Index/Table/MovieIndexTableOptions.tsx b/frontend/src/Movie/Index/Table/MovieIndexTableOptions.tsx
index 8d1751bcb3..a48ea1035d 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexTableOptions.tsx
+++ b/frontend/src/Movie/Index/Table/MovieIndexTableOptions.tsx
@@ -12,7 +12,7 @@ interface MovieIndexTableOptionsProps {
   onTableOptionChange(...args: unknown[]): unknown;
 }
 
-function MovieIndexTableOptions(props: MovieIndexTableOptionsProps) {
+function MovieIndexTableOptions(props: Readonly<MovieIndexTableOptionsProps>) {
   const { onTableOptionChange } = props;
 
   const tableOptions = useSelector(selectTableOptions);
diff --git a/frontend/src/Movie/Index/Table/MovieStatusCell.tsx b/frontend/src/Movie/Index/Table/MovieStatusCell.tsx
index 8aaba40dd8..f9a458be13 100644
--- a/frontend/src/Movie/Index/Table/MovieStatusCell.tsx
+++ b/frontend/src/Movie/Index/Table/MovieStatusCell.tsx
@@ -20,7 +20,7 @@ interface MovieStatusCellProps {
   component?: React.ElementType;
 }
 
-function MovieStatusCell(props: MovieStatusCellProps) {
+function MovieStatusCell(props: Readonly<MovieStatusCellProps>) {
   const {
     className,
     movieId,
diff --git a/frontend/src/Movie/IndexerFlags.tsx b/frontend/src/Movie/IndexerFlags.tsx
index 74e2e033cb..73f07949f3 100644
--- a/frontend/src/Movie/IndexerFlags.tsx
+++ b/frontend/src/Movie/IndexerFlags.tsx
@@ -6,7 +6,7 @@ interface IndexerFlagsProps {
   indexerFlags: number;
 }
 
-function IndexerFlags({ indexerFlags = 0 }: IndexerFlagsProps) {
+function IndexerFlags({ indexerFlags = 0 }: Readonly<IndexerFlagsProps>) {
   const allIndexerFlags = useSelector(createIndexerFlagsSelector);
 
   const flags = allIndexerFlags.items.filter(
diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx b/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx
index 75d0764b4c..d74aa33fd8 100644
--- a/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx
+++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx
@@ -27,7 +27,7 @@ function MoveMovieModal({
   onModalClose,
   onSavePress,
   onMoveMoviePress,
-}: MoveMovieModalProps) {
+}: Readonly<MoveMovieModalProps>) {
   if (isOpen && !originalPath && !destinationPath && !destinationRootFolder) {
     console.error(
       'originalPath and destinationPath OR destinationRootFolder must be provided'
diff --git a/frontend/src/Movie/MovieCollectionLabel.tsx b/frontend/src/Movie/MovieCollectionLabel.tsx
index afafd0d5c2..4b7676f304 100644
--- a/frontend/src/Movie/MovieCollectionLabel.tsx
+++ b/frontend/src/Movie/MovieCollectionLabel.tsx
@@ -11,7 +11,7 @@ interface MovieCollectionLabelProps {
   tmdbId: number;
 }
 
-function MovieCollectionLabel({ tmdbId }: MovieCollectionLabelProps) {
+function MovieCollectionLabel({ tmdbId }: Readonly<MovieCollectionLabelProps>) {
   const {
     id,
     monitored,
diff --git a/frontend/src/Movie/MovieFormats.tsx b/frontend/src/Movie/MovieFormats.tsx
index 5a8d5d4beb..61caafd2dc 100644
--- a/frontend/src/Movie/MovieFormats.tsx
+++ b/frontend/src/Movie/MovieFormats.tsx
@@ -7,7 +7,7 @@ interface MovieFormatsProps {
   formats: CustomFormat[];
 }
 
-function MovieFormats({ formats }: MovieFormatsProps) {
+function MovieFormats({ formats }: Readonly<MovieFormatsProps>) {
   return (
     <div>
       {formats.map(({ id, name }) => (
diff --git a/frontend/src/Movie/MovieGenres.tsx b/frontend/src/Movie/MovieGenres.tsx
index 77dc0c3cf3..036a4850fa 100644
--- a/frontend/src/Movie/MovieGenres.tsx
+++ b/frontend/src/Movie/MovieGenres.tsx
@@ -8,7 +8,7 @@ interface MovieGenresProps {
   genres: string[];
 }
 
-function MovieGenres({ className, genres }: MovieGenresProps) {
+function MovieGenres({ className, genres }: Readonly<MovieGenresProps>) {
   const firstGenres = genres.slice(0, 3);
   const otherGenres = genres.slice(3);
 
diff --git a/frontend/src/Movie/MovieHeadshot.tsx b/frontend/src/Movie/MovieHeadshot.tsx
index f0670c4f7d..91d860f946 100644
--- a/frontend/src/Movie/MovieHeadshot.tsx
+++ b/frontend/src/Movie/MovieHeadshot.tsx
@@ -9,7 +9,7 @@ interface MovieHeadshotProps
   size?: 250 | 500;
 }
 
-function MovieHeadshot({ size = 250, ...otherProps }: MovieHeadshotProps) {
+function MovieHeadshot({ size = 250, ...otherProps }: Readonly<MovieHeadshotProps>) {
   return (
     <MovieImage
       {...otherProps}
diff --git a/frontend/src/Movie/MovieImage.tsx b/frontend/src/Movie/MovieImage.tsx
index b7becc6f7a..b3fda403a8 100644
--- a/frontend/src/Movie/MovieImage.tsx
+++ b/frontend/src/Movie/MovieImage.tsx
@@ -40,7 +40,7 @@ function MovieImage({
   overflow = false,
   onError,
   onLoad,
-}: MovieImageProps) {
+}: Readonly<MovieImageProps>) {
   const [url, setUrl] = useState<string | null>(null);
   const [hasError, setHasError] = useState(false);
   const [isLoaded, setIsLoaded] = useState(true);
diff --git a/frontend/src/Movie/MovieLanguages.tsx b/frontend/src/Movie/MovieLanguages.tsx
index d259bd0bac..a0c8e963f1 100644
--- a/frontend/src/Movie/MovieLanguages.tsx
+++ b/frontend/src/Movie/MovieLanguages.tsx
@@ -11,7 +11,7 @@ interface MovieLanguagesProps {
   isCutoffNotMet?: boolean;
 }
 
-function MovieLanguages(props: MovieLanguagesProps) {
+function MovieLanguages(props: Readonly<MovieLanguagesProps>) {
   const { className, languages, isCutoffNotMet = true } = props;
 
   // TODO: Typescript - Remove once everything is converted
diff --git a/frontend/src/Movie/MoviePopularityIndex.tsx b/frontend/src/Movie/MoviePopularityIndex.tsx
index 16d65f0752..7768241676 100644
--- a/frontend/src/Movie/MoviePopularityIndex.tsx
+++ b/frontend/src/Movie/MoviePopularityIndex.tsx
@@ -9,7 +9,7 @@ interface MoviePopularityIndexProps {
   popularity: number;
 }
 
-function MoviePopularityIndex(props: MoviePopularityIndexProps) {
+function MoviePopularityIndex(props: Readonly<MoviePopularityIndexProps>) {
   const { popularity } = props;
 
   return (
diff --git a/frontend/src/Movie/MoviePoster.tsx b/frontend/src/Movie/MoviePoster.tsx
index 10a9e36055..f538c01777 100644
--- a/frontend/src/Movie/MoviePoster.tsx
+++ b/frontend/src/Movie/MoviePoster.tsx
@@ -9,7 +9,7 @@ interface MoviePosterProps
   size?: 250 | 500;
 }
 
-function MoviePoster({ size = 250, ...otherProps }: MoviePosterProps) {
+function MoviePoster({ size = 250, ...otherProps }: Readonly<MoviePosterProps>) {
   return (
     <MovieImage
       {...otherProps}
diff --git a/frontend/src/Movie/MovieQuality.tsx b/frontend/src/Movie/MovieQuality.tsx
index 94479b9c86..06058fdde0 100644
--- a/frontend/src/Movie/MovieQuality.tsx
+++ b/frontend/src/Movie/MovieQuality.tsx
@@ -77,7 +77,7 @@ interface MovieQualityProps {
   showRevision?: boolean;
 }
 
-function MovieQuality(props: MovieQualityProps) {
+function MovieQuality(props: Readonly<MovieQualityProps>) {
   const {
     className,
     title = '',
diff --git a/frontend/src/Movie/MovieSearchCell.tsx b/frontend/src/Movie/MovieSearchCell.tsx
index 3abd753625..66a3d32c8e 100644
--- a/frontend/src/Movie/MovieSearchCell.tsx
+++ b/frontend/src/Movie/MovieSearchCell.tsx
@@ -18,7 +18,7 @@ interface MovieSearchCellProps {
   movieEntity?: MovieEntity;
 }
 
-function MovieSearchCell({ movieId }: MovieSearchCellProps) {
+function MovieSearchCell({ movieId }: Readonly<MovieSearchCellProps>) {
   const executingCommands = useSelector(createExecutingCommandsSelector());
   const isSearching = executingCommands.some(({ name, body }) => {
     const { movieIds = [] } = body;
diff --git a/frontend/src/Movie/MovieStatus.tsx b/frontend/src/Movie/MovieStatus.tsx
index f8f35d5c0b..859da03409 100644
--- a/frontend/src/Movie/MovieStatus.tsx
+++ b/frontend/src/Movie/MovieStatus.tsx
@@ -18,7 +18,7 @@ interface MovieStatusProps {
   movieFileId: number | undefined;
 }
 
-function MovieStatus({ movieId, movieFileId }: MovieStatusProps) {
+function MovieStatus({ movieId, movieFileId }: Readonly<MovieStatusProps>) {
   const {
     isAvailable,
     monitored,
diff --git a/frontend/src/Movie/MovieTitleLink.tsx b/frontend/src/Movie/MovieTitleLink.tsx
index cd17da0feb..f8eba17b6d 100644
--- a/frontend/src/Movie/MovieTitleLink.tsx
+++ b/frontend/src/Movie/MovieTitleLink.tsx
@@ -12,7 +12,7 @@ function MovieTitleLink({
   title,
   year = 0,
   ...otherProps
-}: MovieTitleLinkProps) {
+}: Readonly<MovieTitleLinkProps>) {
   const link = `/movie/${titleSlug}`;
 
   return (
diff --git a/frontend/src/Movie/NoMovie.tsx b/frontend/src/Movie/NoMovie.tsx
index d72d4b2b41..8b0f4fa342 100644
--- a/frontend/src/Movie/NoMovie.tsx
+++ b/frontend/src/Movie/NoMovie.tsx
@@ -8,7 +8,7 @@ interface NoMovieProps {
   totalItems: number;
 }
 
-function NoMovie(props: NoMovieProps) {
+function NoMovie(props: Readonly<NoMovieProps>) {
   const { totalItems } = props;
 
   if (totalItems > 0) {
diff --git a/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx b/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
index ba05754eee..37955c60e1 100644
--- a/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
+++ b/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
@@ -21,7 +21,7 @@ function MovieInteractiveSearchModal({
   isOpen,
   movieId,
   onModalClose,
-}: MovieInteractiveSearchModalProps) {
+}: Readonly<MovieInteractiveSearchModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx b/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
index 397b8659d2..07ffe028b4 100644
--- a/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
+++ b/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
@@ -25,7 +25,7 @@ export interface MovieInteractiveSearchModalContentProps {
 function MovieInteractiveSearchModalContent({
   movieId,
   onModalClose,
-}: MovieInteractiveSearchModalContentProps) {
+}: Readonly<MovieInteractiveSearchModalContentProps>) {
   const dispatch = useDispatch();
 
   const { title, year } = useMovie(movieId) as Movie;
diff --git a/frontend/src/MovieFile/Edit/FileEditModalContent.js b/frontend/src/MovieFile/Edit/FileEditModalContent.js
index 14f319665e..01f63bc174 100644
--- a/frontend/src/MovieFile/Edit/FileEditModalContent.js
+++ b/frontend/src/MovieFile/Edit/FileEditModalContent.js
@@ -47,7 +47,7 @@ class FileEditModalContent extends Component {
   // Listeners
 
   onQualityChange = ({ value }) => {
-    this.setState({ qualityId: parseInt(value) });
+    this.setState({ qualityId: Number.parseInt(value) });
   };
 
   onInputChange = ({ name, value }) => {
diff --git a/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js b/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
index e3d2a493fe..96d33cb271 100644
--- a/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
+++ b/frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
@@ -74,7 +74,7 @@ class FileEditModalContentConnector extends Component {
     const languages = [];
 
     languageIds.forEach((languageId) => {
-      const language = this.props.languages.find((item) => item.id === parseInt(languageId));
+      const language = this.props.languages.find((item) => item.id === Number.parseInt(languageId));
 
       if (language !== undefined) {
         languages.push(language);
diff --git a/frontend/src/MovieFile/Editor/MediaInfo.tsx b/frontend/src/MovieFile/Editor/MediaInfo.tsx
index f5e3db21f6..99e934a480 100644
--- a/frontend/src/MovieFile/Editor/MediaInfo.tsx
+++ b/frontend/src/MovieFile/Editor/MediaInfo.tsx
@@ -5,7 +5,7 @@ import MediaInfoProps from 'typings/MediaInfo';
 import formatBitrate from 'Utilities/Number/formatBitrate';
 import getEntries from 'Utilities/Object/getEntries';
 
-function MediaInfo(props: MediaInfoProps) {
+function MediaInfo(props: Readonly<MediaInfoProps>) {
   return (
     <DescriptionList>
       {getEntries(props).map(([key, value]) => {
diff --git a/frontend/src/MovieFile/Extras/ExtraFileDetailsPopover.tsx b/frontend/src/MovieFile/Extras/ExtraFileDetailsPopover.tsx
index 7f4ee2da5c..2be41d4d4c 100644
--- a/frontend/src/MovieFile/Extras/ExtraFileDetailsPopover.tsx
+++ b/frontend/src/MovieFile/Extras/ExtraFileDetailsPopover.tsx
@@ -11,7 +11,7 @@ interface ExtraFileDetailsPopoverProps {
   languageTags?: string[];
 }
 
-function ExtraFileDetailsPopover(props: ExtraFileDetailsPopoverProps) {
+function ExtraFileDetailsPopover(props: Readonly<ExtraFileDetailsPopoverProps>) {
   const { type, title, languageTags = [] } = props;
 
   const details = [];
diff --git a/frontend/src/MovieFile/MediaInfo.tsx b/frontend/src/MovieFile/MediaInfo.tsx
index 0e94b15a3c..380cb4b8be 100644
--- a/frontend/src/MovieFile/MediaInfo.tsx
+++ b/frontend/src/MovieFile/MediaInfo.tsx
@@ -42,7 +42,7 @@ interface MediaInfoProps {
   type: MediaInfoType;
 }
 
-function MediaInfo({ movieFileId, type }: MediaInfoProps) {
+function MediaInfo({ movieFileId, type }: Readonly<MediaInfoProps>) {
   const movieFile = useMovieFile(movieFileId);
 
   if (!movieFile?.mediaInfo) {
diff --git a/frontend/src/MovieFile/MovieFileLanguages.tsx b/frontend/src/MovieFile/MovieFileLanguages.tsx
index 2880417878..369042da0d 100644
--- a/frontend/src/MovieFile/MovieFileLanguages.tsx
+++ b/frontend/src/MovieFile/MovieFileLanguages.tsx
@@ -6,7 +6,7 @@ interface MovieFileLanguagesProps {
   movieFileId: number;
 }
 
-function MovieFileLanguages({ movieFileId }: MovieFileLanguagesProps) {
+function MovieFileLanguages({ movieFileId }: Readonly<MovieFileLanguagesProps>) {
   const movieFile = useMovieFile(movieFileId);
 
   return <MovieLanguages languages={movieFile?.languages ?? []} />;
diff --git a/frontend/src/Organize/OrganizePreviewModal.tsx b/frontend/src/Organize/OrganizePreviewModal.tsx
index 4160a5885b..1c6a2f4779 100644
--- a/frontend/src/Organize/OrganizePreviewModal.tsx
+++ b/frontend/src/Organize/OrganizePreviewModal.tsx
@@ -15,7 +15,7 @@ function OrganizePreviewModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: OrganizePreviewModalProps) {
+}: Readonly<OrganizePreviewModalProps>) {
   const dispatch = useDispatch();
 
   const handleOnModalClose = useCallback(() => {
diff --git a/frontend/src/Organize/OrganizePreviewModalContent.tsx b/frontend/src/Organize/OrganizePreviewModalContent.tsx
index 009345c6d4..4e520ec3d7 100644
--- a/frontend/src/Organize/OrganizePreviewModalContent.tsx
+++ b/frontend/src/Organize/OrganizePreviewModalContent.tsx
@@ -42,7 +42,7 @@ export interface OrganizePreviewModalContentProps {
 function OrganizePreviewModalContent({
   movieId,
   onModalClose,
-}: OrganizePreviewModalContentProps) {
+}: Readonly<OrganizePreviewModalContentProps>) {
   const dispatch = useDispatch();
   const {
     items,
@@ -77,7 +77,7 @@ function OrganizePreviewModalContent({
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Organize/OrganizePreviewRow.tsx b/frontend/src/Organize/OrganizePreviewRow.tsx
index 398ea31ea1..b3da1725e8 100644
--- a/frontend/src/Organize/OrganizePreviewRow.tsx
+++ b/frontend/src/Organize/OrganizePreviewRow.tsx
@@ -11,7 +11,7 @@ interface OrganizePreviewRowProps {
   existingPath: string;
   newPath: string;
   isSelected?: boolean;
-  onSelectedChange: (props: SelectStateInputProps) => void;
+  onSelectedChange: (props: Readonly<SelectStateInputProps>) => void;
 }
 
 function OrganizePreviewRow({
@@ -20,7 +20,7 @@ function OrganizePreviewRow({
   newPath,
   isSelected,
   onSelectedChange,
-}: OrganizePreviewRowProps) {
+}: Readonly<OrganizePreviewRowProps>) {
   const handleSelectedChange = useCallback(
     ({ value, shiftKey }: CheckInputChanged) => {
       onSelectedChange({ id, value, shiftKey });
diff --git a/frontend/src/Parse/ParseModal.tsx b/frontend/src/Parse/ParseModal.tsx
index 0ee455bf0c..10c684d96d 100644
--- a/frontend/src/Parse/ParseModal.tsx
+++ b/frontend/src/Parse/ParseModal.tsx
@@ -7,7 +7,7 @@ interface ParseModalProps {
   onModalClose: () => void;
 }
 
-function ParseModal(props: ParseModalProps) {
+function ParseModal(props: Readonly<ParseModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Parse/ParseModalContent.tsx b/frontend/src/Parse/ParseModalContent.tsx
index 4c7250048e..efe0521425 100644
--- a/frontend/src/Parse/ParseModalContent.tsx
+++ b/frontend/src/Parse/ParseModalContent.tsx
@@ -21,7 +21,7 @@ interface ParseModalContentProps {
   onModalClose: () => void;
 }
 
-function ParseModalContent(props: ParseModalContentProps) {
+function ParseModalContent(props: Readonly<ParseModalContentProps>) {
   const { onModalClose } = props;
   const { isFetching, error, item } = useSelector(parseStateSelector());
 
diff --git a/frontend/src/Parse/ParseResult.tsx b/frontend/src/Parse/ParseResult.tsx
index 1aca44811d..ac8293d7c4 100644
--- a/frontend/src/Parse/ParseResult.tsx
+++ b/frontend/src/Parse/ParseResult.tsx
@@ -11,7 +11,7 @@ interface ParseResultProps {
   item: ParseModel;
 }
 
-function ParseResult(props: ParseResultProps) {
+function ParseResult(props: Readonly<ParseResultProps>) {
   const { item } = props;
   const {
     customFormats,
diff --git a/frontend/src/Parse/ParseResultItem.tsx b/frontend/src/Parse/ParseResultItem.tsx
index 661af448d9..ff58d4eba6 100644
--- a/frontend/src/Parse/ParseResultItem.tsx
+++ b/frontend/src/Parse/ParseResultItem.tsx
@@ -6,7 +6,7 @@ interface ParseResultItemProps {
   data: string | number | ReactNode;
 }
 
-function ParseResultItem(props: ParseResultItemProps) {
+function ParseResultItem(props: Readonly<ParseResultItemProps>) {
   const { title, data } = props;
 
   return (
diff --git a/frontend/src/RootFolder/RootFolderRow.tsx b/frontend/src/RootFolder/RootFolderRow.tsx
index c537968404..ab31cb80cc 100644
--- a/frontend/src/RootFolder/RootFolderRow.tsx
+++ b/frontend/src/RootFolder/RootFolderRow.tsx
@@ -20,7 +20,7 @@ interface RootFolderRowProps {
   unmappedFolders: object[];
 }
 
-function RootFolderRow(props: RootFolderRowProps) {
+function RootFolderRow(props: Readonly<RootFolderRowProps>) {
   const { id, path, accessible, freeSpace = 0, unmappedFolders = [] } = props;
 
   const isUnavailable = !accessible;
@@ -62,7 +62,7 @@ function RootFolderRow(props: RootFolderRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.freeSpace}>
-        {isUnavailable || isNaN(Number(freeSpace))
+        {isUnavailable || Number.isNaN(Number(freeSpace))
           ? '-'
           : formatBytes(freeSpace)}
       </TableRowCell>
diff --git a/frontend/src/Settings/AdvancedSettingsButton.tsx b/frontend/src/Settings/AdvancedSettingsButton.tsx
index 137e77f52b..88db89e1f4 100644
--- a/frontend/src/Settings/AdvancedSettingsButton.tsx
+++ b/frontend/src/Settings/AdvancedSettingsButton.tsx
@@ -13,7 +13,7 @@ interface AdvancedSettingsButtonProps {
   showLabel: boolean;
 }
 
-function AdvancedSettingsButton({ showLabel }: AdvancedSettingsButtonProps) {
+function AdvancedSettingsButton({ showLabel }: Readonly<AdvancedSettingsButtonProps>) {
   const showAdvancedSettings = useSelector(
     (state: AppState) => state.settings.advancedSettings
   );
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModal.tsx b/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModal.tsx
index dd34564376..c77d03e546 100644
--- a/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModal.tsx
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModal.tsx
@@ -7,7 +7,7 @@ interface ManageCustomFormatsModalProps {
   onModalClose(): void;
 }
 
-function ManageCustomFormatsModal(props: ManageCustomFormatsModalProps) {
+function ManageCustomFormatsModal(props: Readonly<ManageCustomFormatsModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalRow.tsx b/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalRow.tsx
index 57bb7fda0f..5793b7d5f2 100644
--- a/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalRow.tsx
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalRow.tsx
@@ -33,7 +33,7 @@ function isDeletingSelector() {
   );
 }
 
-function ManageCustomFormatsModalRow(props: ManageCustomFormatsModalRowProps) {
+function ManageCustomFormatsModalRow(props: Readonly<ManageCustomFormatsModalRowProps>) {
   const {
     id,
     isSelected,
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx
index 0302f35443..1b6cf2a2ec 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx
@@ -7,7 +7,7 @@ interface ManageDownloadClientsModalProps {
   onModalClose(): void;
 }
 
-function ManageDownloadClientsModal(props: ManageDownloadClientsModalProps) {
+function ManageDownloadClientsModal(props: Readonly<ManageDownloadClientsModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModal.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModal.tsx
index 2e24d60e88..2d4b6dffe1 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModal.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModal.tsx
@@ -9,7 +9,7 @@ interface TagsModalProps {
   onModalClose: () => void;
 }
 
-function TagsModal(props: TagsModalProps) {
+function TagsModal(props: Readonly<TagsModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.tsx
index e0899ff395..d3a9e28994 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.tsx
@@ -26,7 +26,7 @@ interface TagsModalContentProps {
   onModalClose: () => void;
 }
 
-function TagsModalContent(props: TagsModalContentProps) {
+function TagsModalContent(props: Readonly<TagsModalContentProps>) {
   const { ids, onModalClose, onApplyTagsPress } = props;
 
   const allDownloadClients: DownloadClientAppState = useSelector(
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx
index d5b56a7d3f..5f3266f707 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx
@@ -67,7 +67,7 @@ function EditImportListExclusionModalContent({
   id,
   onModalClose,
   onDeleteImportListExclusionPress,
-}: EditImportListExclusionModalContentProps) {
+}: Readonly<EditImportListExclusionModalContentProps>) {
   const { isFetching, isSaving, item, error, saveError, ...otherProps } =
     useSelector(createImportListExclusionSelector(id));
 
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx
index a03fcaa8f2..1e4f6cc52f 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx
@@ -19,7 +19,7 @@ interface ImportListExclusionRowProps extends ImportListExclusion {
   onSelectedChange: (options: SelectStateInputProps) => void;
 }
 
-function ImportListExclusionRow(props: ImportListExclusionRowProps) {
+function ImportListExclusionRow(props: Readonly<ImportListExclusionRowProps>) {
   const { id, tmdbId, movieTitle, movieYear, isSelected, onSelectedChange } =
     props;
 
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
index c7cec3cac3..127aa78160 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
@@ -119,7 +119,7 @@ function ImportListExclusions() {
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Settings/ImportLists/ImportLists/AddImportListItem.tsx b/frontend/src/Settings/ImportLists/ImportLists/AddImportListItem.tsx
index 88a053fe86..302ce76bb2 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/AddImportListItem.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/AddImportListItem.tsx
@@ -27,7 +27,7 @@ function AddImportListItem({
   infoLink,
   presets,
   onImportListSelect,
-}: AddImportListItemProps) {
+}: Readonly<AddImportListItemProps>) {
   const dispatch = useDispatch();
   const hasPresets = !!(presets && presets.length);
 
diff --git a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModal.tsx b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModal.tsx
index 067fb577b2..ce5d154706 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModal.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModal.tsx
@@ -12,7 +12,7 @@ function AddImportListModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: AddImportListModalProps) {
+}: Readonly<AddImportListModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <AddImportListModalContent {...otherProps} onModalClose={onModalClose} />
diff --git a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.tsx
index 6f67bc9133..4fca436b0d 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.tsx
@@ -25,7 +25,7 @@ export interface AddImportListModalContentProps {
 function AddImportListModalContent({
   onImportListSelect,
   onModalClose,
-}: AddImportListModalContentProps) {
+}: Readonly<AddImportListModalContentProps>) {
   const dispatch = useDispatch();
   const { isSchemaFetching, isSchemaPopulated, schemaError, schema } =
     useSelector((state: AppState) => state.settings.importLists);
diff --git a/frontend/src/Settings/ImportLists/ImportLists/AddImportListPresetMenuItem.tsx b/frontend/src/Settings/ImportLists/ImportLists/AddImportListPresetMenuItem.tsx
index b3d9aaaf07..55185d03c4 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/AddImportListPresetMenuItem.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/AddImportListPresetMenuItem.tsx
@@ -19,7 +19,7 @@ function AddImportListPresetMenuItem({
   minRefreshInterval,
   onPress,
   ...otherProps
-}: AddImportListPresetMenuItemProps) {
+}: Readonly<AddImportListPresetMenuItemProps>) {
   const dispatch = useDispatch();
 
   const handlePress = useCallback(() => {
diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModal.tsx b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModal.tsx
index 0b2ea67406..9253fdb4e5 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModal.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModal.tsx
@@ -20,7 +20,7 @@ function EditImportListModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditImportListModalProps) {
+}: Readonly<EditImportListModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx
index 2b06cc2e78..d8ceec728b 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx
@@ -44,7 +44,7 @@ function EditImportListModalContent({
   id,
   onModalClose,
   onDeleteImportListPress,
-}: EditImportListModalContentProps) {
+}: Readonly<EditImportListModalContentProps>) {
   const dispatch = useDispatch();
   const showAdvancedSettings = useShowAdvancedSettings();
 
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportList.tsx b/frontend/src/Settings/ImportLists/ImportLists/ImportList.tsx
index 1d0384fb88..00fc3e985a 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportList.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportList.tsx
@@ -31,7 +31,7 @@ function ImportList({
   tags,
   minRefreshInterval,
   onCloneImportListPress,
-}: ImportListProps) {
+}: Readonly<ImportListProps>) {
   const dispatch = useDispatch();
   const tagList = useTags();
 
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModal.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModal.tsx
index 0fed1c4b87..4728743f11 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModal.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModal.tsx
@@ -9,7 +9,7 @@ interface ManageImportListsEditModalProps {
   onModalClose(): void;
 }
 
-function ManageImportListsEditModal(props: ManageImportListsEditModalProps) {
+function ManageImportListsEditModal(props: Readonly<ManageImportListsEditModalProps>) {
   const { isOpen, importListIds, onSavePress, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx
index ffe295adef..1e98afc357 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx
@@ -8,7 +8,7 @@ interface ManageImportListsModalProps {
   onModalClose(): void;
 }
 
-function ManageImportListsModal(props: ManageImportListsModalProps) {
+function ManageImportListsModal(props: Readonly<ManageImportListsModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx
index 7cc9c272f1..701a3ec46c 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx
@@ -26,7 +26,7 @@ interface ManageImportListsModalRowProps {
   onSelectedChange(result: SelectStateInputProps): void;
 }
 
-function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
+function ManageImportListsModalRow(props: Readonly<ManageImportListsModalRowProps>) {
   const {
     id,
     isSelected,
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModal.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModal.tsx
index 2e24d60e88..2d4b6dffe1 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModal.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModal.tsx
@@ -9,7 +9,7 @@ interface TagsModalProps {
   onModalClose: () => void;
 }
 
-function TagsModal(props: TagsModalProps) {
+function TagsModal(props: Readonly<TagsModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModalContent.tsx
index 9d4af820e6..c6a0492613 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModalContent.tsx
+++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/Tags/TagsModalContent.tsx
@@ -26,7 +26,7 @@ interface TagsModalContentProps {
   onModalClose: () => void;
 }
 
-function TagsModalContent(props: TagsModalContentProps) {
+function TagsModalContent(props: Readonly<TagsModalContentProps>) {
   const { ids, onModalClose, onApplyTagsPress } = props;
 
   const allImportLists: ImportListAppState = useSelector(
diff --git a/frontend/src/Settings/ImportLists/Options/ImportListOptions.tsx b/frontend/src/Settings/ImportLists/Options/ImportListOptions.tsx
index 6b39a15fef..37d5459bc5 100644
--- a/frontend/src/Settings/ImportLists/Options/ImportListOptions.tsx
+++ b/frontend/src/Settings/ImportLists/Options/ImportListOptions.tsx
@@ -61,7 +61,7 @@ interface ImportListOptionsProps {
 function ImportListOptions({
   setChildSave,
   onChildStateChange,
-}: ImportListOptionsProps) {
+}: Readonly<ImportListOptionsProps>) {
   const dispatch = useDispatch();
   const showAdvancedSettings = useShowAdvancedSettings();
 
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.tsx b/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.tsx
index f756235390..08e1101e7b 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerItem.tsx
@@ -25,7 +25,7 @@ function AddIndexerItem({
   infoLink,
   presets,
   onIndexerSelect,
-}: AddIndexerItemProps) {
+}: Readonly<AddIndexerItemProps>) {
   const dispatch = useDispatch();
   const hasPresets = !!presets && !!presets.length;
 
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModal.tsx b/frontend/src/Settings/Indexers/Indexers/AddIndexerModal.tsx
index f834c30cb7..d9551c9007 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModal.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModal.tsx
@@ -12,7 +12,7 @@ function AddIndexerModal({
   isOpen,
   onIndexerSelect,
   onModalClose,
-}: AddIndexerModalProps) {
+}: Readonly<AddIndexerModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <AddIndexerModalContent
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.tsx b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.tsx
index 78c4d7ceba..fa4fa891c5 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.tsx
@@ -24,7 +24,7 @@ interface AddIndexerModalContentProps {
 function AddIndexerModalContent({
   onIndexerSelect,
   onModalClose,
-}: AddIndexerModalContentProps) {
+}: Readonly<AddIndexerModalContentProps>) {
   const dispatch = useDispatch();
 
   const { isSchemaFetching, isSchemaPopulated, schemaError, schema } =
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerPresetMenuItem.tsx b/frontend/src/Settings/Indexers/Indexers/AddIndexerPresetMenuItem.tsx
index 70502a6150..03c809944f 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerPresetMenuItem.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerPresetMenuItem.tsx
@@ -17,7 +17,7 @@ function AddIndexerPresetMenuItem({
   implementationName,
   onPress,
   ...otherProps
-}: AddIndexerPresetMenuItemProps) {
+}: Readonly<AddIndexerPresetMenuItemProps>) {
   const dispatch = useDispatch();
 
   const handlePress = useCallback(() => {
diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.tsx b/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.tsx
index 87175e197f..b48bf8a54b 100644
--- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModal.tsx
@@ -21,7 +21,7 @@ function EditIndexerModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditIndexerModalProps) {
+}: Readonly<EditIndexerModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.tsx b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.tsx
index 1987460d4f..3923cdcb7f 100644
--- a/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.tsx
@@ -40,7 +40,7 @@ function EditIndexerModalContent({
   id,
   onModalClose,
   onDeleteIndexerPress,
-}: EditIndexerModalContentProps) {
+}: Readonly<EditIndexerModalContentProps>) {
   const dispatch = useDispatch();
   const showAdvancedSettings = useShowAdvancedSettings();
 
diff --git a/frontend/src/Settings/Indexers/Indexers/Indexer.tsx b/frontend/src/Settings/Indexers/Indexers/Indexer.tsx
index 5804a2cc19..33f95d42ea 100644
--- a/frontend/src/Settings/Indexers/Indexers/Indexer.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Indexer.tsx
@@ -30,7 +30,7 @@ function Indexer({
   priority,
   showPriority,
   onCloneIndexerPress,
-}: IndexerProps) {
+}: Readonly<IndexerProps>) {
   const dispatch = useDispatch();
   const tagList = useSelector(createTagsSelector());
 
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModal.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModal.tsx
index 15c16b9809..b06cbedd79 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModal.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModal.tsx
@@ -9,7 +9,7 @@ interface ManageIndexersEditModalProps {
   onModalClose(): void;
 }
 
-function ManageIndexersEditModal(props: ManageIndexersEditModalProps) {
+function ManageIndexersEditModal(props: Readonly<ManageIndexersEditModalProps>) {
   const { isOpen, indexerIds, onSavePress, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModal.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModal.tsx
index afb90adab4..7e44e57184 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModal.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModal.tsx
@@ -7,7 +7,7 @@ interface ManageIndexersModalProps {
   onModalClose(): void;
 }
 
-function ManageIndexersModal(props: ManageIndexersModalProps) {
+function ManageIndexersModal(props: Readonly<ManageIndexersModalProps>) {
   const { isOpen, onModalClose } = props;
 
   return (
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
index fb9a393d7a..6b1920ce8b 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
@@ -84,7 +84,7 @@ interface ManageIndexersModalContentProps {
   onModalClose(): void;
 }
 
-function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
+function ManageIndexersModalContent(props: Readonly<ManageIndexersModalContentProps>) {
   const { onModalClose } = props;
 
   const {
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalRow.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalRow.tsx
index ada36359e8..ce548fe294 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalRow.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalRow.tsx
@@ -24,7 +24,7 @@ interface ManageIndexersModalRowProps {
   onSelectedChange(result: SelectStateInputProps): void;
 }
 
-function ManageIndexersModalRow(props: ManageIndexersModalRowProps) {
+function ManageIndexersModalRow(props: Readonly<ManageIndexersModalRowProps>) {
   const {
     id,
     isSelected,
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModal.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModal.tsx
index 2e24d60e88..2d4b6dffe1 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModal.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModal.tsx
@@ -9,7 +9,7 @@ interface TagsModalProps {
   onModalClose: () => void;
 }
 
-function TagsModal(props: TagsModalProps) {
+function TagsModal(props: Readonly<TagsModalProps>) {
   const { isOpen, onModalClose, ...otherProps } = props;
 
   return (
diff --git a/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModalContent.tsx b/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModalContent.tsx
index fb1e6b8477..eccc379461 100644
--- a/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/Tags/TagsModalContent.tsx
@@ -26,7 +26,7 @@ interface TagsModalContentProps {
   onModalClose: () => void;
 }
 
-function TagsModalContent(props: TagsModalContentProps) {
+function TagsModalContent(props: Readonly<TagsModalContentProps>) {
   const { ids, onModalClose, onApplyTagsPress } = props;
 
   const allIndexers: IndexerAppState = useSelector(
diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptions.tsx b/frontend/src/Settings/Indexers/Options/IndexerOptions.tsx
index 4e9a23ede8..a6ba71d755 100644
--- a/frontend/src/Settings/Indexers/Options/IndexerOptions.tsx
+++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.tsx
@@ -33,7 +33,7 @@ interface IndexerOptionsProps {
 function IndexerOptions({
   setChildSave,
   onChildStateChange,
-}: IndexerOptionsProps) {
+}: Readonly<IndexerOptionsProps>) {
   const dispatch = useDispatch();
   const {
     isFetching,
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.tsx b/frontend/src/Settings/MediaManagement/Naming/NamingModal.tsx
index f80a2e4ba1..adaa31d396 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.tsx
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.tsx
@@ -191,7 +191,7 @@ interface NamingModalProps {
   onModalClose: () => void;
 }
 
-function NamingModal(props: NamingModalProps) {
+function NamingModal(props: Readonly<NamingModalProps>) {
   const {
     isOpen,
     name,
diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingOption.tsx b/frontend/src/Settings/MediaManagement/Naming/NamingOption.tsx
index 5a3a03ff21..248be6c1ad 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingOption.tsx
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingOption.tsx
@@ -23,7 +23,7 @@ interface NamingOptionProps {
   }) => void;
 }
 
-function NamingOption(props: NamingOptionProps) {
+function NamingOption(props: Readonly<NamingOptionProps>) {
   const {
     token,
     tokenSeparator,
diff --git a/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.tsx b/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.tsx
index 9731a39ab9..96420a3a07 100644
--- a/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.tsx
+++ b/frontend/src/Settings/Metadata/Metadata/EditMetadataModal.tsx
@@ -17,7 +17,7 @@ function EditMetadataModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditMetadataModalProps) {
+}: Readonly<EditMetadataModalProps>) {
   const dispatch = useDispatch();
 
   const advancedSettings = useSelector(
diff --git a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.tsx b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.tsx
index 78f2d40043..21572c396b 100644
--- a/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.tsx
+++ b/frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.tsx
@@ -35,7 +35,7 @@ function EditMetadataModalContent({
   id,
   advancedSettings,
   onModalClose,
-}: EditMetadataModalContentProps) {
+}: Readonly<EditMetadataModalContentProps>) {
   const dispatch = useDispatch();
 
   const { isSaving, saveError, pendingChanges, items } = useSelector(
diff --git a/frontend/src/Settings/Metadata/Metadata/Metadata.tsx b/frontend/src/Settings/Metadata/Metadata/Metadata.tsx
index bb988d0d9e..87d97e3b20 100644
--- a/frontend/src/Settings/Metadata/Metadata/Metadata.tsx
+++ b/frontend/src/Settings/Metadata/Metadata/Metadata.tsx
@@ -14,7 +14,7 @@ interface MetadataProps {
   fields: Field[];
 }
 
-function Metadata({ id, name, enable, fields }: MetadataProps) {
+function Metadata({ id, name, enable, fields }: Readonly<MetadataProps>) {
   const [isEditMetadataModalOpen, setIsEditMetadataModalOpen] = useState(false);
 
   const { metadataFields, imageFields } = useMemo(() => {
diff --git a/frontend/src/Settings/PendingChangesModal.tsx b/frontend/src/Settings/PendingChangesModal.tsx
index 0172571dae..254b87b2f6 100644
--- a/frontend/src/Settings/PendingChangesModal.tsx
+++ b/frontend/src/Settings/PendingChangesModal.tsx
@@ -20,7 +20,7 @@ function PendingChangesModal({
   isOpen,
   onConfirm,
   onCancel,
-}: PendingChangesModalProps) {
+}: Readonly<PendingChangesModalProps>) {
   const { bindShortcut, unbindShortcut } = useKeyboardShortcuts();
 
   useEffect(() => {
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js b/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js
index 1ebb32a956..41340aaa22 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfileDragPreview.js
@@ -7,7 +7,7 @@ import dimensions from 'Styles/Variables/dimensions.js';
 import DelayProfile from './DelayProfile';
 import styles from './DelayProfileDragPreview.css';
 
-const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
+const dragHandleWidth = Number.parseInt(dimensions.dragHandleWidth);
 
 function collectDragLayer(monitor) {
   return {
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
index 88870aacda..9a6be47cd2 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js
@@ -20,7 +20,7 @@ import QualityProfileFormatItems from './QualityProfileFormatItems';
 import QualityProfileItems from './QualityProfileItems';
 import styles from './EditQualityProfileModalContent.css';
 
-const MODAL_BODY_PADDING = parseInt(dimensions.modalBodyPadding);
+const MODAL_BODY_PADDING = Number.parseInt(dimensions.modalBodyPadding);
 
 function getCustomFormatRender(formatItems, otherProps) {
   return (
diff --git a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
index 77951ee1f5..bf6e3927e6 100644
--- a/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContentConnector.js
@@ -21,13 +21,13 @@ function parseIndex(index) {
   if (split.length === 1) {
     return [
       null,
-      parseInt(split[0]) - 1
+      Number.parseInt(split[0]) - 1
     ];
   }
 
   return [
-    parseInt(split[0]) - 1,
-    parseInt(split[1]) - 1
+    Number.parseInt(split[0]) - 1,
+    Number.parseInt(split[1]) - 1
   ];
 }
 
@@ -202,7 +202,7 @@ class EditQualityProfileModalContentConnector extends Component {
   };
 
   onCutoffChange = ({ name, value }) => {
-    const id = parseInt(value);
+    const id = Number.parseInt(value);
     const item = _.find(this.props.item.items.value, (i) => {
       if (i.quality) {
         return i.quality.id === id;
@@ -218,7 +218,7 @@ class EditQualityProfileModalContentConnector extends Component {
 
   onLanguageChange = ({ name, value }) => {
 
-    const id = parseInt(value);
+    const id = Number.parseInt(value);
 
     const language = _.find(this.props.languages, (item) => item.key === id);
 
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
index 31290baa9c..795de136cb 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileItemDragPreview.js
@@ -7,10 +7,10 @@ import dimensions from 'Styles/Variables/dimensions.js';
 import QualityProfileItem from './QualityProfileItem';
 import styles from './QualityProfileItemDragPreview.css';
 
-const formGroupExtraSmallWidth = parseInt(dimensions.formGroupExtraSmallWidth);
-const formLabelSmallWidth = parseInt(dimensions.formLabelSmallWidth);
-const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
-const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
+const formGroupExtraSmallWidth = Number.parseInt(dimensions.formGroupExtraSmallWidth);
+const formLabelSmallWidth = Number.parseInt(dimensions.formLabelSmallWidth);
+const formLabelRightMarginWidth = Number.parseInt(dimensions.formLabelRightMarginWidth);
+const dragHandleWidth = Number.parseInt(dimensions.dragHandleWidth);
 
 function collectDragLayer(monitor) {
   return {
diff --git a/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx b/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx
index bbb3e6f085..1ac49bd07a 100644
--- a/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx
+++ b/frontend/src/Settings/Profiles/Quality/QualityProfileName.tsx
@@ -7,7 +7,7 @@ interface QualityProfileNameProps {
   qualityProfileId: number;
 }
 
-function QualityProfileName({ qualityProfileId }: QualityProfileNameProps) {
+function QualityProfileName({ qualityProfileId }: Readonly<QualityProfileNameProps>) {
   const qualityProfile = useSelector(
     createQualityProfileSelectorForHook(qualityProfileId)
   );
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModal.tsx b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModal.tsx
index cb7c2cef15..bcc86ca3b5 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModal.tsx
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModal.tsx
@@ -16,7 +16,7 @@ function EditReleaseProfileModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditReleaseProfileModalProps) {
+}: Readonly<EditReleaseProfileModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.tsx b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.tsx
index 267e4f3ce1..26f6541769 100644
--- a/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.tsx
+++ b/frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.tsx
@@ -72,7 +72,7 @@ function EditReleaseProfileModalContent({
   id,
   onModalClose,
   onDeleteReleaseProfilePress,
-}: EditReleaseProfileModalContentProps) {
+}: Readonly<EditReleaseProfileModalContentProps>) {
   const { item, isFetching, isSaving, error, saveError, ...otherProps } =
     useSelector(createReleaseProfileSelector(id));
 
diff --git a/frontend/src/Settings/Profiles/Release/ReleaseProfileItem.tsx b/frontend/src/Settings/Profiles/Release/ReleaseProfileItem.tsx
index 58a7bd13fa..60d1aa9ae5 100644
--- a/frontend/src/Settings/Profiles/Release/ReleaseProfileItem.tsx
+++ b/frontend/src/Settings/Profiles/Release/ReleaseProfileItem.tsx
@@ -20,7 +20,7 @@ interface ReleaseProfileProps extends ReleaseProfile {
   indexerList: Indexer[];
 }
 
-function ReleaseProfileItem(props: ReleaseProfileProps) {
+function ReleaseProfileItem(props: Readonly<ReleaseProfileProps>) {
   const {
     id,
     name,
diff --git a/frontend/src/Settings/SettingsToolbar.tsx b/frontend/src/Settings/SettingsToolbar.tsx
index 26b653dc5d..df1ab9ea85 100644
--- a/frontend/src/Settings/SettingsToolbar.tsx
+++ b/frontend/src/Settings/SettingsToolbar.tsx
@@ -32,7 +32,7 @@ function SettingsToolbar({
   hasPendingChanges,
   additionalButtons = null,
   onSavePress,
-}: SettingsToolbarProps) {
+}: Readonly<SettingsToolbarProps>) {
   const { bindShortcut, unbindShortcut } = useKeyboardShortcuts();
   const history = useHistory();
   const [nextLocation, setNextLocation] = useState<Location | null>(null);
diff --git a/frontend/src/Settings/Tags/AutoTagging/AutoTagging.tsx b/frontend/src/Settings/Tags/AutoTagging/AutoTagging.tsx
index cd484a33f9..72e4f5ea74 100644
--- a/frontend/src/Settings/Tags/AutoTagging/AutoTagging.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/AutoTagging.tsx
@@ -32,7 +32,7 @@ export default function AutoTagging({
   isDeleting,
   onConfirmDeleteAutoTagging,
   onCloneAutoTaggingPress,
-}: AutoTaggingProps) {
+}: Readonly<AutoTaggingProps>) {
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
 
diff --git a/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModal.tsx b/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModal.tsx
index 96bd117d64..9347e80fe2 100644
--- a/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModal.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModal.tsx
@@ -16,7 +16,7 @@ export default function EditAutoTaggingModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditAutoTaggingModalProps) {
+}: Readonly<EditAutoTaggingModalProps>) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
diff --git a/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.tsx b/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.tsx
index 6317a5b617..3599f22edc 100644
--- a/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.tsx
@@ -44,7 +44,7 @@ export default function EditAutoTaggingModalContent({
   tagsFromId,
   onModalClose,
   onDeleteAutoTaggingPress,
-}: EditAutoTaggingModalContentProps) {
+}: Readonly<EditAutoTaggingModalContentProps>) {
   const {
     error,
     item,
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationItem.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationItem.tsx
index 774f367e95..911935770d 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationItem.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationItem.tsx
@@ -27,7 +27,7 @@ export default function AddSpecificationItem({
   infoLink,
   presets,
   onSpecificationSelect,
-}: AddSpecificationItemProps) {
+}: Readonly<AddSpecificationItemProps>) {
   const handleSpecificationSelect = useCallback(() => {
     onSpecificationSelect({ implementation });
   }, [implementation, onSpecificationSelect]);
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModal.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModal.tsx
index e564866252..603f4cd684 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModal.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModal.tsx
@@ -10,7 +10,7 @@ interface AddSpecificationModalProps {
 function AddSpecificationModal({
   isOpen,
   onModalClose,
-}: AddSpecificationModalProps) {
+}: Readonly<AddSpecificationModalProps>) {
   return (
     <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <AddSpecificationModalContent onModalClose={onModalClose} />
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.tsx
index 12b8373ffb..0f63b508da 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.tsx
@@ -23,7 +23,7 @@ interface AddSpecificationModalContentProps {
 
 export default function AddSpecificationModalContent({
   onModalClose,
-}: AddSpecificationModalContentProps) {
+}: Readonly<AddSpecificationModalContentProps>) {
   const { isSchemaFetching, isSchemaPopulated, schemaError, schema } =
     useSelector((state: AppState) => state.settings.autoTaggingSpecifications);
 
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationPresetMenuItem.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationPresetMenuItem.tsx
index 06cd3b0271..19173181a9 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationPresetMenuItem.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationPresetMenuItem.tsx
@@ -18,7 +18,7 @@ export default function AddSpecificationPresetMenuItem({
   implementation,
   onPress,
   ...otherProps
-}: AddSpecificationPresetMenuItemProps) {
+}: Readonly<AddSpecificationPresetMenuItemProps>) {
   const handlePress = useCallback(() => {
     onPress({
       name,
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModal.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModal.tsx
index 5b4041e623..e0a6ed9f93 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModal.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModal.tsx
@@ -17,7 +17,7 @@ function EditSpecificationModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: EditSpecificationModalProps) {
+}: Readonly<EditSpecificationModalProps>) {
   const dispatch = useDispatch();
 
   const onWrappedModalClose = useCallback(() => {
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModalContent.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModalContent.tsx
index da316d0e29..cdf972afbe 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModalContent.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModalContent.tsx
@@ -38,7 +38,7 @@ function EditSpecificationModalContent({
   id,
   onDeleteSpecificationPress,
   onModalClose,
-}: EditSpecificationModalContentProps) {
+}: Readonly<EditSpecificationModalContentProps>) {
   const advancedSettings = useSelector(
     (state: AppState) => state.settings.advancedSettings
   );
diff --git a/frontend/src/Settings/Tags/AutoTagging/Specifications/Specification.tsx b/frontend/src/Settings/Tags/AutoTagging/Specifications/Specification.tsx
index 099dfd5d80..8af23d864e 100644
--- a/frontend/src/Settings/Tags/AutoTagging/Specifications/Specification.tsx
+++ b/frontend/src/Settings/Tags/AutoTagging/Specifications/Specification.tsx
@@ -29,7 +29,7 @@ export default function Specification({
   negate,
   onConfirmDeleteSpecification,
   onCloneSpecificationPress,
-}: SpecificationProps) {
+}: Readonly<SpecificationProps>) {
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
 
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.tsx b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.tsx
index 7aa5a9b8b2..8d3d150b8a 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.tsx
+++ b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.tsx
@@ -16,7 +16,7 @@ function TagDetailsDelayProfile({
   enableTorrent,
   usenetDelay,
   torrentDelay,
-}: TagDetailsDelayProfileProps) {
+}: Readonly<TagDetailsDelayProfileProps>) {
   return (
     <div>
       <div>
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModal.tsx b/frontend/src/Settings/Tags/Details/TagDetailsModal.tsx
index e398a17981..70874e801f 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsModal.tsx
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModal.tsx
@@ -14,7 +14,7 @@ function TagDetailsModal({
   isOpen,
   onModalClose,
   ...otherProps
-}: TagDetailsModalProps) {
+}: Readonly<TagDetailsModalProps>) {
   return (
     <Modal size={sizes.SMALL} isOpen={isOpen} onModalClose={onModalClose}>
       <TagDetailsModalContent {...otherProps} onModalClose={onModalClose} />
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.tsx b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.tsx
index 5f0bd58052..4a2dc0efeb 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.tsx
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.tsx
@@ -83,7 +83,7 @@ function TagDetailsModalContent({
   movieIds = [],
   onModalClose,
   onDeleteTagPress,
-}: TagDetailsModalContentProps) {
+}: Readonly<TagDetailsModalContentProps>) {
   const movies = useSelector(createMatchingMoviesSelector(movieIds));
 
   const delayProfiles = useSelector(
diff --git a/frontend/src/Settings/Tags/Tag.tsx b/frontend/src/Settings/Tags/Tag.tsx
index 3fa37cc62f..60c8594261 100644
--- a/frontend/src/Settings/Tags/Tag.tsx
+++ b/frontend/src/Settings/Tags/Tag.tsx
@@ -15,7 +15,7 @@ interface TagProps {
   label: string;
 }
 
-function Tag({ id, label }: TagProps) {
+function Tag({ id, label }: Readonly<TagProps>) {
   const dispatch = useDispatch();
   const {
     delayProfileIds = [],
diff --git a/frontend/src/Settings/Tags/TagInUse.tsx b/frontend/src/Settings/Tags/TagInUse.tsx
index 0f8090a85d..5a42f7c1a2 100644
--- a/frontend/src/Settings/Tags/TagInUse.tsx
+++ b/frontend/src/Settings/Tags/TagInUse.tsx
@@ -6,7 +6,7 @@ interface TagInUseProps {
   count: number;
 }
 
-export default function TagInUse({ label, labelPlural, count }: TagInUseProps) {
+export default function TagInUse({ label, labelPlural, count }: Readonly<TagInUseProps>) {
   if (count === 0) {
     return null;
   }
diff --git a/frontend/src/Store/Actions/Creators/Reducers/createSetSettingValueReducer.js b/frontend/src/Store/Actions/Creators/Reducers/createSetSettingValueReducer.js
index 474eb7bb26..bd3daaa44a 100644
--- a/frontend/src/Store/Actions/Creators/Reducers/createSetSettingValueReducer.js
+++ b/frontend/src/Store/Actions/Creators/Reducers/createSetSettingValueReducer.js
@@ -15,7 +15,7 @@ function createSetSettingValueReducer(section) {
       let parsedValue = null;
 
       if (_.isNumber(currentValue) && value != null) {
-        parsedValue = parseInt(value);
+        parsedValue = Number.parseInt(value);
       } else {
         parsedValue = value;
       }
diff --git a/frontend/src/Store/Actions/Settings/qualityDefinitions.js b/frontend/src/Store/Actions/Settings/qualityDefinitions.js
index c1ac33e6a0..501c574416 100644
--- a/frontend/src/Store/Actions/Settings/qualityDefinitions.js
+++ b/frontend/src/Store/Actions/Settings/qualityDefinitions.js
@@ -58,7 +58,7 @@ export default {
       const qualityDefinitions = getState().settings.qualityDefinitions;
 
       const upatedDefinitions = Object.keys(qualityDefinitions.pendingChanges).map((key) => {
-        const id = parseInt(key);
+        const id = Number.parseInt(key);
         const pendingChanges = qualityDefinitions.pendingChanges[id] || {};
         const item = _.find(qualityDefinitions.items, { id });
 
diff --git a/frontend/src/Store/Selectors/createMovieCreditImportListSelector.ts b/frontend/src/Store/Selectors/createMovieCreditImportListSelector.ts
index bbe2fbfc10..c3c9c1a843 100644
--- a/frontend/src/Store/Selectors/createMovieCreditImportListSelector.ts
+++ b/frontend/src/Store/Selectors/createMovieCreditImportListSelector.ts
@@ -13,7 +13,7 @@ function createMovieCreditImportListSelector(tmdbId: number) {
               (field) => field.name === 'personId'
             )?.value as string | null;
 
-            if (personIdValue && parseInt(personIdValue) === tmdbId) {
+            if (personIdValue && Number.parseInt(personIdValue) === tmdbId) {
               acc.push(importList);
 
               return acc;
diff --git a/frontend/src/System/Logs/LogFiles.tsx b/frontend/src/System/Logs/LogFiles.tsx
index 0bcd203b99..fd9427661f 100644
--- a/frontend/src/System/Logs/LogFiles.tsx
+++ b/frontend/src/System/Logs/LogFiles.tsx
@@ -57,7 +57,7 @@ function LogFiles({
   onRefreshPress,
   onDeleteFilesPress,
   ...otherProps
-}: LogFilesProps) {
+}: Readonly<LogFilesProps>) {
   const { appData, isWindows } = useSelector(
     (state: AppState) => state.system.status.item
   );
diff --git a/frontend/src/System/Logs/LogFilesTableRow.tsx b/frontend/src/System/Logs/LogFilesTableRow.tsx
index 021862dccd..be38e9bc5a 100644
--- a/frontend/src/System/Logs/LogFilesTableRow.tsx
+++ b/frontend/src/System/Logs/LogFilesTableRow.tsx
@@ -16,7 +16,7 @@ function LogFilesTableRow({
   filename,
   lastWriteTime,
   downloadUrl,
-}: LogFilesTableRowProps) {
+}: Readonly<LogFilesTableRowProps>) {
   return (
     <TableRow>
       <TableRowCell>{filename}</TableRowCell>
diff --git a/frontend/src/System/Logs/LogsNavMenu.tsx b/frontend/src/System/Logs/LogsNavMenu.tsx
index 5a6b50f7ae..83d137fe44 100644
--- a/frontend/src/System/Logs/LogsNavMenu.tsx
+++ b/frontend/src/System/Logs/LogsNavMenu.tsx
@@ -9,7 +9,7 @@ interface LogsNavMenuProps {
   current: string;
 }
 
-function LogsNavMenu({ current }: LogsNavMenuProps) {
+function LogsNavMenu({ current }: Readonly<LogsNavMenuProps>) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
   const handleMenuButtonPress = useCallback(() => {
diff --git a/frontend/src/System/Status/About/StartTime.tsx b/frontend/src/System/Status/About/StartTime.tsx
index 0fca7806b2..ff4f8582f3 100644
--- a/frontend/src/System/Status/About/StartTime.tsx
+++ b/frontend/src/System/Status/About/StartTime.tsx
@@ -9,7 +9,7 @@ interface StartTimeProps {
   startTime: string;
 }
 
-function StartTime(props: StartTimeProps) {
+function StartTime(props: Readonly<StartTimeProps>) {
   const { startTime } = props;
   const { timeFormat, longDateFormat } = useSelector(
     createUISettingsSelector()
diff --git a/frontend/src/System/Status/Health/HealthItemLink.tsx b/frontend/src/System/Status/Health/HealthItemLink.tsx
index 827d955d6f..a46175f82c 100644
--- a/frontend/src/System/Status/Health/HealthItemLink.tsx
+++ b/frontend/src/System/Status/Health/HealthItemLink.tsx
@@ -7,7 +7,7 @@ interface HealthItemLinkProps {
   source: string;
 }
 
-function HealthItemLink(props: HealthItemLinkProps) {
+function HealthItemLink(props: Readonly<HealthItemLinkProps>) {
   const { source } = props;
 
   switch (source) {
diff --git a/frontend/src/System/Tasks/Queued/QueuedTaskRow.tsx b/frontend/src/System/Tasks/Queued/QueuedTaskRow.tsx
index 66d7620390..8e57cb33af 100644
--- a/frontend/src/System/Tasks/Queued/QueuedTaskRow.tsx
+++ b/frontend/src/System/Tasks/Queued/QueuedTaskRow.tsx
@@ -103,7 +103,7 @@ export interface QueuedTaskRowProps {
   clientUserAgent?: string;
 }
 
-export default function QueuedTaskRow(props: QueuedTaskRowProps) {
+export default function QueuedTaskRow(props: Readonly<QueuedTaskRowProps>) {
   const {
     id,
     trigger,
diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.tsx b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.tsx
index 3a3cd02de6..b19038c037 100644
--- a/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.tsx
+++ b/frontend/src/System/Tasks/Scheduled/ScheduledTaskRow.tsx
@@ -27,7 +27,7 @@ interface ScheduledTaskRowProps {
   nextExecution: string;
 }
 
-function ScheduledTaskRow(props: ScheduledTaskRowProps) {
+function ScheduledTaskRow(props: Readonly<ScheduledTaskRowProps>) {
   const {
     id,
     taskName,
diff --git a/frontend/src/System/Updates/UpdateChanges.tsx b/frontend/src/System/Updates/UpdateChanges.tsx
index 20338d0119..7c8afb1540 100644
--- a/frontend/src/System/Updates/UpdateChanges.tsx
+++ b/frontend/src/System/Updates/UpdateChanges.tsx
@@ -7,7 +7,7 @@ interface UpdateChangesProps {
   changes: string[];
 }
 
-function UpdateChanges(props: UpdateChangesProps) {
+function UpdateChanges(props: Readonly<UpdateChangesProps>) {
   const { title, changes } = props;
 
   if (changes.length === 0) {
diff --git a/frontend/src/System/Updates/Updates.tsx b/frontend/src/System/Updates/Updates.tsx
index 98c40b2ee4..8051ff1171 100644
--- a/frontend/src/System/Updates/Updates.tsx
+++ b/frontend/src/System/Updates/Updates.tsx
@@ -85,12 +85,12 @@ function Updates() {
   };
 
   const { isMajorUpdate, hasUpdateToInstall } = useMemo(() => {
-    const majorVersion = parseInt(
+    const majorVersion = Number.parseInt(
       currentVersion.match(VERSION_REGEX)?.[0] ?? '0'
     );
 
     const latestVersion = items[0]?.version;
-    const latestMajorVersion = parseInt(
+    const latestMajorVersion = Number.parseInt(
       latestVersion?.match(VERSION_REGEX)?.[0] ?? '0'
     );
 
diff --git a/frontend/src/Utilities/Array/getIndexOfFirstCharacter.js b/frontend/src/Utilities/Array/getIndexOfFirstCharacter.js
index 5cbb30085e..4dd2d7d779 100644
--- a/frontend/src/Utilities/Array/getIndexOfFirstCharacter.js
+++ b/frontend/src/Utilities/Array/getIndexOfFirstCharacter.js
@@ -3,7 +3,7 @@ export default function getIndexOfFirstCharacter(items, character) {
     const firstCharacter = item.sortTitle.charAt(0);
 
     if (character === '#') {
-      return !isNaN(firstCharacter);
+      return !Number.isNaN(firstCharacter);
     }
 
     return firstCharacter === character;
diff --git a/frontend/src/Utilities/Number/convertToBytes.js b/frontend/src/Utilities/Number/convertToBytes.js
index 6c63fb117f..9ac2364f7e 100644
--- a/frontend/src/Utilities/Number/convertToBytes.js
+++ b/frontend/src/Utilities/Number/convertToBytes.js
@@ -2,7 +2,7 @@
 function convertToBytes(input, power, binaryPrefix) {
   const size = Number(input);
 
-  if (isNaN(size)) {
+  if (Number.isNaN(size)) {
     return '';
   }
 
diff --git a/frontend/src/Utilities/Number/formatAge.js b/frontend/src/Utilities/Number/formatAge.js
index a8f0e9f651..99a0319ad5 100644
--- a/frontend/src/Utilities/Number/formatAge.js
+++ b/frontend/src/Utilities/Number/formatAge.js
@@ -2,8 +2,8 @@ import translate from 'Utilities/String/translate';
 
 function formatAge(age, ageHours, ageMinutes) {
   age = Math.round(age);
-  ageHours = parseFloat(ageHours);
-  ageMinutes = ageMinutes && parseFloat(ageMinutes);
+  ageHours = Number.parseFloat(ageHours);
+  ageMinutes = ageMinutes && Number.parseFloat(ageMinutes);
 
   if (age < 2 && ageHours) {
     if (ageHours < 2 && !!ageMinutes) {
diff --git a/frontend/src/Utilities/Number/formatBitrate.ts b/frontend/src/Utilities/Number/formatBitrate.ts
index f6a57bf915..d079138eed 100644
--- a/frontend/src/Utilities/Number/formatBitrate.ts
+++ b/frontend/src/Utilities/Number/formatBitrate.ts
@@ -3,7 +3,7 @@ import { filesize } from 'filesize';
 function formatBitrate(input: string | number) {
   const size = Number(input);
 
-  if (isNaN(size)) {
+  if (Number.isNaN(size)) {
     return '';
   }
 
diff --git a/frontend/src/Utilities/Number/formatBytes.ts b/frontend/src/Utilities/Number/formatBytes.ts
index a0ae8a9850..ce07355480 100644
--- a/frontend/src/Utilities/Number/formatBytes.ts
+++ b/frontend/src/Utilities/Number/formatBytes.ts
@@ -3,7 +3,7 @@ import { filesize } from 'filesize';
 function formatBytes(input: string | number) {
   const size = Number(input);
 
-  if (isNaN(size)) {
+  if (Number.isNaN(size)) {
     return '';
   }
 
diff --git a/frontend/src/Utilities/Table/getSelectedIds.ts b/frontend/src/Utilities/Table/getSelectedIds.ts
index b84db62451..a2d72f5451 100644
--- a/frontend/src/Utilities/Table/getSelectedIds.ts
+++ b/frontend/src/Utilities/Table/getSelectedIds.ts
@@ -6,7 +6,10 @@ function getSelectedIds(selectedState: SelectedState): number[] {
     selectedState,
     (result: number[], value, id) => {
       if (value) {
-        result.push(parseInt(id));
+        const parsed = Number.parseInt(id, 10);
+        if (!Number.isNaN(parsed)) {
+          result.push(parsed);
+        }
       }
 
       return result;
diff --git a/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.tsx b/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.tsx
index f8a275e86f..1f9a18a551 100644
--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.tsx
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.tsx
@@ -130,7 +130,7 @@ function CutoffUnmet() {
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.tsx b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.tsx
index 40480b8c4a..e82406089d 100644
--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.tsx
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.tsx
@@ -39,7 +39,7 @@ function CutoffUnmetRow({
   isSelected,
   columns,
   onSelectedChange,
-}: CutoffUnmetRowProps) {
+}: Readonly<CutoffUnmetRowProps>) {
   if (!movieFileId) {
     return null;
   }
diff --git a/frontend/src/Wanted/Missing/Missing.tsx b/frontend/src/Wanted/Missing/Missing.tsx
index 964b468a0f..71a24d16f1 100644
--- a/frontend/src/Wanted/Missing/Missing.tsx
+++ b/frontend/src/Wanted/Missing/Missing.tsx
@@ -130,7 +130,7 @@ function Missing() {
   );
 
   const handleSelectedChange = useCallback(
-    ({ id, value, shiftKey = false }: SelectStateInputProps) => {
+    ({ id, value, shiftKey = false }: Readonly<SelectStateInputProps>) => {
       setSelectState({
         type: 'toggleSelected',
         items,
diff --git a/frontend/src/Wanted/Missing/MissingRow.tsx b/frontend/src/Wanted/Missing/MissingRow.tsx
index af14e56922..6dcbd2131a 100644
--- a/frontend/src/Wanted/Missing/MissingRow.tsx
+++ b/frontend/src/Wanted/Missing/MissingRow.tsx
@@ -38,7 +38,7 @@ function MissingRow({
   isSelected,
   columns,
   onSelectedChange,
-}: MissingRowProps) {
+}: Readonly<MissingRowProps>) {
   if (!title) {
     return null;
   }
diff --git a/package.json b/package.json
index 64444fa374..0d032bc098 100644
--- a/package.json
+++ b/package.json
@@ -156,5 +156,12 @@
   "volta": {
     "node": "20.11.1",
     "yarn": "1.22.19"
+  },
+  "resolutions": {
+    "cross-spawn": "^7.0.6",
+    "brace-expansion": "^2.0.2",
+    "color-string": "^1.9.1",
+    "postcss-color-function/**/postcss": "^8.5.6",
+    "glob": "^11.1.0"
   }
 }
diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
index 04c5cb40a0..a8c42e2d38 100644
--- a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
+++ b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
@@ -922,7 +922,7 @@ private void WithMockMount(string root)
                 .Returns(mock.Object);
         }
 
-        private void VerifyCopyFolder(string source, string destination)
+        private static void VerifyCopyFolder(string source, string destination)
         {
             var sourceFiles = Directory.GetFileSystemEntries(source, "*", SearchOption.AllDirectories).Select(v => v.Substring(source.Length + 1)).ToArray();
             var destFiles = Directory.GetFileSystemEntries(destination, "*", SearchOption.AllDirectories).Select(v => v.Substring(destination.Length + 1)).ToArray();
@@ -930,7 +930,7 @@ private void VerifyCopyFolder(string source, string destination)
             CollectionAssert.AreEquivalent(sourceFiles, destFiles);
         }
 
-        private void VerifyMoveFolder(string source, string from, string destination)
+        private static void VerifyMoveFolder(string source, string from, string destination)
         {
             Directory.Exists(from).Should().BeFalse();
 
diff --git a/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs b/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
index 772efa6e33..a50fede80c 100644
--- a/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs
@@ -47,7 +47,7 @@ public void Setup()
             _subject = new SentryTarget("https://aaaaaaaaaaaaaaaaaaaaaaaaaa@sentry.io/111111", Mocker.GetMock<IAppFolderInfo>().Object);
         }
 
-        private LogEventInfo GivenLogEvent(LogLevel level, Exception ex, string message)
+        private static LogEventInfo GivenLogEvent(LogLevel level, Exception ex, string message)
         {
             return LogEventInfo.Create(level, "SentryTest", ex, CultureInfo.InvariantCulture, message);
         }
diff --git a/src/NzbDrone.Common.Test/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
index 5a54eb7559..95385fa358 100644
--- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -17,7 +17,7 @@ public class PathExtensionFixture : TestBase
     {
         private string _parent = @"C:\Test".AsOsAgnostic();
 
-        private IAppFolderInfo GetIAppDirectoryInfo()
+        private static IAppFolderInfo GetIAppDirectoryInfo()
         {
             var fakeEnvironment = new Mock<IAppFolderInfo>();
 
diff --git a/src/NzbDrone.Common/ArchiveService.cs b/src/NzbDrone.Common/ArchiveService.cs
index b48605f49f..ff9e1651c7 100644
--- a/src/NzbDrone.Common/ArchiveService.cs
+++ b/src/NzbDrone.Common/ArchiveService.cs
@@ -189,7 +189,7 @@ private void ExtractZip(string compressedFile, string destination)
             }
         }
 
-        private void ExtractTgz(string compressedFile, string destination)
+        private static void ExtractTgz(string compressedFile, string destination)
         {
             Stream inStream = File.OpenRead(compressedFile);
             Stream gzipStream = new GZipInputStream(inStream);
diff --git a/src/NzbDrone.Common/Cache/Cached.cs b/src/NzbDrone.Common/Cache/Cached.cs
index 42463f682d..64947262a6 100644
--- a/src/NzbDrone.Common/Cache/Cached.cs
+++ b/src/NzbDrone.Common/Cache/Cached.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Cache
 {
     public class Cached<T> : ICached<T>
     {
-        private class CacheItem
+        private sealed class CacheItem
         {
             public T Object { get; private set; }
             public DateTime? ExpiryTime { get; private set; }
diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
index e6a861f58c..274a20691d 100644
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -138,7 +138,7 @@ public bool FolderWritable(string path)
             }
             catch (Exception e)
             {
-                Logger.Trace("Directory '{0}' isn't writable. {1}", path, e.Message);
+                Logger.Trace("Directory '{0}' isn't writable. {1}", path.SanitizeForLog(), e.Message);
                 return false;
             }
         }
@@ -206,7 +206,7 @@ public long GetFileSize(string path)
             }
             catch (IOException ex)
             {
-                Logger.Trace(ex, "Unable to resolve symlink target for {0}", path);
+                Logger.Trace(ex, "Unable to resolve symlink target for {0}", path.SanitizeForLog());
             }
 
             return fi.Length;
@@ -534,12 +534,12 @@ public virtual IMount GetMount(string path)
             }
             catch (Exception ex)
             {
-                Logger.Debug(ex, $"Failed to get mount for path {path}");
+                Logger.Debug(ex, "Failed to get mount for path {0}", path.SanitizeForLog());
                 return null;
             }
         }
 
-        protected List<DriveInfo> GetDriveInfoMounts()
+        protected static List<DriveInfo> GetDriveInfoMounts()
         {
             return DriveInfo.GetDrives()
                             .Where(d => d.IsReady)
diff --git a/src/NzbDrone.Common/Disk/DiskTransferService.cs b/src/NzbDrone.Common/Disk/DiskTransferService.cs
index f89c31b212..b63272bed8 100644
--- a/src/NzbDrone.Common/Disk/DiskTransferService.cs
+++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs
@@ -464,7 +464,7 @@ private void RollbackCopy(string sourcePath, string targetPath)
             }
         }
 
-        private void WaitForIO()
+        private static void WaitForIO()
         {
             // This delay is intended to give the IO stack a bit of time to recover, this is especially required if remote NAS devices are involved.
             Thread.Sleep(3000);
diff --git a/src/NzbDrone.Common/Disk/OsPath.cs b/src/NzbDrone.Common/Disk/OsPath.cs
index 42fdaf567b..a219c4ac77 100644
--- a/src/NzbDrone.Common/Disk/OsPath.cs
+++ b/src/NzbDrone.Common/Disk/OsPath.cs
@@ -42,7 +42,7 @@ public OsPath(string path, OsPathKind kind)
 
         private static OsPathKind DetectPathKind(string path)
         {
-            if (path.StartsWith("/"))
+            if (path.StartsWith('/'))
             {
                 return OsPathKind.Unix;
             }
@@ -141,7 +141,7 @@ public bool IsRooted
 
                 if (IsUnixPath)
                 {
-                    return _path.StartsWith("/");
+                    return _path.StartsWith('/');
                 }
 
                 return false;
@@ -246,7 +246,7 @@ private int GetFileNameIndex()
                 return -1;
             }
 
-            if (_path.StartsWith("/") && index == 0)
+            if (_path.StartsWith('/') && index == 0)
             {
                 index++;
             }
@@ -490,7 +490,7 @@ public bool Equals(OsPath other, bool ignoreTrailingSlash)
                 newFragments.Add(leftFragments[j]);
             }
 
-            if (left.FullPath.EndsWith("\\") || left.FullPath.EndsWith("/"))
+            if (left.FullPath.EndsWith("\\") || left.FullPath.EndsWith('/'))
             {
                 newFragments.Add(string.Empty);
             }
diff --git a/src/NzbDrone.Common/EnsureThat/ExceptionFactory.cs b/src/NzbDrone.Common/EnsureThat/ExceptionFactory.cs
index d3f24a43fa..c57b68a5c8 100644
--- a/src/NzbDrone.Common/EnsureThat/ExceptionFactory.cs
+++ b/src/NzbDrone.Common/EnsureThat/ExceptionFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using NLog;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.EnsureThat
 {
@@ -9,13 +10,13 @@ internal static class ExceptionFactory
 
         internal static ArgumentException CreateForParamValidation(string paramName, string message)
         {
-            Logger.Warn(message);
+            Logger.Warn(message.SanitizeForLog());
             return new ArgumentException(message, paramName);
         }
 
         internal static ArgumentNullException CreateForParamNullValidation(string paramName, string message)
         {
-            Logger.Warn(message);
+            Logger.Warn(message.SanitizeForLog());
             return new ArgumentNullException(paramName, message);
         }
     }
diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs
index 93e9746381..1dfd4df12e 100644
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -418,7 +418,7 @@ private static bool IsPathValidForWindows(string path)
 
         private static bool IsPathValidForNonWindows(string path)
         {
-            return path.StartsWith("/");
+            return path.StartsWith('/');
         }
     }
 }
diff --git a/src/NzbDrone.Common/Extensions/StringExtensions.cs b/src/NzbDrone.Common/Extensions/StringExtensions.cs
index 8e327cd889..f17b0bf3bd 100644
--- a/src/NzbDrone.Common/Extensions/StringExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/StringExtensions.cs
@@ -228,5 +228,36 @@ public static string Reverse(this string text)
 
             return new string(array);
         }
+
+        public static string SanitizeForLog(this string text, int maxLength = 1000)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                return text ?? string.Empty;
+            }
+
+            var sb = new StringBuilder(Math.Min(text.Length, maxLength));
+
+            foreach (var c in text)
+            {
+                if (sb.Length >= maxLength)
+                {
+                    sb.Append("...[truncated]");
+                    break;
+                }
+
+                // Replace control characters to prevent log injection attacks
+                if (char.IsControl(c))
+                {
+                    sb.Append(' ');
+                }
+                else
+                {
+                    sb.Append(c);
+                }
+            }
+
+            return sb.ToString();
+        }
     }
 }
diff --git a/src/NzbDrone.Common/Extensions/UrlExtensions.cs b/src/NzbDrone.Common/Extensions/UrlExtensions.cs
index d71cfec155..344df2f12a 100644
--- a/src/NzbDrone.Common/Extensions/UrlExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/UrlExtensions.cs
@@ -11,7 +11,7 @@ public static bool IsValidUrl(this string path)
                 return false;
             }
 
-            if (path.StartsWith(" ") || path.EndsWith(" "))
+            if (path.StartsWith(' ') || path.EndsWith(' '))
             {
                 return false;
             }
diff --git a/src/NzbDrone.Common/Http/HttpClient.cs b/src/NzbDrone.Common/Http/HttpClient.cs
index fc06d43a22..667fe486de 100644
--- a/src/NzbDrone.Common/Http/HttpClient.cs
+++ b/src/NzbDrone.Common/Http/HttpClient.cs
@@ -274,7 +274,7 @@ public async Task DownloadFileAsync(string url, string fileName)
                     fileInfo.Directory.Create();
                 }
 
-                _logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
+                _logger.Debug("Downloading [{0}] to [{1}]", url.SanitizeForLog(), fileName.SanitizeForLog());
 
                 var stopWatch = Stopwatch.StartNew();
                 await using (var fileStream = new FileStream(fileNamePart, FileMode.Create, FileAccess.ReadWrite))
@@ -377,7 +377,7 @@ public HttpResponse<T> Post<T>(HttpRequest request)
             return Task.Run(() => PostAsync<T>(request)).GetAwaiter().GetResult();
         }
 
-        private void CheckResponseContentType(HttpResponse response)
+        private static void CheckResponseContentType(HttpResponse response)
         {
             if (response.Headers.ContentType != null && response.Headers.ContentType.Contains("text/html"))
             {
diff --git a/src/NzbDrone.Common/Http/HttpHeader.cs b/src/NzbDrone.Common/Http/HttpHeader.cs
index 42c13fd444..f9cfebc396 100644
--- a/src/NzbDrone.Common/Http/HttpHeader.cs
+++ b/src/NzbDrone.Common/Http/HttpHeader.cs
@@ -56,7 +56,7 @@ public string GetSingleValue(string key)
 
             if (values.Length > 1)
             {
-                throw new ApplicationException($"Expected {key} to occur only once, but was {values.Join("|")}.");
+                throw new InvalidHeaderException($"Expected {key} to occur only once, but was {values.Join("|")}.");
             }
 
             return values[0];
diff --git a/src/NzbDrone.Common/Http/HttpRequestBuilder.cs b/src/NzbDrone.Common/Http/HttpRequestBuilder.cs
index 93eebd0399..353ed2e662 100644
--- a/src/NzbDrone.Common/Http/HttpRequestBuilder.cs
+++ b/src/NzbDrone.Common/Http/HttpRequestBuilder.cs
@@ -55,7 +55,7 @@ public static string BuildBaseUrl(bool useHttps, string host, int port, string u
         {
             var protocol = useHttps ? "https" : "http";
 
-            if (urlBase.IsNotNullOrWhiteSpace() && !urlBase.StartsWith("/"))
+            if (urlBase.IsNotNullOrWhiteSpace() && !urlBase.StartsWith('/'))
             {
                 urlBase = "/" + urlBase;
             }
@@ -153,7 +153,7 @@ protected virtual void ApplyFormData(HttpRequest request)
 
             if (request.ContentData != null)
             {
-                throw new ApplicationException("Cannot send HttpRequest Body and FormData simultaneously.");
+                throw new InvalidRequestException("Cannot send HttpRequest Body and FormData simultaneously.");
             }
 
             var shouldSendAsMultipart = FormData.Any(v => v.ContentType != null || v.FileName != null || v.ContentData.Length > 1024);
@@ -239,7 +239,7 @@ protected virtual void ApplyFormData(HttpRequest request)
 
         public virtual HttpRequestBuilder Resource(string resourceUrl)
         {
-            if (!ResourceUrl.IsNotNullOrWhiteSpace() || resourceUrl.StartsWith("/"))
+            if (!ResourceUrl.IsNotNullOrWhiteSpace() || resourceUrl.StartsWith('/'))
             {
                 ResourceUrl = resourceUrl.TrimStart('/');
             }
diff --git a/src/NzbDrone.Common/Http/HttpUri.cs b/src/NzbDrone.Common/Http/HttpUri.cs
index 31626b9252..384729fbd8 100644
--- a/src/NzbDrone.Common/Http/HttpUri.cs
+++ b/src/NzbDrone.Common/Http/HttpUri.cs
@@ -43,7 +43,7 @@ public HttpUri(string scheme, string host, int? port, string path, string query,
 
             if (path.IsNotNullOrWhiteSpace())
             {
-                if (host.IsNotNullOrWhiteSpace() || path.StartsWith("/"))
+                if (host.IsNotNullOrWhiteSpace() || path.StartsWith('/'))
                 {
                     builder.Append('/');
                 }
@@ -161,7 +161,7 @@ private static string CombineRelativePath(string basePath, string relativePath)
                 return basePath;
             }
 
-            if (relativePath.StartsWith("/"))
+            if (relativePath.StartsWith('/'))
             {
                 return relativePath;
             }
diff --git a/src/NzbDrone.Common/Http/InvalidHeaderException.cs b/src/NzbDrone.Common/Http/InvalidHeaderException.cs
new file mode 100644
index 0000000000..93e53410a1
--- /dev/null
+++ b/src/NzbDrone.Common/Http/InvalidHeaderException.cs
@@ -0,0 +1,23 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Common.Http
+{
+    public class InvalidHeaderException : NzbDroneException
+    {
+        public InvalidHeaderException(string message, params object[] args)
+            : base(message, args)
+        {
+        }
+
+        public InvalidHeaderException(string message)
+            : base(message)
+        {
+        }
+
+        public InvalidHeaderException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Common/Http/InvalidRequestException.cs b/src/NzbDrone.Common/Http/InvalidRequestException.cs
new file mode 100644
index 0000000000..68ec847cd9
--- /dev/null
+++ b/src/NzbDrone.Common/Http/InvalidRequestException.cs
@@ -0,0 +1,23 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Common.Http
+{
+    public class InvalidRequestException : NzbDroneException
+    {
+        public InvalidRequestException(string message, params object[] args)
+            : base(message, args)
+        {
+        }
+
+        public InvalidRequestException(string message)
+            : base(message)
+        {
+        }
+
+        public InvalidRequestException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs b/src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs
index 06b113e542..3d0b62c739 100644
--- a/src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs
+++ b/src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs
@@ -73,7 +73,7 @@ protected override void Apply(HttpRequest request)
             }
         }
 
-        private void ConvertParameter(object value, out object data, out string summary)
+        private static void ConvertParameter(object value, out object data, out string summary)
         {
             if (value is byte[])
             {
@@ -92,7 +92,7 @@ private void ConvertParameter(object value, out object data, out string summary)
             }
         }
 
-        public string CreateNextId()
+        public static string CreateNextId()
         {
             return Guid.NewGuid().ToString().Substring(0, 8);
         }
diff --git a/src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs b/src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs
index 7a972d84f5..a67a90f0c6 100644
--- a/src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs
+++ b/src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs
@@ -47,7 +47,7 @@ private IWebProxy CreateWebProxy(HttpProxySettings proxySettings)
             }
         }
 
-        private Uri GetProxyUri(HttpProxySettings proxySettings)
+        private static Uri GetProxyUri(HttpProxySettings proxySettings)
         {
             switch (proxySettings.Type)
             {
diff --git a/src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs b/src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs
index 34df2dff35..bf568ff875 100644
--- a/src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs
@@ -34,7 +34,7 @@ public override void Visit(JProperty property)
             }
         }
 
-        private JValue CleanseValue(JValue value)
+        private static JValue CleanseValue(JValue value)
         {
             var text = value.Value<string>();
             var cleansed = CleanseLogMessage.Cleanse(text);
diff --git a/src/NzbDrone.Common/Instrumentation/InitializeLogger.cs b/src/NzbDrone.Common/Instrumentation/InitializeLogger.cs
index 038be8da8f..9408c646a1 100644
--- a/src/NzbDrone.Common/Instrumentation/InitializeLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/InitializeLogger.cs
@@ -19,7 +19,7 @@ public void Initialize()
             var sentryTarget = LogManager.Configuration.AllTargets.OfType<SentryTarget>().FirstOrDefault();
             if (sentryTarget != null)
             {
-                sentryTarget.UpdateScope(_osInfo);
+                SentryTarget.UpdateScope(_osInfo);
             }
         }
     }
diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
index fd2fef61f0..f1f380d626 100644
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -175,7 +175,7 @@ public void InitializeScope()
             });
         }
 
-        public void UpdateScope(IOsInfo osInfo)
+        public static void UpdateScope(IOsInfo osInfo)
         {
             SentrySdk.ConfigureScope(scope =>
             {
@@ -183,7 +183,7 @@ public void UpdateScope(IOsInfo osInfo)
             });
         }
 
-        public void UpdateScope(Version databaseVersion, int migration, string updateBranch, IPlatformInfo platformInfo)
+        public static void UpdateScope(Version databaseVersion, int migration, string updateBranch, IPlatformInfo platformInfo)
         {
             SentrySdk.ConfigureScope(scope =>
             {
diff --git a/src/NzbDrone.Common/ServiceInstallationException.cs b/src/NzbDrone.Common/ServiceInstallationException.cs
new file mode 100644
index 0000000000..9b820e3988
--- /dev/null
+++ b/src/NzbDrone.Common/ServiceInstallationException.cs
@@ -0,0 +1,23 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Common
+{
+    public class ServiceInstallationException : NzbDroneException
+    {
+        public ServiceInstallationException(string message, params object[] args)
+            : base(message, args)
+        {
+        }
+
+        public ServiceInstallationException(string message)
+            : base(message)
+        {
+        }
+
+        public ServiceInstallationException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Common/ServiceProvider.cs b/src/NzbDrone.Common/ServiceProvider.cs
index c66b2d3caf..5914bde497 100644
--- a/src/NzbDrone.Common/ServiceProvider.cs
+++ b/src/NzbDrone.Common/ServiceProvider.cs
@@ -75,7 +75,7 @@ public virtual void Install(string serviceName)
             if (installOutput.ExitCode != 0)
             {
                 _logger.Error($"Failed to install service: {installOutput.Lines.Select(x => x.Content).ConcatToString("\n")}");
-                throw new ApplicationException("Failed to install service");
+                throw new ServiceInstallationException("Failed to install service");
             }
 
             _logger.Info(installOutput.Lines.Select(x => x.Content).ConcatToString("\n"));
@@ -84,7 +84,7 @@ public virtual void Install(string serviceName)
             if (descOutput.ExitCode != 0)
             {
                 _logger.Error($"Failed to install service: {descOutput.Lines.Select(x => x.Content).ConcatToString("\n")}");
-                throw new ApplicationException("Failed to install service");
+                throw new ServiceInstallationException("Failed to install service");
             }
 
             _logger.Info(descOutput.Lines.Select(x => x.Content).ConcatToString("\n"));
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/147_custom_formatsFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/147_custom_formatsFixture.cs
index ce670f5eb0..68261ac523 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/147_custom_formatsFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/147_custom_formatsFixture.cs
@@ -132,7 +132,7 @@ private void ShouldHaveAddedDefaultFormat(IDirectDataMapper db)
             }
         }
 
-        private List<Profile147> QueryItems(IDirectDataMapper db)
+        private static List<Profile147> QueryItems(IDirectDataMapper db)
         {
             var test = db.Query("SELECT * FROM \"Profiles\"");
 
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/149_regex_required_tagsFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/149_regex_required_tagsFixture.cs
index 55af2587e0..3faf4904c6 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/149_regex_required_tagsFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/149_regex_required_tagsFixture.cs
@@ -75,7 +75,7 @@ public void should_correctly_convert_multiple_formats()
             convertedTags2.Should().BeEquivalentTo("E_NRXRQ_Director");
         }
 
-        private List<CustomFormatTest149> QueryItems(IDirectDataMapper db)
+        private static List<CustomFormatTest149> QueryItems(IDirectDataMapper db)
         {
             var items = db.Query<CustomFormatTest149>("SELECT \"Name\", \"FormatTags\" FROM \"CustomFormats\"");
 
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/150_fix_format_tags_double_underscoreFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/150_fix_format_tags_double_underscoreFixture.cs
index 21e7818a5a..3b9ebbc5c2 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/150_fix_format_tags_double_underscoreFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/150_fix_format_tags_double_underscoreFixture.cs
@@ -38,7 +38,7 @@ public void should_correctly_convert_format_tag(string original, string converte
             convertedTags.First().Should().BeEquivalentTo(converted);
         }
 
-        private List<regex_required_tagsFixture.CustomFormatTest149> QueryItems(IDirectDataMapper db)
+        private static List<regex_required_tagsFixture.CustomFormatTest149> QueryItems(IDirectDataMapper db)
         {
             var items = db.Query<regex_required_tagsFixture.CustomFormatTest149>("SELECT \"Name\", \"FormatTags\" FROM \"CustomFormats\"");
 
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/159_add_webrip_qualitiesFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/159_add_webrip_qualitiesFixture.cs
index c844df509d..60b434f18e 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/159_add_webrip_qualitiesFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/159_add_webrip_qualitiesFixture.cs
@@ -10,12 +10,12 @@ namespace NzbDrone.Core.Test.Datastore.Migration
     [TestFixture]
     public class add_webrip_qualitesFixture : MigrationTest<add_webrip_qualites>
     {
-        private string GenerateQualityJson(int quality, bool allowed)
+        private static string GenerateQualityJson(int quality, bool allowed)
         {
             return $"{{ \"quality\": {quality}, \"allowed\": {allowed.ToString().ToLowerInvariant()} }}";
         }
 
-        private string GenerateQualityGroupJson(int quality, bool allowed, string groupname, int group)
+        private static string GenerateQualityGroupJson(int quality, bool allowed, string groupname, int group)
         {
             return $"{{\"id\": {group}, \"name\": \"{groupname}\", \"items\": [ {{ \"quality\": {quality}, \"allowed\": {allowed.ToString().ToLowerInvariant()} }} ] }}";
         }
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/168_custom_format_rework.cs b/src/NzbDrone.Core.Test/Datastore/Migration/168_custom_format_rework.cs
index 9c9e41471f..e7f86a6fc8 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/168_custom_format_rework.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/168_custom_format_rework.cs
@@ -107,7 +107,7 @@ public void should_convert_custom_format_row_with_two_specs()
             json.Should().Contain($"\"name\": \"Edition 1\"");
         }
 
-        private void ValidateFormatTag(string json, string type, bool required, bool negated)
+        private static void ValidateFormatTag(string json, string type, bool required, bool negated)
         {
             json.Should().Contain($"\"type\": \"{type}\"");
 
diff --git a/src/NzbDrone.Core.Test/Datastore/WhereBuilderPostgresFixture.cs b/src/NzbDrone.Core.Test/Datastore/WhereBuilderPostgresFixture.cs
index 17b205e0e9..2546f665b4 100644
--- a/src/NzbDrone.Core.Test/Datastore/WhereBuilderPostgresFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/WhereBuilderPostgresFixture.cs
@@ -22,12 +22,12 @@ public void MapTables()
             Mocker.Resolve<DbFactory>();
         }
 
-        private WhereBuilderPostgres Where(Expression<Func<Movie, bool>> filter)
+        private static WhereBuilderPostgres Where(Expression<Func<Movie, bool>> filter)
         {
             return new WhereBuilderPostgres(filter, true, 0);
         }
 
-        private WhereBuilderPostgres WhereMeta(Expression<Func<MovieMetadata, bool>> filter)
+        private static WhereBuilderPostgres WhereMeta(Expression<Func<MovieMetadata, bool>> filter)
         {
             return new WhereBuilderPostgres(filter, true, 0);
         }
diff --git a/src/NzbDrone.Core.Test/Datastore/WhereBuilderSqliteFixture.cs b/src/NzbDrone.Core.Test/Datastore/WhereBuilderSqliteFixture.cs
index 60d7b30f5c..7c2aed5fdf 100644
--- a/src/NzbDrone.Core.Test/Datastore/WhereBuilderSqliteFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/WhereBuilderSqliteFixture.cs
@@ -22,12 +22,12 @@ public void MapTables()
             Mocker.Resolve<DbFactory>();
         }
 
-        private WhereBuilderSqlite Where(Expression<Func<Movie, bool>> filter)
+        private static WhereBuilderSqlite Where(Expression<Func<Movie, bool>> filter)
         {
             return new WhereBuilderSqlite(filter, true, 0);
         }
 
-        private WhereBuilderSqlite WhereMeta(Expression<Func<MovieMetadata, bool>> filter)
+        private static WhereBuilderSqlite WhereMeta(Expression<Func<MovieMetadata, bool>> filter)
         {
             return new WhereBuilderSqlite(filter, true, 0);
         }
diff --git a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
index 7f6da7b73e..f78114cf34 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
@@ -31,7 +31,7 @@ public void SetUp()
                 .Returns<List<DownloadDecision>>(v => v);
         }
 
-        private Movie GetMovie(int id)
+        private static Movie GetMovie(int id)
         {
             return Builder<Movie>.CreateNew()
                             .With(e => e.Id = id)
diff --git a/src/NzbDrone.Core.Test/Framework/DirectDataMapper.cs b/src/NzbDrone.Core.Test/Framework/DirectDataMapper.cs
index 2dd311cc29..e7eac45845 100644
--- a/src/NzbDrone.Core.Test/Framework/DirectDataMapper.cs
+++ b/src/NzbDrone.Core.Test/Framework/DirectDataMapper.cs
@@ -73,7 +73,7 @@ protected Dictionary<string, object> MapToDictionary(DataRow dataRow)
             return item;
         }
 
-        protected T MapToObject<T>(DataRow dataRow)
+        protected static T MapToObject<T>(DataRow dataRow)
             where T : new()
         {
             var item = new T();
diff --git a/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs b/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
index 9345c24e6c..b8bfdf2558 100644
--- a/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Test.Http
     [Platform(Exclude = "MacOsX")]
     public class HttpProxySettingsProviderFixture : TestBase<HttpProxySettingsProvider>
     {
-        private HttpProxySettings GetProxySettings()
+        private static HttpProxySettings GetProxySettings()
         {
             return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com,172.16.0.0/12", true, null, null);
         }
@@ -24,7 +24,7 @@ public void should_bypass_proxy(string url)
         {
             var settings = GetProxySettings();
 
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeTrue();
+            HttpProxySettingsProvider.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeTrue();
         }
 
         [TestCase("http://bing.com/get")]
@@ -33,7 +33,7 @@ public void should_not_bypass_proxy(string url)
         {
             var settings = GetProxySettings();
 
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeFalse();
+            HttpProxySettingsProvider.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeFalse();
         }
     }
 }
diff --git a/src/NzbDrone.Core.Test/ImportListTests/CouchPotato/CouchPotatoParserFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/CouchPotato/CouchPotatoParserFixture.cs
index 72c50abcf8..8f5325ac34 100644
--- a/src/NzbDrone.Core.Test/ImportListTests/CouchPotato/CouchPotatoParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/CouchPotato/CouchPotatoParserFixture.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Test.ImportList.CouchPotato
 {
     public class CouchPotatoTest : CoreTest<CouchPotatoParser>
     {
-        private ImportListResponse CreateResponse(string url, string content)
+        private static ImportListResponse CreateResponse(string url, string content)
         {
             var httpRequest = new HttpRequest(url);
             var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
diff --git a/src/NzbDrone.Core.Test/ImportListTests/Plex/PlexParserFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/Plex/PlexParserFixture.cs
index 945d2717ba..04d997bffa 100644
--- a/src/NzbDrone.Core.Test/ImportListTests/Plex/PlexParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/Plex/PlexParserFixture.cs
@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Test.ImportList.Plex
     [TestFixture]
     public class PlexParserFixture : CoreTest<PlexParser>
     {
-        private ImportListResponse CreateResponse(string url, string content)
+        private static ImportListResponse CreateResponse(string url, string content)
         {
             var httpRequest = new HttpRequest(url);
             var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
diff --git a/src/NzbDrone.Core.Test/ImportListTests/RSSImportParserFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/RSSImportParserFixture.cs
index 84019b7d72..6677d60305 100644
--- a/src/NzbDrone.Core.Test/ImportListTests/RSSImportParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/RSSImportParserFixture.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Test.ImportList
 {
     public class RSSImportTest : CoreTest<RSSImportParser>
     {
-        private ImportListResponse CreateResponse(string url, string content)
+        private static ImportListResponse CreateResponse(string url, string content)
         {
             var httpRequest = new HttpRequest(url);
             var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
diff --git a/src/NzbDrone.Core.Test/IndexerTests/BasicRssParserFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/BasicRssParserFixture.cs
index 82120f8881..d65a3912ea 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/BasicRssParserFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/BasicRssParserFixture.cs
@@ -37,7 +37,7 @@ public void should_not_parse_size(string sizeString)
             result.Should().Be(0);
         }
 
-        private IndexerResponse CreateResponse(string url, string content)
+        private static IndexerResponse CreateResponse(string url, string content)
         {
             var httpRequest = new HttpRequest(url);
             var httpResponse = new HttpResponse(httpRequest, new HttpHeader(), Encoding.UTF8.GetBytes(content));
diff --git a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
index c79bb8df77..4247badc61 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
@@ -42,7 +42,7 @@ private void ValidateTorrentResult(IList<ReleaseInfo> reports, bool hasSize = fa
             }
         }
 
-        private void ValidateResult(IList<ReleaseInfo> reports, bool hasSize = false, bool hasInfoUrl = false)
+        private static void ValidateResult(IList<ReleaseInfo> reports, bool hasSize = false, bool hasInfoUrl = false)
         {
             reports.Should().NotBeEmpty();
             reports.Should().OnlyContain(c => c.Title.IsNotNullOrWhiteSpace());
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TestTorrentRssIndexer.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TestTorrentRssIndexer.cs
index d969c5653e..82cb69e311 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TestTorrentRssIndexer.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TestTorrentRssIndexer.cs
@@ -29,7 +29,7 @@ public List<ValidationFailure> TestPublic()
         /// <summary>
         /// Code to quickly debug unit tests
         /// </summary>
-        private void SetupNLog()
+        private static void SetupNLog()
         {
             // Step 1. Create configuration object
             var config = new LoggingConfiguration();
diff --git a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
index c27c060e6e..73f3ab45fc 100644
--- a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
+++ b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Test.Messaging.Commands
     [TestFixture]
     public class CommandEqualityComparerFixture
     {
-        private string GivenRandomPath()
+        private static string GivenRandomPath()
         {
             return Path.Combine(@"C:\Tesst\", Guid.NewGuid().ToString()).AsOsAgnostic();
         }
diff --git a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
index b0a2676140..4d1c66cd91 100644
--- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
@@ -30,7 +30,7 @@ public void should_be_able_to_get_movie_detail(int tmdbId, string title)
             details.Title.Should().Be(title);
         }
 
-        private void ValidateMovie(MovieMetadata movie)
+        private static void ValidateMovie(MovieMetadata movie)
         {
             movie.Should().NotBeNull();
             movie.Title.Should().NotBeNullOrWhiteSpace();
diff --git a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
index c8a76685d8..e0806157e9 100644
--- a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.NotificationTests
     [TestFixture]
     public class NotificationBaseFixture : TestBase
     {
-        private class TestSetting : NotificationSettingsBase<TestSetting>
+        private sealed class TestSetting : NotificationSettingsBase<TestSetting>
         {
             public override NzbDroneValidationResult Validate()
             {
@@ -22,7 +22,7 @@ public override NzbDroneValidationResult Validate()
             }
         }
 
-        private class TestNotificationWithOnDownload : NotificationBase<TestSetting>
+        private sealed class TestNotificationWithOnDownload : NotificationBase<TestSetting>
         {
             public override string Name => "TestNotification";
             public override string Link => "";
@@ -38,7 +38,7 @@ public override void OnDownload(DownloadMessage downloadMessage)
             }
         }
 
-        private class TestNotificationWithAllEvents : NotificationBase<TestSetting>
+        private sealed class TestNotificationWithAllEvents : NotificationBase<TestSetting>
         {
             public override string Name => "TestNotification";
             public override string Link => "";
@@ -99,7 +99,7 @@ public override void OnManualInteractionRequired(ManualInteractionRequiredMessag
             }
         }
 
-        private class TestNotificationWithNoEvents : NotificationBase<TestSetting>
+        private sealed class TestNotificationWithNoEvents : NotificationBase<TestSetting>
         {
             public override string Name => "TestNotification";
             public override string Link => "";
diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
index 019f7d157b..6059d6b752 100644
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -515,7 +515,7 @@ public void should_be_able_to_parse_repack(string title, bool isRepack, int vers
             result.Revision.IsRepack.Should().Be(isRepack);
         }
 
-        private void ParseAndVerifyQuality(string title, QualitySource source, bool proper, Resolution resolution, Modifier modifier = Modifier.NONE)
+        private static void ParseAndVerifyQuality(string title, QualitySource source, bool proper, Resolution resolution, Modifier modifier = Modifier.NONE)
         {
             var result = QualityParser.ParseQuality(title);
             if (resolution != Resolution.Unknown)
diff --git a/src/NzbDrone.Core/Authentication/UserService.cs b/src/NzbDrone.Core/Authentication/UserService.cs
index 2a5cb54634..8281e6c8f8 100644
--- a/src/NzbDrone.Core/Authentication/UserService.cs
+++ b/src/NzbDrone.Core/Authentication/UserService.cs
@@ -133,7 +133,7 @@ private User SetUserHashedPassword(User user, string password)
             return user;
         }
 
-        private byte[] GenerateSalt()
+        private static byte[] GenerateSalt()
         {
             var salt = new byte[SALT_SIZE];
             RandomNumberGenerator.Create().GetBytes(salt);
@@ -141,7 +141,7 @@ private byte[] GenerateSalt()
             return salt;
         }
 
-        private string GetHashedPassword(string password, byte[] salt, int iterations)
+        private static string GetHashedPassword(string password, byte[] salt, int iterations)
         {
             return Convert.ToBase64String(KeyDerivation.Pbkdf2(
                 password: password,
diff --git a/src/NzbDrone.Core/AutoTagging/SpecificationMatchesGroup.cs b/src/NzbDrone.Core/AutoTagging/SpecificationMatchesGroup.cs
index 96cd118813..b4b15f345b 100644
--- a/src/NzbDrone.Core/AutoTagging/SpecificationMatchesGroup.cs
+++ b/src/NzbDrone.Core/AutoTagging/SpecificationMatchesGroup.cs
@@ -8,7 +8,7 @@ public class SpecificationMatchesGroup
     {
         public Dictionary<IAutoTaggingSpecification, bool> Matches { get; set; }
 
-        public bool DidMatch => !(Matches.Any(m => m.Key.Required && m.Value == false) ||
-                                  Matches.All(m => m.Value == false));
+        public bool DidMatch => !(Matches.Any(m => m.Key.Required && !m.Value) ||
+                                  Matches.All(m => !m.Value));
     }
 }
diff --git a/src/NzbDrone.Core/Blocklisting/BlocklistService.cs b/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
index 33a7d9be04..c9c59f5ee9 100644
--- a/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
+++ b/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
@@ -139,7 +139,7 @@ private bool SameTorrent(Blocklist item, TorrentInfo release)
             return HasSameIndexer(item, release.Indexer);
         }
 
-        private bool HasSameIndexer(Blocklist item, string indexer)
+        private static bool HasSameIndexer(Blocklist item, string indexer)
         {
             if (item.Indexer.IsNullOrWhiteSpace())
             {
@@ -149,7 +149,7 @@ private bool HasSameIndexer(Blocklist item, string indexer)
             return item.Indexer.Equals(indexer, StringComparison.InvariantCultureIgnoreCase);
         }
 
-        private bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
+        private static bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
         {
             if (!item.PublishedDate.HasValue)
             {
@@ -160,7 +160,7 @@ private bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
                    item.PublishedDate.Value.AddMinutes(2) >= publishedDate;
         }
 
-        private bool HasSameSize(Blocklist item, long size)
+        private static bool HasSameSize(Blocklist item, long size)
         {
             if (!item.Size.HasValue)
             {
diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
index 8b3b2aaa6e..8adc774023 100644
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -326,7 +326,12 @@ public string GetValue(string key, object defaultValue, bool persist = true)
             return _cache.Get(key, () =>
                 {
                     var xDoc = LoadConfigFile();
-                    var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).Single();
+                    var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).SingleOrDefault();
+
+                    if (config == null)
+                    {
+                        return defaultValue.ToString();
+                    }
 
                     var parentContainer = config;
 
@@ -352,7 +357,12 @@ public void SetValue(string key, object value)
         {
             var valueString = value.ToString().Trim();
             var xDoc = LoadConfigFile();
-            var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).Single();
+            var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).SingleOrDefault();
+
+            if (config == null)
+            {
+                return;
+            }
 
             var parentContainer = config;
 
@@ -408,7 +418,12 @@ public void MigrateConfigFile()
         private void DeleteOldValues()
         {
             var xDoc = LoadConfigFile();
-            var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).Single();
+            var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).SingleOrDefault();
+
+            if (config == null)
+            {
+                return;
+            }
 
             var type = GetType();
             var properties = type.GetProperties();
@@ -477,7 +492,7 @@ private void SaveConfigFile(XDocument xDoc)
             }
         }
 
-        private string GenerateApiKey()
+        private static string GenerateApiKey()
         {
             return Guid.NewGuid().ToString().Replace("-", "");
         }
diff --git a/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs b/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
index e1389638fc..07198d4d23 100644
--- a/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
+++ b/src/NzbDrone.Core/CustomFormats/SpecificationMatchesGroup.cs
@@ -7,7 +7,7 @@ public class SpecificationMatchesGroup
     {
         public Dictionary<ICustomFormatSpecification, bool> Matches { get; set; }
 
-        public bool DidMatch => !(Matches.Any(m => m.Key.Required && m.Value == false) ||
-                                  Matches.All(m => m.Value == false));
+        public bool DidMatch => !(Matches.Any(m => m.Key.Required && !m.Value) ||
+                                  Matches.All(m => !m.Value));
     }
 }
diff --git a/src/NzbDrone.Core/Datastore/BasicRepository.cs b/src/NzbDrone.Core/Datastore/BasicRepository.cs
index 618999992a..77764e1bf0 100644
--- a/src/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -142,7 +142,7 @@ public IEnumerable<TModel> Get(IEnumerable<int> ids)
 
             if (result.Count != ids.Count())
             {
-                throw new ApplicationException($"Expected query to return {ids.Count()} rows but returned {result.Count}");
+                throw new DataRetrievalException($"Expected query to return {ids.Count()} rows but returned {result.Count}");
             }
 
             return result;
@@ -433,7 +433,7 @@ public virtual PagingSpec<TModel> GetPaged(PagingSpec<TModel> pagingSpec)
             return pagingSpec;
         }
 
-        protected void AddFilters(SqlBuilder builder, PagingSpec<TModel> pagingSpec)
+        protected static void AddFilters(SqlBuilder builder, PagingSpec<TModel> pagingSpec)
         {
             var filters = pagingSpec.FilterExpressions;
 
diff --git a/src/NzbDrone.Core/Datastore/Converters/AutoTagSpecificationConverter.cs b/src/NzbDrone.Core/Datastore/Converters/AutoTagSpecificationConverter.cs
index 3f237bc3f4..a8dd4b299b 100644
--- a/src/NzbDrone.Core/Datastore/Converters/AutoTagSpecificationConverter.cs
+++ b/src/NzbDrone.Core/Datastore/Converters/AutoTagSpecificationConverter.cs
@@ -77,7 +77,7 @@ public override List<IAutoTaggingSpecification> Read(ref Utf8JsonReader reader,
         }
 
         // Helper function for validating where you are in the JSON
-        private void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
+        private static void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
         {
             if (reader.TokenType != tokenType)
             {
@@ -85,7 +85,7 @@ private void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
             }
         }
 
-        private class SpecificationWrapper
+        private sealed class SpecificationWrapper
         {
             public string Type { get; set; }
             public object Body { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs b/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
index 671b951ff4..72041e6352 100644
--- a/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
+++ b/src/NzbDrone.Core/Datastore/Converters/CustomFormatSpecificationConverter.cs
@@ -76,7 +76,7 @@ public override List<ICustomFormatSpecification> Read(ref Utf8JsonReader reader,
         }
 
         // Helper function for validating where you are in the JSON
-        private void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
+        private static void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
         {
             if (reader.TokenType != tokenType)
             {
@@ -84,7 +84,7 @@ private void ValidateToken(Utf8JsonReader reader, JsonTokenType tokenType)
             }
         }
 
-        private class SpecificationWrapper
+        private sealed class SpecificationWrapper
         {
             public string Type { get; set; }
             public object Body { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/DataRetrievalException.cs b/src/NzbDrone.Core/Datastore/DataRetrievalException.cs
new file mode 100644
index 0000000000..3d7258df1a
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/DataRetrievalException.cs
@@ -0,0 +1,23 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Core.Datastore
+{
+    public class DataRetrievalException : NzbDroneException
+    {
+        public DataRetrievalException(string message, params object[] args)
+            : base(message, args)
+        {
+        }
+
+        public DataRetrievalException(string message)
+            : base(message)
+        {
+        }
+
+        public DataRetrievalException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/ExpressionVisitor.cs b/src/NzbDrone.Core/Datastore/ExpressionVisitor.cs
index 2321e631be..87acd43e8a 100644
--- a/src/NzbDrone.Core/Datastore/ExpressionVisitor.cs
+++ b/src/NzbDrone.Core/Datastore/ExpressionVisitor.cs
@@ -140,7 +140,7 @@ protected virtual Expression VisitLamda(LambdaExpression lambdaExpression)
             return lambdaExpression;
         }
 
-        private Expression VisitParameter(ParameterExpression expression)
+        private static Expression VisitParameter(ParameterExpression expression)
         {
             return expression;
         }
diff --git a/src/NzbDrone.Core/Datastore/LazyLoadedConverterFactory.cs b/src/NzbDrone.Core/Datastore/LazyLoadedConverterFactory.cs
index 4e02ef794f..9f07f423dd 100644
--- a/src/NzbDrone.Core/Datastore/LazyLoadedConverterFactory.cs
+++ b/src/NzbDrone.Core/Datastore/LazyLoadedConverterFactory.cs
@@ -29,7 +29,7 @@ public override JsonConverter CreateConverter(Type type, JsonSerializerOptions o
                 culture: null);
         }
 
-        private class LazyLoadedConverter<TChild> : JsonConverter<LazyLoaded<TChild>>
+        private sealed class LazyLoadedConverter<TChild> : JsonConverter<LazyLoaded<TChild>>
         {
             private readonly JsonConverter<TChild> _childConverter;
             private readonly Type _childType;
diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
index 3750e59631..3d34e5dee6 100644
--- a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
@@ -15,7 +15,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertConfig);
         }
 
-        private void ConvertConfig(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertConfig(IDbConnection conn, IDbTransaction tran)
         {
             using (var namingConfigCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/115_update_movie_sorttitle.cs b/src/NzbDrone.Core/Datastore/Migration/115_update_movie_sorttitle.cs
index 341c4365bf..1f77fd0e7f 100644
--- a/src/NzbDrone.Core/Datastore/Migration/115_update_movie_sorttitle.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/115_update_movie_sorttitle.cs
@@ -13,7 +13,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(SetSortTitles);
         }
 
-        private void SetSortTitles(IDbConnection conn, IDbTransaction tran)
+        private static void SetSortTitles(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/116_update_movie_sorttitle_again.cs b/src/NzbDrone.Core/Datastore/Migration/116_update_movie_sorttitle_again.cs
index 5a92860540..b3a820f646 100644
--- a/src/NzbDrone.Core/Datastore/Migration/116_update_movie_sorttitle_again.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/116_update_movie_sorttitle_again.cs
@@ -12,7 +12,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(SetSortTitles);
         }
 
-        private void SetSortTitles(IDbConnection conn, IDbTransaction tran)
+        private static void SetSortTitles(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/117_update_movie_file.cs b/src/NzbDrone.Core/Datastore/Migration/117_update_movie_file.cs
index 72d9ff8d35..77063cc359 100644
--- a/src/NzbDrone.Core/Datastore/Migration/117_update_movie_file.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/117_update_movie_file.cs
@@ -14,7 +14,7 @@ protected override void MainDbUpgrade()
             // Execute.WithConnection(SetSortTitles);
         }
 
-        private void SetSortTitles(IDbConnection conn, IDbTransaction tran)
+        private static void SetSortTitles(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/118_update_movie_slug.cs b/src/NzbDrone.Core/Datastore/Migration/118_update_movie_slug.cs
index 101751b0a0..0bbddebe0d 100644
--- a/src/NzbDrone.Core/Datastore/Migration/118_update_movie_slug.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/118_update_movie_slug.cs
@@ -12,7 +12,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(SetTitleSlug);
         }
 
-        private void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
+        private static void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/121_update_filedate_config.cs b/src/NzbDrone.Core/Datastore/Migration/121_update_filedate_config.cs
index 19410440e9..eb7b435f42 100644
--- a/src/NzbDrone.Core/Datastore/Migration/121_update_filedate_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/121_update_filedate_config.cs
@@ -14,7 +14,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(SetTitleSlug);
         }
 
-        private void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
+        private static void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs b/src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs
index d93f468620..15e59e7957 100644
--- a/src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/125_fix_imdb_unique.cs
@@ -12,7 +12,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(DeleteUniqueIndex);
         }
 
-        private void DeleteUniqueIndex(IDbConnection conn, IDbTransaction tran)
+        private static void DeleteUniqueIndex(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/126_update_qualities_and_profiles.cs b/src/NzbDrone.Core/Datastore/Migration/126_update_qualities_and_profiles.cs
index f7eff5fb5b..aa018f707e 100644
--- a/src/NzbDrone.Core/Datastore/Migration/126_update_qualities_and_profiles.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/126_update_qualities_and_profiles.cs
@@ -15,7 +15,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertProfile);
         }
 
-        private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertProfile(IDbConnection conn, IDbTransaction tran)
         {
             var updater = new ProfileUpdater125(conn, tran);
             updater.SplitQualityAppend(0, 27); // TELECINE AFTER Unknown
diff --git a/src/NzbDrone.Core/Datastore/Migration/134_add_remux_qualities_for_the_wankers.cs b/src/NzbDrone.Core/Datastore/Migration/134_add_remux_qualities_for_the_wankers.cs
index 0dfbc7f9f2..f977e8ae3b 100644
--- a/src/NzbDrone.Core/Datastore/Migration/134_add_remux_qualities_for_the_wankers.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/134_add_remux_qualities_for_the_wankers.cs
@@ -12,7 +12,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertProfile);
         }
 
-        private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertProfile(IDbConnection conn, IDbTransaction tran)
         {
             var updater = new ProfileUpdater125(conn, tran);
             updater.SplitQualityAppend(19, 31); // Remux2160p    AFTER     Bluray2160p
diff --git a/src/NzbDrone.Core/Datastore/Migration/137_add_import_exclusions_table.cs b/src/NzbDrone.Core/Datastore/Migration/137_add_import_exclusions_table.cs
index e54847d359..b9f95532cb 100644
--- a/src/NzbDrone.Core/Datastore/Migration/137_add_import_exclusions_table.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/137_add_import_exclusions_table.cs
@@ -24,7 +24,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(AddExisting);
         }
 
-        private void AddExisting(IDbConnection conn, IDbTransaction tran)
+        private static void AddExisting(IDbConnection conn, IDbTransaction tran)
         {
             using (var getSeriesCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/139_fix_indexer_baseurl.cs b/src/NzbDrone.Core/Datastore/Migration/139_fix_indexer_baseurl.cs
index 1f24b03fe5..ccea74f54a 100644
--- a/src/NzbDrone.Core/Datastore/Migration/139_fix_indexer_baseurl.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/139_fix_indexer_baseurl.cs
@@ -15,7 +15,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(RenameUrlToBaseUrl);
         }
 
-        private void RenameUrlToBaseUrl(IDbConnection conn, IDbTransaction tran)
+        private static void RenameUrlToBaseUrl(IDbConnection conn, IDbTransaction tran)
         {
             using (var cmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs b/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs
index e58cdff786..3c38c38d19 100644
--- a/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs
@@ -13,7 +13,7 @@ protected override void MainDbUpgrade()
             Alter.Table("AlternativeTitles").AlterColumn("CleanTitle").AsString().Unique();
         }
 
-        private void RemoveDuplicateAlternateTitles(IDbConnection conn, IDbTransaction tran)
+        private static void RemoveDuplicateAlternateTitles(IDbConnection conn, IDbTransaction tran)
         {
             using (var cmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/149_convert_regex_required_tags.cs b/src/NzbDrone.Core/Datastore/Migration/149_convert_regex_required_tags.cs
index 5f6259e251..043b21d3aa 100644
--- a/src/NzbDrone.Core/Datastore/Migration/149_convert_regex_required_tags.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/149_convert_regex_required_tags.cs
@@ -18,7 +18,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertExistingFormatTags);
         }
 
-        private void ConvertExistingFormatTags(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertExistingFormatTags(IDbConnection conn, IDbTransaction tran)
         {
             var updater = new CustomFormatUpdater149(conn, tran);
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/150_fix_format_tags_double_underscore.cs b/src/NzbDrone.Core/Datastore/Migration/150_fix_format_tags_double_underscore.cs
index 90408d095e..6cd28c168b 100644
--- a/src/NzbDrone.Core/Datastore/Migration/150_fix_format_tags_double_underscore.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/150_fix_format_tags_double_underscore.cs
@@ -15,7 +15,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertExistingFormatTags);
         }
 
-        private void ConvertExistingFormatTags(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertExistingFormatTags(IDbConnection conn, IDbTransaction tran)
         {
             var updater = new CustomFormatUpdater149(conn, tran);
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/156_add_download_client_priority.cs b/src/NzbDrone.Core/Datastore/Migration/156_add_download_client_priority.cs
index 3428406ebf..316511793f 100644
--- a/src/NzbDrone.Core/Datastore/Migration/156_add_download_client_priority.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/156_add_download_client_priority.cs
@@ -22,7 +22,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(InitPriorityForBackwardCompatibility);
         }
 
-        private void InitPriorityForBackwardCompatibility(IDbConnection conn, IDbTransaction tran)
+        private static void InitPriorityForBackwardCompatibility(IDbConnection conn, IDbTransaction tran)
         {
             var downloadClients = conn.Query<DownloadClients156>($"SELECT \"Id\", \"Implementation\" FROM \"DownloadClients\" WHERE \"Enable\"");
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/159_add_webrip_qualities.cs b/src/NzbDrone.Core/Datastore/Migration/159_add_webrip_qualities.cs
index 277fd99f37..bc5270f649 100644
--- a/src/NzbDrone.Core/Datastore/Migration/159_add_webrip_qualities.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/159_add_webrip_qualities.cs
@@ -16,7 +16,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertProfile);
         }
 
-        private void ConvertProfile(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertProfile(IDbConnection conn, IDbTransaction tran)
         {
             var updater = new ProfileUpdater159(conn, tran);
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/165_remove_custom_formats_from_quality_model.cs b/src/NzbDrone.Core/Datastore/Migration/165_remove_custom_formats_from_quality_model.cs
index 4dc4a2a133..e4f5495424 100644
--- a/src/NzbDrone.Core/Datastore/Migration/165_remove_custom_formats_from_quality_model.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/165_remove_custom_formats_from_quality_model.cs
@@ -80,7 +80,7 @@ private void FixPendingReleases(IDbConnection conn, IDbTransaction tran)
             conn.Execute(sql, newRows, transaction: tran);
         }
 
-        private void RemoveCustomFormatFromQuality(IDbConnection conn, IDbTransaction tran, string table)
+        private static void RemoveCustomFormatFromQuality(IDbConnection conn, IDbTransaction tran, string table)
         {
             var rows = conn.Query<QualityRow>($"SELECT \"Id\", \"Quality\" from \"{table}\"");
 
@@ -151,12 +151,12 @@ private void AddIndexerFlagsToMovieFiles(IDbConnection conn, IDbTransaction tran
             conn.Execute(updateSql, toUpdate, transaction: tran);
         }
 
-        private class ParsedMovieInfoData164 : ModelBase
+        private sealed class ParsedMovieInfoData164 : ModelBase
         {
             public ParsedMovieInfo164 ParsedMovieInfo { get; set; }
         }
 
-        private class ParsedMovieInfo164
+        private sealed class ParsedMovieInfo164
         {
             public string MovieTitle { get; set; }
             public string SimpleReleaseTitle { get; set; }
@@ -169,24 +169,24 @@ private class ParsedMovieInfo164
             public string ImdbId { get; set; }
         }
 
-        private class QualityModel164
+        private sealed class QualityModel164
         {
             public Quality164 Quality { get; set; }
             public Revision165 Revision { get; set; }
             public string HardcodedSubs { get; set; }
         }
 
-        private class Quality164
+        private sealed class Quality164
         {
             public int Id { get; set; }
         }
 
-        private class ParsedMovieInfoData165 : ModelBase
+        private sealed class ParsedMovieInfoData165 : ModelBase
         {
             public ParsedMovieInfo165 ParsedMovieInfo { get; set; }
         }
 
-        private class ParsedMovieInfo165
+        private sealed class ParsedMovieInfo165
         {
             public string MovieTitle { get; set; }
             public string SimpleReleaseTitle { get; set; }
@@ -199,37 +199,37 @@ private class ParsedMovieInfo165
             public string ImdbId { get; set; }
         }
 
-        private class BlacklistData : ModelBase
+        private sealed class BlacklistData : ModelBase
         {
             public string TorrentInfoHash { get; set; }
             public string Data { get; set; }
         }
 
-        private class MovieFileData : ModelBase
+        private sealed class MovieFileData : ModelBase
         {
             public string SceneName { get; set; }
             public string SourceTitle { get; set; }
             public string Data { get; set; }
         }
 
-        private class IndexerFlagsItem : ModelBase
+        private sealed class IndexerFlagsItem : ModelBase
         {
             public int IndexerFlags { get; set; }
         }
 
-        private class QualityRow : ModelBase
+        private sealed class QualityRow : ModelBase
         {
             public QualityModel165 Quality { get; set; }
         }
 
-        private class QualityModel165
+        private sealed class QualityModel165
         {
             public int Quality { get; set; }
             public Revision165 Revision { get; set; }
             public string HardcodedSubs { get; set; }
         }
 
-        private class Revision165
+        private sealed class Revision165
         {
             public int Version { get; set; }
             public int Real { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/166_fix_tmdb_list_config.cs b/src/NzbDrone.Core/Datastore/Migration/166_fix_tmdb_list_config.cs
index aa0b3387eb..9a9a48fae6 100644
--- a/src/NzbDrone.Core/Datastore/Migration/166_fix_tmdb_list_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/166_fix_tmdb_list_config.cs
@@ -171,14 +171,14 @@ private void FixConfig(IDbConnection conn, IDbTransaction tran)
             conn.Execute(updateSql, corrected, transaction: tran);
         }
 
-        private class ProviderDefinition166 : ModelBase
+        private sealed class ProviderDefinition166 : ModelBase
         {
             public string Implementation { get; set; }
             public string ConfigContract { get; set; }
             public string Settings { get; set; }
         }
 
-        private class TMDbSettings165
+        private sealed class TMDbSettings165
         {
             public string Link { get; set; }
             public int ListType { get; set; }
@@ -191,18 +191,18 @@ private class TMDbSettings165
             public int LanguageCode { get; set; }
         }
 
-        private class TMDbListSettings166
+        private sealed class TMDbListSettings166
         {
             public string ListId { get; set; }
         }
 
-        private class TMDbPopularSettings165
+        private sealed class TMDbPopularSettings165
         {
             public int ListType { get; set; }
             public TMDbFilterSettings165 FilterCriteria { get; set; }
         }
 
-        private class TMDbFilterSettings165
+        private sealed class TMDbFilterSettings165
         {
             public string MinVoteAverage { get; set; }
             public string MinVotes { get; set; }
@@ -212,13 +212,13 @@ private class TMDbFilterSettings165
             public int LanguageCode { get; set; }
         }
 
-        private class TMDbPopularSettings166
+        private sealed class TMDbPopularSettings166
         {
             public int TMDbListType { get; set; }
             public TMDbFilterSettings166 FilterCriteria { get; set; }
         }
 
-        private class TMDbFilterSettings166
+        private sealed class TMDbFilterSettings166
         {
             public string MinVoteAverage { get; set; }
             public string MinVotes { get; set; }
@@ -228,7 +228,7 @@ private class TMDbFilterSettings166
             public int LanguageCode { get; set; }
         }
 
-        private class TraktSettings165
+        private sealed class TraktSettings165
         {
             public string AccessToken { get; set; }
             public string RefreshToken { get; set; }
@@ -246,7 +246,7 @@ private class TraktSettings165
             public string SignIn { get; set; }
         }
 
-        private class TraktSettings166
+        private sealed class TraktSettings166
         {
             public string AccessToken { get; set; }
             public string RefreshToken { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/168_custom_format_rework.cs b/src/NzbDrone.Core/Datastore/Migration/168_custom_format_rework.cs
index 89e11b49ac..cc9bd7f48e 100644
--- a/src/NzbDrone.Core/Datastore/Migration/168_custom_format_rework.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/168_custom_format_rework.cs
@@ -114,7 +114,7 @@ private ICustomFormatSpecification InitializeSpecification(Match match)
             }
         }
 
-        private Resolution ParseResolution(string value)
+        private static Resolution ParseResolution(string value)
         {
             switch (value)
             {
@@ -133,7 +133,7 @@ private Resolution ParseResolution(string value)
             }
         }
 
-        private QualitySource ParseSource(string value)
+        private static QualitySource ParseSource(string value)
         {
             switch (value)
             {
@@ -158,7 +158,7 @@ private QualitySource ParseSource(string value)
             }
         }
 
-        private Modifier ParseModifier(string value)
+        private static Modifier ParseModifier(string value)
         {
             switch (value)
             {
@@ -177,7 +177,7 @@ private Modifier ParseModifier(string value)
             }
         }
 
-        private IndexerFlags ParseIndexerFlag(string value)
+        private static IndexerFlags ParseIndexerFlag(string value)
         {
             var flagValues = Enum.GetValues(typeof(IndexerFlags));
 
@@ -203,18 +203,18 @@ private IndexerFlags ParseIndexerFlag(string value)
             return (min, max);
         }
 
-        private string ParseString(string value, bool isRegex)
+        private static string ParseString(string value, bool isRegex)
         {
             return isRegex ? value : Regex.Escape(value);
         }
 
-        private class FormatTag167 : ModelBase
+        private sealed class FormatTag167 : ModelBase
         {
             public string Name { get; set; }
             public List<string> FormatTags { get; set; }
         }
 
-        private class Specification168 : ModelBase
+        private sealed class Specification168 : ModelBase
         {
             public List<ICustomFormatSpecification> Specifications { get; set; }
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/169_custom_format_scores.cs b/src/NzbDrone.Core/Datastore/Migration/169_custom_format_scores.cs
index 05332d905f..7b32005faa 100644
--- a/src/NzbDrone.Core/Datastore/Migration/169_custom_format_scores.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/169_custom_format_scores.cs
@@ -130,26 +130,26 @@ private void MigrateOrderToScores(IDbConnection conn, IDbTransaction tran)
             conn.Execute(sql, newRows, transaction: tran);
         }
 
-        private class Profile168 : ModelBase
+        private sealed class Profile168 : ModelBase
         {
             public int FormatCutoff { get; set; }
             public List<ProfileFormatItem168> FormatItems { get; set; }
         }
 
-        private class ProfileFormatItem168
+        private sealed class ProfileFormatItem168
         {
             public int Format { get; set; }
             public bool Allowed { get; set; }
         }
 
-        private class Profile169 : ModelBase
+        private sealed class Profile169 : ModelBase
         {
             public int MinFormatScore { get; set; }
             public int CutoffFormatScore { get; set; }
             public List<ProfileFormatItem169> FormatItems { get; set; }
         }
 
-        private class ProfileFormatItem169
+        private sealed class ProfileFormatItem169
         {
             public int Format { get; set; }
             public int Score { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/171_quality_definition_preferred_size.cs b/src/NzbDrone.Core/Datastore/Migration/171_quality_definition_preferred_size.cs
index 5f3afe280d..81e04e2306 100644
--- a/src/NzbDrone.Core/Datastore/Migration/171_quality_definition_preferred_size.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/171_quality_definition_preferred_size.cs
@@ -43,12 +43,12 @@ private void UpdateQualityDefinitions(IDbConnection conn, IDbTransaction tran)
             conn.Execute(updateSql, updated, transaction: tran);
         }
 
-        private class QualityDefinition170 : ModelBase
+        private sealed class QualityDefinition170 : ModelBase
         {
             public int? MaxSize { get; set; }
         }
 
-        private class QualityDefinition171 : ModelBase
+        private sealed class QualityDefinition171 : ModelBase
         {
             public int? PreferredSize { get; set; }
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/172_add_download_history.cs b/src/NzbDrone.Core/Datastore/Migration/172_add_download_history.cs
index c1c21240ec..6deb52ebe1 100644
--- a/src/NzbDrone.Core/Datastore/Migration/172_add_download_history.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/172_add_download_history.cs
@@ -39,7 +39,7 @@ protected override void MainDbUpgrade()
             { 9, 4 } // MovieHistoryType.DownloadIgnored -> DownloadHistoryType.DownloadIgnored
         };
 
-        private void InitialImportedDownloadHistory(IDbConnection conn, IDbTransaction tran)
+        private static void InitialImportedDownloadHistory(IDbConnection conn, IDbTransaction tran)
         {
             using (var cmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/174_email_multiple_addresses.cs b/src/NzbDrone.Core/Datastore/Migration/174_email_multiple_addresses.cs
index 145df36e2c..f0499d1aa6 100644
--- a/src/NzbDrone.Core/Datastore/Migration/174_email_multiple_addresses.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/174_email_multiple_addresses.cs
@@ -66,12 +66,12 @@ private void ChangeEmailAddressType(IDbConnection conn, IDbTransaction tran)
             conn.Execute(updateSql, corrected, transaction: tran);
         }
 
-        private class ProviderDefinition166 : ModelBase
+        private sealed class ProviderDefinition166 : ModelBase
         {
             public string Settings { get; set; }
         }
 
-        private class EmailSettings173
+        private sealed class EmailSettings173
         {
             public string Server { get; set; }
             public int Port { get; set; }
@@ -82,7 +82,7 @@ private class EmailSettings173
             public string To { get; set; }
         }
 
-        private class EmailSettings174
+        private sealed class EmailSettings174
         {
             public string Server { get; set; }
             public int Port { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/177_language_improvements.cs b/src/NzbDrone.Core/Datastore/Migration/177_language_improvements.cs
index 41f3d6c7c6..04f5a49b91 100644
--- a/src/NzbDrone.Core/Datastore/Migration/177_language_improvements.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/177_language_improvements.cs
@@ -126,7 +126,7 @@ private void FixLanguagesHistory(IDbConnection conn, IDbTransaction tran)
             conn.Execute(updateSql, corrected, transaction: tran);
         }
 
-        private class LanguageEntity177 : ModelBase
+        private sealed class LanguageEntity177 : ModelBase
         {
             public string Languages { get; set; }
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/180_fix_invalid_profile_references.cs b/src/NzbDrone.Core/Datastore/Migration/180_fix_invalid_profile_references.cs
index 113d45324f..332f44e267 100644
--- a/src/NzbDrone.Core/Datastore/Migration/180_fix_invalid_profile_references.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/180_fix_invalid_profile_references.cs
@@ -63,7 +63,7 @@ private void FixMovies(IDbConnection conn, IDbTransaction tran)
             }
         }
 
-        private List<int> GetProfileIds(IDbConnection conn)
+        private static List<int> GetProfileIds(IDbConnection conn)
         {
             return conn.Query<QualityProfile180>("SELECT \"Id\" From \"Profiles\"").Select(p => p.Id).ToList();
         }
@@ -274,13 +274,13 @@ private QualityProfile180 GetDefaultProfile(string name, List<CustomFormat180> f
             return qualityProfile;
         }
 
-        private class ProfileEntity179
+        private sealed class ProfileEntity179
         {
             public int Id { get; set; }
             public int ProfileId { get; set; }
         }
 
-        private class QualityProfile180
+        private sealed class QualityProfile180
         {
             public int Id { get; set; }
             public string Name { get; set; }
@@ -293,7 +293,7 @@ private class QualityProfile180
             public List<QualityProfileItem111> Items { get; set; }
         }
 
-        private class QualityProfileItem111
+        private sealed class QualityProfileItem111
         {
             public int Id { get; set; }
             public string Name { get; set; }
@@ -302,14 +302,14 @@ private class QualityProfileItem111
             public bool Allowed { get; set; }
         }
 
-        private class ProfileFormatItem180
+        private sealed class ProfileFormatItem180
         {
             public int Id { get; set; }
             public int Format { get; set; }
             public int Score { get; set; }
         }
 
-        private class CustomFormat180
+        private sealed class CustomFormat180
         {
             public int Id { get; set; }
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/183_download_propers_config.cs b/src/NzbDrone.Core/Datastore/Migration/183_download_propers_config.cs
index 7ce2bc1061..46d86ecfbe 100644
--- a/src/NzbDrone.Core/Datastore/Migration/183_download_propers_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/183_download_propers_config.cs
@@ -14,7 +14,7 @@ protected override void MainDbUpgrade()
             Delete.Column("PreferredTags").FromTable("Profiles");
         }
 
-        private void SetMetadataFileExtension(IDbConnection conn, IDbTransaction tran)
+        private static void SetMetadataFileExtension(IDbConnection conn, IDbTransaction tran)
         {
             using (var cmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/186_fix_tmdb_duplicates.cs b/src/NzbDrone.Core/Datastore/Migration/186_fix_tmdb_duplicates.cs
index 44761539f4..123b62f0e3 100644
--- a/src/NzbDrone.Core/Datastore/Migration/186_fix_tmdb_duplicates.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/186_fix_tmdb_duplicates.cs
@@ -18,7 +18,7 @@ protected override void MainDbUpgrade()
             Alter.Table("Movies").AlterColumn("TmdbId").AsInt32().Unique();
         }
 
-        private void FixMovies(IDbConnection conn, IDbTransaction tran)
+        private static void FixMovies(IDbConnection conn, IDbTransaction tran)
         {
             var movieRows = conn.Query<MovieEntity185>($"SELECT \"Id\", \"TmdbId\", \"Added\", \"LastInfoSync\", \"MovieFileId\" FROM \"Movies\"");
 
@@ -70,7 +70,7 @@ private void FixMovies(IDbConnection conn, IDbTransaction tran)
             }
         }
 
-        private class MovieEntity185
+        private sealed class MovieEntity185
         {
             public int Id { get; set; }
             public int TmdbId { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/187_swap_filechmod_for_folderchmod.cs b/src/NzbDrone.Core/Datastore/Migration/187_swap_filechmod_for_folderchmod.cs
index 96b50380ff..6bb896c12f 100644
--- a/src/NzbDrone.Core/Datastore/Migration/187_swap_filechmod_for_folderchmod.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/187_swap_filechmod_for_folderchmod.cs
@@ -15,7 +15,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(ConvertFileChmodToFolderChmod);
         }
 
-        private void ConvertFileChmodToFolderChmod(IDbConnection conn, IDbTransaction tran)
+        private static void ConvertFileChmodToFolderChmod(IDbConnection conn, IDbTransaction tran)
         {
             using (var getFileChmodCmd = conn.CreateCommand())
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/199_mediainfo_to_ffmpeg.cs b/src/NzbDrone.Core/Datastore/Migration/199_mediainfo_to_ffmpeg.cs
index df69accb17..ee37582350 100644
--- a/src/NzbDrone.Core/Datastore/Migration/199_mediainfo_to_ffmpeg.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/199_mediainfo_to_ffmpeg.cs
@@ -276,7 +276,7 @@ private void MigrateVideoCodec(MediaInfo198 mediaInfo, MediaInfo199 m, string sc
             }
         }
 
-        private void MigrateVideoCodecLegacy(MediaInfo198 mediaInfo, MediaInfo199 m, string sceneName)
+        private static void MigrateVideoCodecLegacy(MediaInfo198 mediaInfo, MediaInfo199 m, string sceneName)
         {
             var videoCodec = mediaInfo.VideoCodec;
 
@@ -335,7 +335,7 @@ private void MigrateVideoCodecLegacy(MediaInfo198 mediaInfo, MediaInfo199 m, str
             }
         }
 
-        private HdrFormat MigrateHdrFormat(MediaInfo198 mediaInfo)
+        private static HdrFormat MigrateHdrFormat(MediaInfo198 mediaInfo)
         {
             if (mediaInfo.VideoHdrFormatCompatibility.IsNotNullOrWhiteSpace())
             {
@@ -531,7 +531,7 @@ private void MigrateAudioCodec(MediaInfo198 mediaInfo, MediaInfo199 m)
             }
         }
 
-        private void MigrateAudioCodecLegacy(MediaInfo198 mediaInfo, MediaInfo199 m)
+        private static void MigrateAudioCodecLegacy(MediaInfo198 mediaInfo, MediaInfo199 m)
         {
             var audioFormat = mediaInfo.AudioFormat;
 
@@ -617,7 +617,7 @@ private void MigrateAudioChannelPositions(MediaInfo198 mediaInfo, MediaInfo199 m
             m.AudioChannelPositions = audioChannels.ToString();
         }
 
-        private decimal? FormatAudioChannelsFromAudioChannelPositions(MediaInfo198 mediaInfo)
+        private static decimal? FormatAudioChannelsFromAudioChannelPositions(MediaInfo198 mediaInfo)
         {
             var audioChannelPositions = mediaInfo.AudioChannelPositions;
 
@@ -676,7 +676,7 @@ private void MigrateAudioChannelPositions(MediaInfo198 mediaInfo, MediaInfo199 m
             return null;
         }
 
-        private decimal? FormatAudioChannelsFromAudioChannelPositionsText(MediaInfo198 mediaInfo)
+        private static decimal? FormatAudioChannelsFromAudioChannelPositionsText(MediaInfo198 mediaInfo)
         {
             var audioChannelPositionsTextContainer = mediaInfo.AudioChannelPositionsTextContainer;
             var audioChannelPositionsTextStream = mediaInfo.AudioChannelPositionsTextStream;
@@ -706,7 +706,7 @@ private void MigrateAudioChannelPositions(MediaInfo198 mediaInfo, MediaInfo199 m
             return null;
         }
 
-        private decimal? FormatAudioChannelsFromAudioChannels(MediaInfo198 mediaInfo)
+        private static decimal? FormatAudioChannelsFromAudioChannels(MediaInfo198 mediaInfo)
         {
             var audioChannelsContainer = mediaInfo.AudioChannelsContainer;
             var audioChannelsStream = mediaInfo.AudioChannelsStream;
@@ -742,7 +742,7 @@ private void MigrateAudioChannelPositions(MediaInfo198 mediaInfo, MediaInfo199 m
             return null;
         }
 
-        private List<string> MigrateLanguages(string mediaInfoLanguages)
+        private static List<string> MigrateLanguages(string mediaInfoLanguages)
         {
             var languages = new List<string>();
 
@@ -788,12 +788,12 @@ private List<string> MigrateLanguages(string mediaInfoLanguages)
             return languages;
         }
 
-        private string MigratePrimaries(string primary)
+        private static string MigratePrimaries(string primary)
         {
             return primary.IsNotNullOrWhiteSpace() ? primary.Replace("BT.", "bt") : primary;
         }
 
-        private string MigrateTransferCharacteristics(string transferCharacteristics)
+        private static string MigrateTransferCharacteristics(string transferCharacteristics)
         {
             if (transferCharacteristics == "PQ")
             {
diff --git a/src/NzbDrone.Core/Datastore/Migration/200_cdh_per_downloadclient.cs b/src/NzbDrone.Core/Datastore/Migration/200_cdh_per_downloadclient.cs
index cf80cc465b..e98e9cfe00 100644
--- a/src/NzbDrone.Core/Datastore/Migration/200_cdh_per_downloadclient.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/200_cdh_per_downloadclient.cs
@@ -16,7 +16,7 @@ protected override void MainDbUpgrade()
             Execute.WithConnection(MoveRemoveSettings);
         }
 
-        private void MoveRemoveSettings(IDbConnection conn, IDbTransaction tran)
+        private static void MoveRemoveSettings(IDbConnection conn, IDbTransaction tran)
         {
             var removeCompletedDownloads = false;
             var removeFailedDownloads = true;
diff --git a/src/NzbDrone.Core/Datastore/Migration/206_multiple_ratings_support.cs b/src/NzbDrone.Core/Datastore/Migration/206_multiple_ratings_support.cs
index c9cf376e46..f6e260ccc6 100644
--- a/src/NzbDrone.Core/Datastore/Migration/206_multiple_ratings_support.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/206_multiple_ratings_support.cs
@@ -72,25 +72,25 @@ private void FixRatings(IDbConnection conn, IDbTransaction tran, string table)
             conn.Execute(updateSql, corrected, transaction: tran);
         }
 
-        private class Movie205
+        private sealed class Movie205
         {
             public int Id { get; set; }
             public string Ratings { get; set; }
         }
 
-        private class Ratings205
+        private sealed class Ratings205
         {
             public int Votes { get; set; }
             public decimal Value { get; set; }
         }
 
-        private class Movie206
+        private sealed class Movie206
         {
             public int Id { get; set; }
             public string Ratings { get; set; }
         }
 
-        private class Ratings206
+        private sealed class Ratings206
         {
             public RatingChild206 Tmdb { get; set; }
             public RatingChild206 Imdb { get; set; }
@@ -98,7 +98,7 @@ private class Ratings206
             public RatingChild206 RottenTomatoes { get; set; }
         }
 
-        private class RatingChild206
+        private sealed class RatingChild206
         {
             public int Votes { get; set; }
             public decimal Value { get; set; }
diff --git a/src/NzbDrone.Core/Datastore/Migration/208_collections.cs b/src/NzbDrone.Core/Datastore/Migration/208_collections.cs
index b982e37d3e..d14d6f5f77 100644
--- a/src/NzbDrone.Core/Datastore/Migration/208_collections.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/208_collections.cs
@@ -225,13 +225,13 @@ private void MapCollections(IDbConnection conn, IDbTransaction tran)
             conn.Execute(updateSql, updatedMeta, transaction: tran);
         }
 
-        private class MovieCollection207
+        private sealed class MovieCollection207
         {
             public string Name { get; set; }
             public int TmdbId { get; set; }
         }
 
-        private class MovieCollection208
+        private sealed class MovieCollection208
         {
             public int Id { get; set; }
             public string Title { get; set; }
@@ -246,20 +246,20 @@ private class MovieCollection208
             public int TmdbId { get; set; }
         }
 
-        private class MovieMetadata208
+        private sealed class MovieMetadata208
         {
             public int Id { get; set; }
             public int CollectionTmdbId { get; set; }
             public string CollectionTitle { get; set; }
         }
 
-        private class ImportList208
+        private sealed class ImportList208
         {
             public int Id { get; set; }
             public int Monitor { get; set; }
         }
 
-        private class TmdbCollectionSettings206
+        private sealed class TmdbCollectionSettings206
         {
             public string CollectionId { get; set; }
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/InvalidDatabaseSchemaException.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/InvalidDatabaseSchemaException.cs
new file mode 100644
index 0000000000..4d1d8b90b8
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/InvalidDatabaseSchemaException.cs
@@ -0,0 +1,23 @@
+using System;
+using NzbDrone.Common.Exceptions;
+
+namespace NzbDrone.Core.Datastore.Migration.Framework
+{
+    public class InvalidDatabaseSchemaException : NzbDroneException
+    {
+        public InvalidDatabaseSchemaException(string message, params object[] args)
+            : base(message, args)
+        {
+        }
+
+        public InvalidDatabaseSchemaException(string message)
+            : base(message)
+        {
+        }
+
+        public InvalidDatabaseSchemaException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSQLiteProcessor.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSQLiteProcessor.cs
index 9acb0ec7cd..c22f821f1e 100644
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSQLiteProcessor.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneSQLiteProcessor.cs
@@ -38,7 +38,7 @@ public override void Process(AlterColumnExpression expression)
 
             if (columnIndex == -1)
             {
-                throw new ApplicationException($"Column {expression.Column.Name} does not exist on table {expression.TableName}.");
+                throw new InvalidDatabaseSchemaException($"Column {expression.Column.Name} does not exist on table {expression.TableName}.");
             }
 
             columnDefinitions[columnIndex] = expression.Column;
@@ -57,7 +57,7 @@ public override void Process(AlterDefaultConstraintExpression expression)
 
             if (columnIndex == -1)
             {
-                throw new ApplicationException($"Column {expression.ColumnName} does not exist on table {expression.TableName}.");
+                throw new InvalidDatabaseSchemaException($"Column {expression.ColumnName} does not exist on table {expression.TableName}.");
             }
 
             var changedColumn = columnDefinitions[columnIndex];
@@ -87,7 +87,7 @@ public override void Process(DeleteColumnExpression expression)
 
             if (columnsToRemove.Any())
             {
-                throw new ApplicationException($"Column {columnsToRemove.First()} does not exist on table {expression.TableName}.");
+                throw new InvalidDatabaseSchemaException($"Column {columnsToRemove.First()} does not exist on table {expression.TableName}.");
             }
 
             ProcessAlterTable(tableDefinition);
@@ -103,12 +103,12 @@ public override void Process(RenameColumnExpression expression)
 
             if (columnIndex == -1)
             {
-                throw new ApplicationException($"Column {expression.OldName} does not exist on table {expression.TableName}.");
+                throw new InvalidDatabaseSchemaException($"Column {expression.OldName} does not exist on table {expression.TableName}.");
             }
 
             if (columnDefinitions.Any(c => c.Name == expression.NewName))
             {
-                throw new ApplicationException($"Column {expression.NewName} already exists on table {expression.TableName}.");
+                throw new InvalidDatabaseSchemaException($"Column {expression.NewName} already exists on table {expression.TableName}.");
             }
 
             oldColumnDefinitions[columnIndex] = (ColumnDefinition)columnDefinitions[columnIndex].Clone();
diff --git a/src/NzbDrone.Core/Datastore/SqlBuilder.cs b/src/NzbDrone.Core/Datastore/SqlBuilder.cs
index 8febd5b6a8..262b83888c 100644
--- a/src/NzbDrone.Core/Datastore/SqlBuilder.cs
+++ b/src/NzbDrone.Core/Datastore/SqlBuilder.cs
@@ -131,14 +131,14 @@ private void ResolveSql()
             }
         }
 
-        private class Clause
+        private sealed class Clause
         {
             public string Sql { get; set; }
             public object Parameters { get; set; }
             public bool IsInclusive { get; set; }
         }
 
-        private class Clauses : List<Clause>
+        private sealed class Clauses : List<Clause>
         {
             private readonly string _joiner;
             private readonly string _prefix;
diff --git a/src/NzbDrone.Core/Datastore/WhereBuilderPostgres.cs b/src/NzbDrone.Core/Datastore/WhereBuilderPostgres.cs
index 91f910c9e3..7f1c2c5d1d 100644
--- a/src/NzbDrone.Core/Datastore/WhereBuilderPostgres.cs
+++ b/src/NzbDrone.Core/Datastore/WhereBuilderPostgres.cs
@@ -134,7 +134,7 @@ protected override Expression VisitConstant(ConstantExpression expression)
             return expression;
         }
 
-        private bool TryGetConstantValue(Expression expression, out object result)
+        private static bool TryGetConstantValue(Expression expression, out object result)
         {
             result = null;
 
@@ -207,7 +207,7 @@ private bool TryGetRightValue(Expression expression, out object value)
             return false;
         }
 
-        private object GetFieldValue(object entity, MemberInfo member)
+        private static object GetFieldValue(object entity, MemberInfo member)
         {
             if (member.MemberType == MemberTypes.Field)
             {
diff --git a/src/NzbDrone.Core/Datastore/WhereBuilderSqlite.cs b/src/NzbDrone.Core/Datastore/WhereBuilderSqlite.cs
index 8725361e98..5e906c2a80 100644
--- a/src/NzbDrone.Core/Datastore/WhereBuilderSqlite.cs
+++ b/src/NzbDrone.Core/Datastore/WhereBuilderSqlite.cs
@@ -134,7 +134,7 @@ protected override Expression VisitConstant(ConstantExpression expression)
             return expression;
         }
 
-        private bool TryGetConstantValue(Expression expression, out object result)
+        private static bool TryGetConstantValue(Expression expression, out object result)
         {
             result = null;
 
@@ -207,7 +207,7 @@ private bool TryGetRightValue(Expression expression, out object value)
             return false;
         }
 
-        private object GetFieldValue(object entity, MemberInfo member)
+        private static object GetFieldValue(object entity, MemberInfo member)
         {
             if (member.MemberType == MemberTypes.Field)
             {
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
index 712696eb15..6d525f21b0 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@@ -43,7 +43,7 @@ public int Compare(DownloadDecision x, DownloadDecision y)
             return comparers.Select(comparer => comparer(x, y)).FirstOrDefault(result => result != 0);
         }
 
-        private int CompareBy<TSubject, TValue>(TSubject left, TSubject right, Func<TSubject, TValue> funcValue)
+        private static int CompareBy<TSubject, TValue>(TSubject left, TSubject right, Func<TSubject, TValue> funcValue)
             where TValue : IComparable<TValue>
         {
             var leftValue = funcValue(left);
@@ -58,7 +58,7 @@ private int CompareByReverse<TSubject, TValue>(TSubject left, TSubject right, Fu
             return CompareBy(left, right, funcValue) * -1;
         }
 
-        private int CompareAll(params int[] comparers)
+        private static int CompareAll(params int[] comparers)
         {
             return comparers.Select(comparer => comparer).FirstOrDefault(result => result != 0);
         }
@@ -186,7 +186,7 @@ private int CompareSize(DownloadDecision x, DownloadDecision y)
             return sizeCompare;
         }
 
-        private int ScoreFlags(IndexerFlags flags)
+        private static int ScoreFlags(IndexerFlags flags)
         {
             var flagValues = Enum.GetValues(typeof(IndexerFlags));
 
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
index 8ef1229616..c50d55ecfd 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
@@ -72,7 +72,7 @@ private IEnumerable<DownloadDecision> GetDecisions(List<ReleaseInfo> reports, bo
             {
                 DownloadDecision decision = null;
                 _logger.ProgressTrace("Processing release {0}/{1}", reportNumber, reports.Count);
-                _logger.Debug("Processing release '{0}' from '{1}'", report.Title, report.Indexer);
+                _logger.Debug("Processing release '{0}' from '{1}'", report.Title.SanitizeForLog(), report.Indexer.SanitizeForLog());
 
                 try
                 {
@@ -94,7 +94,7 @@ private IEnumerable<DownloadDecision> GetDecisions(List<ReleaseInfo> reports, bo
                             remoteMovie.CustomFormats = _formatCalculator.ParseCustomFormat(remoteMovie, remoteMovie.Release.Size);
                             remoteMovie.CustomFormatScore = remoteMovie?.Movie?.QualityProfile?.CalculateCustomFormatScore(remoteMovie.CustomFormats) ?? 0;
 
-                            _logger.Trace("Custom Format Score of '{0}' [{1}] calculated for '{2}'", remoteMovie.CustomFormatScore, remoteMovie.CustomFormats?.ConcatToString(), report.Title);
+                            _logger.Trace("Custom Format Score of '{0}' [{1}] calculated for '{2}'", remoteMovie.CustomFormatScore, remoteMovie.CustomFormats?.ConcatToString(), report.Title.SanitizeForLog());
 
                             remoteMovie.DownloadAllowed = remoteMovie.Movie != null;
                             decision = GetDecisionForReport(remoteMovie, searchCriteria);
@@ -159,11 +159,11 @@ private IEnumerable<DownloadDecision> GetDecisions(List<ReleaseInfo> reports, bo
 
                     if (decision.Rejections.Any())
                     {
-                        _logger.Debug("Release '{0}' from '{1}' rejected for the following reasons: {2}", report.Title, report.Indexer, string.Join(", ", decision.Rejections));
+                        _logger.Debug("Release '{0}' from '{1}' rejected for the following reasons: {2}", report.Title.SanitizeForLog(), report.Indexer.SanitizeForLog(), string.Join(", ", decision.Rejections));
                     }
                     else
                     {
-                        _logger.Debug("Release '{0}' from '{1}' accepted", report.Title, report.Indexer);
+                        _logger.Debug("Release '{0}' from '{1}' accepted", report.Title.SanitizeForLog(), report.Indexer.SanitizeForLog());
                     }
 
                     yield return decision;
@@ -209,7 +209,7 @@ private DownloadRejection EvaluateSpec(IDownloadDecisionEngineSpecification spec
             {
                 e.Data.Add("report", remoteMovie.Release.ToJson());
                 e.Data.Add("parsed", remoteMovie.ParsedMovieInfo.ToJson());
-                _logger.Error(e, "Couldn't evaluate decision on {0}, with spec: {1}", remoteMovie.Release.Title, spec.GetType().Name);
+                _logger.Error(e, "Couldn't evaluate decision on {0}, with spec: {1}", remoteMovie.Release.Title.SanitizeForLog(), spec.GetType().Name);
                 return new DownloadRejection(DownloadRejectionReason.DecisionError, $"{spec.GetType().Name}: {e.Message}");
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/BlocklistSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/BlocklistSpecification.cs
index 8d59181597..fdc747fa2e 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/BlocklistSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/BlocklistSpecification.cs
@@ -1,4 +1,5 @@
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -23,7 +24,7 @@ public DownloadSpecDecision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBas
         {
             if (_blocklistService.Blocklisted(subject.Movie.Id, subject.Release))
             {
-                _logger.Debug("{0} is blocklisted, rejecting.", subject.Release.Title);
+                _logger.Debug("{0} is blocklisted, rejecting.", subject.Release.Title.SanitizeForLog());
                 return DownloadSpecDecision.Reject(DownloadRejectionReason.Blocklisted, "Release is blocklisted");
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
index 96f14bcfde..282365d58a 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
@@ -1,4 +1,5 @@
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
@@ -27,13 +28,13 @@ public virtual DownloadSpecDecision IsSatisfiedBy(RemoteMovie subject, SearchCri
 
             if (subject.Release.DownloadProtocol == DownloadProtocol.Usenet && !delayProfile.EnableUsenet)
             {
-                _logger.Debug("[{0}] Usenet is not enabled for this movie", subject.Release.Title);
+                _logger.Debug("[{0}] Usenet is not enabled for this movie", subject.Release.Title.SanitizeForLog());
                 return DownloadSpecDecision.Reject(DownloadRejectionReason.ProtocolDisabled, "Usenet is not enabled for this movie");
             }
 
             if (subject.Release.DownloadProtocol == DownloadProtocol.Torrent && !delayProfile.EnableTorrent)
             {
-                _logger.Debug("[{0}] Torrent is not enabled for this movie", subject.Release.Title);
+                _logger.Debug("[{0}] Torrent is not enabled for this movie", subject.Release.Title.SanitizeForLog());
                 return DownloadSpecDecision.Reject(DownloadRejectionReason.ProtocolDisabled, "Torrent is not enabled for this movie");
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/IndexerTagSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/IndexerTagSpecification.cs
index ff391b96e9..bd970c36a3 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/IndexerTagSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/IndexerTagSpecification.cs
@@ -45,7 +45,7 @@ public virtual DownloadSpecDecision IsSatisfiedBy(RemoteMovie subject, SearchCri
 
             if (indexerTags.Any() && indexerTags.Intersect(subject.Movie.Tags).Empty())
             {
-                _logger.Debug("Indexer {0} has tags. None of these are present on movie {1}. Rejecting", subject.Release.Indexer, subject.Movie);
+                _logger.Debug("Indexer {0} has tags. None of these are present on movie {1}. Rejecting", subject.Release.Indexer.SanitizeForLog(), subject.Movie);
 
                 return DownloadSpecDecision.Reject(DownloadRejectionReason.NoMatchingTag, "Movie tags do not match any of the indexer tags");
             }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
index 5fc5152f15..c10dc3948c 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
@@ -139,7 +139,7 @@ public bool QualityCutoffNotMet(QualityProfile profile, QualityModel currentQual
             return false;
         }
 
-        private bool CustomFormatCutoffNotMet(QualityProfile profile, List<CustomFormat> currentFormats)
+        private static bool CustomFormatCutoffNotMet(QualityProfile profile, List<CustomFormat> currentFormats)
         {
             var score = profile.CalculateCustomFormatScore(currentFormats);
             var cutoff = profile.UpgradeAllowed ? profile.CutoffFormatScore : profile.MinFormatScore;
diff --git a/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs b/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs
index a7e11041d4..ed9ae214c4 100644
--- a/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs
+++ b/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs
@@ -261,7 +261,7 @@ private ValidationFailure TestConnection()
             return null;
         }
 
-        private string GetOutputPath(Aria2Status torrent)
+        private static string GetOutputPath(Aria2Status torrent)
         {
             if (torrent.Files.Length == 1)
             {
diff --git a/src/NzbDrone.Core/Download/Clients/Aria2/Aria2Proxy.cs b/src/NzbDrone.Core/Download/Clients/Aria2/Aria2Proxy.cs
index 52f5a1bdea..0141d496f0 100644
--- a/src/NzbDrone.Core/Download/Clients/Aria2/Aria2Proxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Aria2/Aria2Proxy.cs
@@ -146,7 +146,7 @@ public bool RemoveCompletedTorrent(Aria2Settings settings, string gid)
             return result == "OK";
         }
 
-        private string GetToken(Aria2Settings settings)
+        private static string GetToken(Aria2Settings settings)
         {
             return $"token:{settings?.SecretToken}";
         }
diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs
index 98f35d3fc3..36ec5dbd04 100644
--- a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs
@@ -294,7 +294,7 @@ private JsonRpcResponse<TResult> ExecuteRequest<TResult>(JsonRpcRequestBuilder r
             }
         }
 
-        private void VerifyResponse<TResult>(JsonRpcResponse<TResult> response)
+        private static void VerifyResponse<TResult>(JsonRpcResponse<TResult> response)
         {
             if (response.Error != null)
             {
@@ -368,7 +368,7 @@ private void ConnectDaemon(JsonRpcRequestBuilder requestBuilder)
             throw new DownloadClientException("Failed to connect to Deluge daemon.");
         }
 
-        private DelugeTorrent[] GetTorrents(DelugeUpdateUIResult result)
+        private static DelugeTorrent[] GetTorrents(DelugeUpdateUIResult result)
         {
             if (result.Torrents == null)
             {
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs
index c1507aa2e9..7fe65d5415 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs
@@ -54,7 +54,7 @@ public DiskStationProxyBase(DiskStationApi apiType,
             _apiName = apiName;
         }
 
-        private string GenerateSessionCacheKey(DownloadStationSettings settings)
+        private static string GenerateSessionCacheKey(DownloadStationSettings settings)
         {
             return $"{settings.Username}@{settings.Host}:{settings.Port}";
         }
@@ -201,7 +201,7 @@ private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskSt
             return requestBuilder;
         }
 
-        private string GenerateInfoCacheKey(DownloadStationSettings settings, DiskStationApi api)
+        private static string GenerateInfoCacheKey(DownloadStationSettings settings, DiskStationApi api)
         {
             return $"{settings.Host}:{settings.Port}->{api}";
         }
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxyV2.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxyV2.cs
index 6ebb4a7caa..c7627986bc 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxyV2.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxyV2.cs
@@ -109,7 +109,12 @@ public IEnumerable<DownloadStationTask> GetTasks(DownloadStationSettings setting
                     {
                         foreach (var task in response.Data.Task)
                         {
-                            var taskTransfer = responseTransfer.Data.Task.Where(t => t.Id == task.Id).First();
+                            var taskTransfer = responseTransfer.Data.Task.FirstOrDefault(t => t.Id == task.Id);
+
+                            if (taskTransfer == null)
+                            {
+                                continue;
+                            }
 
                             var combinedTask = new DownloadStationTask
                             {
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
index 3f89d3e31d..b43453790f 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
@@ -215,7 +215,7 @@ protected override void Test(List<ValidationFailure> failures)
             failures.AddIfNotNull(TestGetTorrents());
         }
 
-        protected bool IsFinished(DownloadStationTask torrent)
+        protected static bool IsFinished(DownloadStationTask torrent)
         {
             return torrent.Status == DownloadStationTaskStatus.Finished;
         }
@@ -293,7 +293,7 @@ protected long GetRemainingSize(DownloadStationTask torrent)
             return TimeSpan.FromSeconds(remainingSize / downloadSpeed);
         }
 
-        protected double? GetSeedRatio(DownloadStationTask torrent)
+        protected static double? GetSeedRatio(DownloadStationTask torrent)
         {
             var downloaded = torrent.Additional.Transfer["size_downloaded"].ParseInt64();
             var uploaded = torrent.Additional.Transfer["size_uploaded"].ParseInt64();
@@ -427,12 +427,12 @@ protected ValidationFailure TestGetTorrents()
             }
         }
 
-        protected string ParseDownloadId(string id)
+        protected static string ParseDownloadId(string id)
         {
             return id.Split(':')[1];
         }
 
-        protected string CreateDownloadId(string id, string hashedSerialNumber)
+        protected static string CreateDownloadId(string id, string hashedSerialNumber)
         {
             return $"{hashedSerialNumber}:{id}";
         }
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
index 0ac81700de..63220c3309 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
@@ -382,7 +382,7 @@ protected long GetDownloadSpeed(DownloadStationTask task)
             return Math.Max(downloadSpeed, 0);
         }
 
-        protected TimeSpan? GetRemainingTime(long remainingSize, long downloadSpeed)
+        protected static TimeSpan? GetRemainingTime(long remainingSize, long downloadSpeed)
         {
             if (downloadSpeed > 0)
             {
@@ -407,12 +407,12 @@ protected ValidationFailure TestGetNZB()
             }
         }
 
-        protected string ParseDownloadId(string id)
+        protected static string ParseDownloadId(string id)
         {
             return id.Split(':')[1];
         }
 
-        protected string CreateDownloadId(string id, string hashedSerialNumber)
+        protected static string CreateDownloadId(string id, string hashedSerialNumber)
         {
             return $"{hashedSerialNumber}:{id}";
         }
diff --git a/src/NzbDrone.Core/Download/Clients/Flood/FloodProxy.cs b/src/NzbDrone.Core/Download/Clients/Flood/FloodProxy.cs
index 20a53da788..78e5869b8b 100644
--- a/src/NzbDrone.Core/Download/Clients/Flood/FloodProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Flood/FloodProxy.cs
@@ -35,7 +35,7 @@ public FloodProxy(IHttpClient httpClient, ICacheManager cacheManager, Logger log
             _authCookieCache = cacheManager.GetCache<Dictionary<string, string>>(GetType(), "authCookies");
         }
 
-        private string BuildUrl(FloodSettings settings)
+        private static string BuildUrl(FloodSettings settings)
         {
             return $"{(settings.UseSsl ? "https://" : "http://")}{settings.Host}:{settings.Port}/{settings.UrlBase}";
         }
diff --git a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs
index ae952e2b9d..0a2a9dd2d1 100644
--- a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs
@@ -40,7 +40,7 @@ public void Authenticate(FreeboxDownloadSettings settings)
 
             var response = ProcessRequest<FreeboxLogin>(request, settings);
 
-            if (response.Result.LoggedIn == false)
+            if (!response.Result.LoggedIn)
             {
                 throw new DownloadClientAuthenticationException("Not logged");
             }
@@ -87,7 +87,7 @@ public void DeleteTask(string id, bool deleteData, FreeboxDownloadSettings setti
         {
             var uri = "/downloads/" + id;
 
-            if (deleteData == true)
+            if (deleteData)
             {
                 uri += "/erase";
             }
@@ -211,7 +211,7 @@ private HttpRequestBuilder BuildRequest(FreeboxDownloadSettings settings, bool a
 
             requestBuilder.Headers.ContentType = "application/json";
 
-            if (authentication == true)
+            if (authentication)
             {
                 requestBuilder.SetHeader("X-Fbx-App-Auth", GetSessionToken(requestBuilder, settings));
             }
diff --git a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
index 6a0df2dab2..a7aa14d3a5 100644
--- a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
+++ b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
@@ -221,7 +221,7 @@ private bool ToBeQueuedFirst(RemoteMovie remoteMovie)
             return false;
         }
 
-        private double? GetSeedRatio(RemoteMovie remoteMovie)
+        private static double? GetSeedRatio(RemoteMovie remoteMovie)
         {
             if (remoteMovie.SeedConfiguration == null || remoteMovie.SeedConfiguration.Ratio == null)
             {
diff --git a/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs b/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs
index 607e936bfb..1df95603c5 100644
--- a/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs
@@ -158,7 +158,7 @@ private HadoukenTorrent MapTorrent(object[] item)
             return torrent;
         }
 
-        private HadoukenTorrentState ParseState(int state)
+        private static HadoukenTorrentState ParseState(int state)
         {
             if ((state & 1) == 1)
             {
diff --git a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs
index cec43775ab..4d9b1e2580 100644
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs
@@ -113,7 +113,7 @@ public List<NzbVortexFile> GetFiles(int id, NzbVortexSettings settings)
             return response.Files;
         }
 
-        private HttpRequestBuilder BuildRequest(NzbVortexSettings settings)
+        private static HttpRequestBuilder BuildRequest(NzbVortexSettings settings)
         {
             var baseUrl = HttpRequestBuilder.BuildBaseUrl(true, settings.Host, settings.Port, settings.UrlBase);
             baseUrl = HttpUri.CombinePath(baseUrl, "api");
diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
index fc4cd2ac38..49ce267f2d 100644
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
@@ -347,7 +347,7 @@ private ValidationFailure TestSettings()
         // Javascript doesn't support 64 bit integers natively so json officially doesn't either.
         // NzbGet api thus sends it in two 32 bit chunks. Here we join the two chunks back together.
         // Simplified decimal example: "42" splits into "4" and "2". To join them I shift (<<) the "4" 1 digit to the left = "40". combine it with "2". which becomes "42" again.
-        private long MakeInt64(uint high, uint low)
+        private static long MakeInt64(uint high, uint low)
         {
             long result = high;
 
diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
index 68c74b8974..3aa0fdcd95 100644
--- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
+++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
@@ -50,10 +50,10 @@ public override async Task<string> Download(RemoteMovie remoteMovie, IIndexer in
             // Save to the Pneumatic directory (The user will need to ensure its accessible by XBMC)
             var nzbFile = Path.Combine(Settings.NzbFolder, title + ".nzb");
 
-            _logger.Debug("Downloading NZB from: {0} to: {1}", url, nzbFile);
+            _logger.Debug("Downloading NZB from: {0} to: {1}", url.SanitizeForLog(), nzbFile.SanitizeForLog());
             await _httpClient.DownloadFileAsync(url, nzbFile);
 
-            _logger.Debug("NZB Download succeeded, saved to: {0}", nzbFile);
+            _logger.Debug("NZB Download succeeded, saved to: {0}", nzbFile.SanitizeForLog());
 
             var strmFile = WriteStrmFile(title, nzbFile);
 
diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
index f5c9fe450d..e11fcfe997 100644
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
@@ -23,7 +23,7 @@ public class QBittorrent : TorrentClientBase<QBittorrentSettings>
         private readonly IQBittorrentProxySelector _proxySelector;
         private readonly ICached<SeedingTimeCacheEntry> _seedingTimeCache;
 
-        private class SeedingTimeCacheEntry
+        private sealed class SeedingTimeCacheEntry
         {
             public DateTime LastFetched { get; set; }
             public long SeedingTime { get; set; }
@@ -409,7 +409,7 @@ public override DownloadClientInfo GetStatus()
             };
         }
 
-        private bool RemovesCompletedDownloads(QBittorrentPreferences config)
+        private static bool RemovesCompletedDownloads(QBittorrentPreferences config)
         {
             var minimumRetention = 60 * 24 * 14; // 14 days in minutes
             return (config.MaxRatioEnabled || (config.MaxSeedingTimeEnabled && config.MaxSeedingTime < minimumRetention)) && (config.MaxRatioAction == QBittorrentMaxRatioAction.Remove || config.MaxRatioAction == QBittorrentMaxRatioAction.DeleteFiles);
@@ -610,7 +610,7 @@ private ValidationFailure TestGetTorrents()
             return null;
         }
 
-        protected TimeSpan? GetRemainingTime(QBittorrentTorrent torrent)
+        protected static TimeSpan? GetRemainingTime(QBittorrentTorrent torrent)
         {
             if (torrent.Eta < 0 || torrent.Eta > 365 * 24 * 3600)
             {
@@ -715,7 +715,7 @@ protected bool HasReachedSeedingTimeLimit(QBittorrentTorrent torrent, QBittorren
             return false;
         }
 
-        protected bool HasReachedInactiveSeedingTimeLimit(QBittorrentTorrent torrent, QBittorrentPreferences config)
+        protected static bool HasReachedInactiveSeedingTimeLimit(QBittorrentTorrent torrent, QBittorrentPreferences config)
         {
             long inactiveSeedingTimeLimit;
 
diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs
index 369819d676..99ee21347b 100644
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs
@@ -223,7 +223,7 @@ public Dictionary<string, QBittorrentLabel> GetLabels(QBittorrentSettings settin
             return Json.Deserialize<Dictionary<string, QBittorrentLabel>>(ProcessRequest(request, settings));
         }
 
-        private void AddTorrentSeedingFormParameters(HttpRequestBuilder request, TorrentSeedConfiguration seedConfiguration, bool always = false)
+        private static void AddTorrentSeedingFormParameters(HttpRequestBuilder request, TorrentSeedConfiguration seedConfiguration, bool always = false)
         {
             var ratioLimit = seedConfiguration.Ratio.HasValue ? seedConfiguration.Ratio : -2;
             var seedingTimeLimit = seedConfiguration.SeedTime.HasValue ? (long)seedConfiguration.SeedTime.Value.TotalMinutes : -2;
diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
index 02e8a17ef1..c85d1cf68d 100644
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -331,7 +331,7 @@ private bool HasVersion(int major, int minor, int patch = 0)
             return true;
         }
 
-        private Version ParseVersion(string version)
+        private static Version ParseVersion(string version)
         {
             if (version.IsNullOrWhiteSpace())
             {
@@ -520,7 +520,7 @@ private ValidationFailure TestCategory()
             return null;
         }
 
-        private bool ContainsCategory(IEnumerable<string> categories, string category)
+        private static bool ContainsCategory(IEnumerable<string> categories, string category)
         {
             if (categories == null || categories.Empty())
             {
@@ -535,7 +535,7 @@ private bool ContainsCategory(IEnumerable<string> categories, string category)
             return categories.Contains(category);
         }
 
-        private bool RemovesCompletedDownloads(SabnzbdConfig config)
+        private static bool RemovesCompletedDownloads(SabnzbdConfig config)
         {
             var retention = config.Misc.history_retention;
             var option = config.Misc.history_retention_option;
@@ -573,7 +573,7 @@ private bool RemovesCompletedDownloads(SabnzbdConfig config)
             return retention != "0";
         }
 
-        private bool ValidatePath(DownloadClientItem downloadClientItem)
+        private static bool ValidatePath(DownloadClientItem downloadClientItem)
         {
             var downloadItemOutputPath = downloadClientItem.OutputPath;
 
diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
index b5edd8bec1..ba062a5765 100644
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
@@ -219,7 +219,7 @@ private string ProcessRequest(HttpRequestBuilder requestBuilder, SabnzbdSettings
             return response.Content;
         }
 
-        private void CheckForError(HttpResponse response)
+        private static void CheckForError(HttpResponse response)
         {
             if (!Json.TryDeserialize<SabnzbdJsonError>(response.Content, out var result))
             {
diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
index 96e1c94ca4..c10de62e29 100644
--- a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
+++ b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
@@ -142,7 +142,7 @@ public override IEnumerable<DownloadClientItem> GetItems()
             return items;
         }
 
-        protected bool HasReachedSeedLimit(TransmissionTorrent torrent, double? ratio, Lazy<TransmissionConfig> config)
+        protected static bool HasReachedSeedLimit(TransmissionTorrent torrent, double? ratio, Lazy<TransmissionConfig> config)
         {
             var isStopped = torrent.Status == TransmissionTorrentStatus.Stopped;
             var isSeeding = torrent.Status == TransmissionTorrentStatus.Seeding;
diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs
index ce5f720249..b79efa9624 100644
--- a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs
@@ -242,7 +242,7 @@ private TransmissionResponse GetTorrentStatus(IEnumerable<string> hashStrings, T
             return result;
         }
 
-        private string GetBaseUrl(TransmissionSettings settings)
+        private static string GetBaseUrl(TransmissionSettings settings)
         {
             return HttpRequestBuilder.BuildBaseUrl(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase);
         }
diff --git a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentProxy.cs b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentProxy.cs
index 00f0ede064..4193479cbc 100644
--- a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentProxy.cs
@@ -163,7 +163,7 @@ public bool HasHashTorrent(string hash, RTorrentSettings settings)
             }
         }
 
-        private string[] GetCommands(string label, RTorrentPriority priority, string directory)
+        private static string[] GetCommands(string label, RTorrentPriority priority, string directory)
         {
             var result = new List<string>();
 
diff --git a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
index 36257bd991..5c2ee50a61 100644
--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
@@ -187,7 +187,7 @@ public void SetState(string hash, UTorrentState state, UTorrentSettings settings
             ProcessRequest(requestBuilder, settings);
         }
 
-        private HttpRequestBuilder BuildRequest(UTorrentSettings settings)
+        private static HttpRequestBuilder BuildRequest(UTorrentSettings settings)
         {
             var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
                 .Resource("/gui/")
diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index 76507ee272..4b926c77d0 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -282,7 +282,7 @@ private void SetImportItem(TrackedDownload trackedDownload)
             trackedDownload.ImportItem = _provideImportItemService.ProvideImportItem(trackedDownload.DownloadItem, trackedDownload.ImportItem);
         }
 
-        private bool ValidatePath(TrackedDownload trackedDownload)
+        private static bool ValidatePath(TrackedDownload trackedDownload)
         {
             var downloadItemOutputPath = trackedDownload.ImportItem.OutputPath;
 
diff --git a/src/NzbDrone.Core/Download/DownloadExtractionService.cs b/src/NzbDrone.Core/Download/DownloadExtractionService.cs
index 26b8aa09ab..1de77e577f 100644
--- a/src/NzbDrone.Core/Download/DownloadExtractionService.cs
+++ b/src/NzbDrone.Core/Download/DownloadExtractionService.cs
@@ -132,7 +132,7 @@ private string ExtractArchivesInFolder(string folderPath)
             return folderPath;
         }
 
-        private bool IsPartOfMultiVolumeArchive(string path)
+        private static bool IsPartOfMultiVolumeArchive(string path)
         {
             var extension = Path.GetExtension(path);
 
@@ -146,7 +146,7 @@ private bool IsPartOfMultiVolumeArchive(string path)
             if (path.Contains(".part") && extension.Equals(".rar", StringComparison.OrdinalIgnoreCase))
             {
                 var filename = Path.GetFileNameWithoutExtension(path);
-                return filename.EndsWith(".part1", StringComparison.OrdinalIgnoreCase) == false;
+                return !filename.EndsWith(".part1", StringComparison.OrdinalIgnoreCase);
             }
 
             return false;
@@ -170,7 +170,7 @@ private void DeleteArchiveWithParts(string archivePath)
             _diskProvider.DeleteFile(archivePath);
         }
 
-        private bool IsArchivePartFile(string filePath, string baseName)
+        private static bool IsArchivePartFile(string filePath, string baseName)
         {
             var fileName = Path.GetFileNameWithoutExtension(filePath);
             var extension = Path.GetExtension(filePath);
diff --git a/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs b/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
index aba0672f2a..8836fd10cb 100644
--- a/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
+++ b/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
@@ -20,7 +20,7 @@ public class DownloadSeedConfigProvider : IDownloadSeedConfigProvider
         private readonly ISeedConfigProvider _indexerSeedConfigProvider;
         private readonly IDownloadHistoryService _downloadHistoryService;
 
-        private class CachedSeedConfiguration
+        private sealed class CachedSeedConfiguration
         {
             public int IndexerId { get; set; }
             public bool Movie { get; set; }
diff --git a/src/NzbDrone.Core/Download/DownloadService.cs b/src/NzbDrone.Core/Download/DownloadService.cs
index e9741f4305..f8ba334aec 100644
--- a/src/NzbDrone.Core/Download/DownloadService.cs
+++ b/src/NzbDrone.Core/Download/DownloadService.cs
@@ -137,7 +137,7 @@ private async Task DownloadReport(RemoteMovie remoteMovie, IDownloadClient downl
                 movieGrabbedEvent.DownloadId = downloadClientId;
             }
 
-            _logger.ProgressInfo("Report for {0} ({1}) sent to {2} from indexer {3}. {4}", remoteMovie.Movie.Title, remoteMovie.Movie.Year, downloadClient.Definition.Name, remoteMovie.Release.Indexer, downloadTitle);
+            _logger.ProgressInfo("Report for {0} ({1}) sent to {2} from indexer {3}. {4}", remoteMovie.Movie.Title, remoteMovie.Movie.Year, downloadClient.Definition.Name, remoteMovie.Release.Indexer.SanitizeForLog(), downloadTitle.SanitizeForLog());
             _eventAggregator.PublishEvent(movieGrabbedEvent);
         }
     }
diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index 56f1b7a457..cdf858af7b 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -450,7 +450,7 @@ private PendingRelease FindPendingRelease(int queueId)
             return GetPendingReleases().First(p => queueId == GetQueueId(p, p.RemoteMovie.Movie));
         }
 
-        private int GetQueueId(PendingRelease pendingRelease, Movie movie)
+        private static int GetQueueId(PendingRelease pendingRelease, Movie movie)
         {
             return HashConverter.GetHashInt31(string.Format("pending-{0}-movie{1}", pendingRelease.Id, movie?.Id ?? 0));
         }
diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
index a2221824d5..941d3f1b2a 100644
--- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
+++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Download.Pending;
@@ -158,13 +159,13 @@ internal List<DownloadDecision> GetQualifiedReports(IEnumerable<DownloadDecision
             return decisions.Where(IsQualifiedReport).ToList();
         }
 
-        internal bool IsQualifiedReport(DownloadDecision decision)
+        internal static bool IsQualifiedReport(DownloadDecision decision)
         {
             // Process both approved and temporarily rejected
             return (decision.Approved || decision.TemporarilyRejected) && decision.RemoteMovie.Movie != null;
         }
 
-        private bool IsMovieProcessed(List<DownloadDecision> decisions, DownloadDecision report)
+        private static bool IsMovieProcessed(List<DownloadDecision> decisions, DownloadDecision report)
         {
             var movieId = report.RemoteMovie.Movie.Id;
 
@@ -198,27 +199,27 @@ private async Task<ProcessedDecisionResult> ProcessDecisionInternal(DownloadDeci
 
             try
             {
-                _logger.Trace("Grabbing release '{0}' from Indexer {1} at priority {2}.", remoteMovie, remoteIndexer, remoteMovie.Release.IndexerPriority);
+                _logger.Trace("Grabbing release '{0}' from Indexer {1} at priority {2}.", remoteMovie.Release.Title.SanitizeForLog(), remoteIndexer.SanitizeForLog(), remoteMovie.Release.IndexerPriority);
                 await _downloadService.DownloadReport(remoteMovie, downloadClientId);
 
                 return ProcessedDecisionResult.Grabbed;
             }
             catch (ReleaseUnavailableException)
             {
-                _logger.Warn("Failed to download release '{0}' from Indexer {1}. Release not available", remoteMovie, remoteIndexer);
+                _logger.Warn("Failed to download release '{0}' from Indexer {1}. Release not available", remoteMovie.Release.Title.SanitizeForLog(), remoteIndexer.SanitizeForLog());
                 return ProcessedDecisionResult.Rejected;
             }
             catch (Exception ex)
             {
                 if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException)
                 {
-                    _logger.Debug(ex, "Failed to send release '{0}' from Indexer {1} to download client, storing until later.", remoteMovie, remoteIndexer);
+                    _logger.Debug(ex, "Failed to send release '{0}' from Indexer {1} to download client, storing until later.", remoteMovie.Release.Title.SanitizeForLog(), remoteIndexer.SanitizeForLog());
 
                     return ProcessedDecisionResult.Failed;
                 }
                 else
                 {
-                    _logger.Warn(ex, "Couldn't add release '{0}' from Indexer {1} to download queue.", remoteMovie, remoteIndexer);
+                    _logger.Warn(ex, "Couldn't add release '{0}' from Indexer {1} to download queue.", remoteMovie.Release.Title.SanitizeForLog(), remoteIndexer.SanitizeForLog());
                     return ProcessedDecisionResult.Skipped;
                 }
             }
diff --git a/src/NzbDrone.Core/Download/TorrentClientBase.cs b/src/NzbDrone.Core/Download/TorrentClientBase.cs
index b59d1ba326..b7a18408ec 100644
--- a/src/NzbDrone.Core/Download/TorrentClientBase.cs
+++ b/src/NzbDrone.Core/Download/TorrentClientBase.cs
@@ -79,7 +79,7 @@ public override async Task<string> Download(RemoteMovie remoteMovie, IIndexer in
                     }
                     catch (Exception ex)
                     {
-                        if (!magnetUrl.IsNullOrWhiteSpace())
+                        if (magnetUrl.IsNullOrWhiteSpace())
                         {
                             throw;
                         }
@@ -149,7 +149,7 @@ private async Task<string> DownloadFromWebUrl(RemoteMovie remoteMovie, IIndexer
                 {
                     var locationHeader = response.Headers.GetSingleValue("Location");
 
-                    _logger.Trace("Torrent request is being redirected to: {0}", locationHeader);
+                    _logger.Trace("Torrent request is being redirected to: {0}", locationHeader.SanitizeForLog());
 
                     if (locationHeader != null)
                     {
@@ -168,30 +168,30 @@ private async Task<string> DownloadFromWebUrl(RemoteMovie remoteMovie, IIndexer
 
                 torrentFile = response.ResponseData;
 
-                _logger.Debug("Downloading torrent for movie '{0}' finished ({1} bytes from {2})", remoteMovie.Release.Title, torrentFile.Length, torrentUrl);
+                _logger.Debug("Downloading torrent for movie '{0}' finished ({1} bytes from {2})", remoteMovie.Release.Title.SanitizeForLog(), torrentFile.Length, torrentUrl.SanitizeForLog());
             }
             catch (HttpException ex)
             {
                 if (ex.Response.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Gone)
                 {
-                    _logger.Error(ex, "Downloading torrent file for movie '{0}' failed since it no longer exists ({1})", remoteMovie.Release.Title, torrentUrl);
+                    _logger.Error(ex, "Downloading torrent file for movie '{0}' failed since it no longer exists ({1})", remoteMovie.Release.Title.SanitizeForLog(), torrentUrl.SanitizeForLog());
                     throw new ReleaseUnavailableException(remoteMovie.Release, "Downloading torrent failed", ex);
                 }
 
                 if ((int)ex.Response.StatusCode == 429)
                 {
-                    _logger.Error("API Grab Limit reached for {0}", torrentUrl);
+                    _logger.Error("API Grab Limit reached for {0}", torrentUrl.SanitizeForLog());
                 }
                 else
                 {
-                    _logger.Error(ex, "Downloading torrent file for movie '{0}' failed ({1})", remoteMovie.Release.Title, torrentUrl);
+                    _logger.Error(ex, "Downloading torrent file for movie '{0}' failed ({1})", remoteMovie.Release.Title.SanitizeForLog(), torrentUrl.SanitizeForLog());
                 }
 
                 throw new ReleaseDownloadException(remoteMovie.Release, "Downloading torrent failed", ex);
             }
             catch (WebException ex)
             {
-                _logger.Error(ex, "Downloading torrent file for movie '{0}' failed ({1})", remoteMovie.Release.Title, torrentUrl);
+                _logger.Error(ex, "Downloading torrent file for movie '{0}' failed ({1})", remoteMovie.Release.Title.SanitizeForLog(), torrentUrl.SanitizeForLog());
 
                 throw new ReleaseDownloadException(remoteMovie.Release, "Downloading torrent failed", ex);
             }
@@ -208,7 +208,7 @@ private async Task<string> DownloadFromWebUrl(RemoteMovie remoteMovie, IIndexer
                 _logger.Debug(
                     "{0} did not return the expected InfoHash for '{1}', Radarr could potentially lose track of the download in progress.",
                     Definition.Implementation,
-                    remoteMovie.Release.DownloadUrl);
+                    remoteMovie.Release.DownloadUrl.SanitizeForLog());
             }
 
             return actualHash;
@@ -240,7 +240,7 @@ private string DownloadFromMagnetUrl(RemoteMovie remoteMovie, IIndexer indexer,
                 _logger.Debug(
                     "{0} did not return the expected InfoHash for '{1}', Radarr could potentially lose track of the download in progress.",
                     Definition.Implementation,
-                    remoteMovie.Release.DownloadUrl);
+                    remoteMovie.Release.DownloadUrl.SanitizeForLog());
             }
 
             return actualHash;
diff --git a/src/NzbDrone.Core/Download/UsenetClientBase.cs b/src/NzbDrone.Core/Download/UsenetClientBase.cs
index 1445d47350..2102fc315f 100644
--- a/src/NzbDrone.Core/Download/UsenetClientBase.cs
+++ b/src/NzbDrone.Core/Download/UsenetClientBase.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
@@ -56,37 +57,37 @@ public override async Task<string> Download(RemoteMovie remoteMovie, IIndexer in
 
                 nzbData = response.ResponseData;
 
-                _logger.Debug("Downloaded nzb for movie '{0}' finished ({1} bytes from {2})", remoteMovie.Release.Title, nzbData.Length, url);
+                _logger.Debug("Downloaded nzb for movie '{0}' finished ({1} bytes from {2})", remoteMovie.Release.Title.SanitizeForLog(), nzbData.Length, url.SanitizeForLog());
             }
             catch (HttpException ex)
             {
                 if (ex.Response.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Gone)
                 {
-                    _logger.Error(ex, "Downloading nzb file for movie '{0}' failed since it no longer exists ({1})", remoteMovie.Release.Title, url);
+                    _logger.Error(ex, "Downloading nzb file for movie '{0}' failed since it no longer exists ({1})", remoteMovie.Release.Title.SanitizeForLog(), url.SanitizeForLog());
                     throw new ReleaseUnavailableException(remoteMovie.Release, "Downloading nzb failed", ex);
                 }
 
                 if ((int)ex.Response.StatusCode == 429)
                 {
-                    _logger.Error("API Grab Limit reached for {0}", url);
+                    _logger.Error("API Grab Limit reached for {0}", url.SanitizeForLog());
                 }
                 else
                 {
-                    _logger.Error(ex, "Downloading nzb for movie '{0}' failed ({1})", remoteMovie.Release.Title, url);
+                    _logger.Error(ex, "Downloading nzb for movie '{0}' failed ({1})", remoteMovie.Release.Title.SanitizeForLog(), url.SanitizeForLog());
                 }
 
                 throw new ReleaseDownloadException(remoteMovie.Release, "Downloading nzb failed", ex);
             }
             catch (WebException ex)
             {
-                _logger.Error(ex, "Downloading nzb for movie '{0}' failed ({1})", remoteMovie.Release.Title, url);
+                _logger.Error(ex, "Downloading nzb for movie '{0}' failed ({1})", remoteMovie.Release.Title.SanitizeForLog(), url.SanitizeForLog());
 
                 throw new ReleaseDownloadException(remoteMovie.Release, "Downloading nzb failed", ex);
             }
 
             _nzbValidationService.Validate(filename, nzbData);
 
-            _logger.Info("Adding report [{0}] to the queue.", remoteMovie.Release.Title);
+            _logger.Info("Adding report [{0}] to the queue.", remoteMovie.Release.Title.SanitizeForLog());
             return AddFromNzbFile(remoteMovie, filename, nzbData);
         }
     }
diff --git a/src/NzbDrone.Core/Extras/ImportExistingExtraFilesBase.cs b/src/NzbDrone.Core/Extras/ImportExistingExtraFilesBase.cs
index f9f2560b3c..a41fd2f83e 100644
--- a/src/NzbDrone.Core/Extras/ImportExistingExtraFilesBase.cs
+++ b/src/NzbDrone.Core/Extras/ImportExistingExtraFilesBase.cs
@@ -39,7 +39,7 @@ public virtual ImportExistingExtraFileFilterResult<TExtraFile> FilterAndClean(Mo
             return Filter(movie, filesOnDisk, importedFiles, movieFiles);
         }
 
-        private ImportExistingExtraFileFilterResult<TExtraFile> Filter(Movie movie, List<string> filesOnDisk, List<string> importedFiles, List<TExtraFile> movieFiles)
+        private static ImportExistingExtraFileFilterResult<TExtraFile> Filter(Movie movie, List<string> filesOnDisk, List<string> importedFiles, List<TExtraFile> movieFiles)
         {
             var previouslyImported = movieFiles.IntersectBy(s => Path.Combine(movie.Path, s.RelativePath), filesOnDisk, f => f, PathEqualityComparer.Instance).ToList();
             var filteredFiles = filesOnDisk.Except(previouslyImported.Select(f => Path.Combine(movie.Path, f.RelativePath)).ToList(), PathEqualityComparer.Instance)
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
index 89f950a2f9..4029bf7d0e 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
@@ -100,7 +100,7 @@ public override List<ImageFileResult> MovieImages(Movie movie)
             return new List<ImageFileResult>();
         }
 
-        private IEnumerable<ImageFileResult> ProcessMovieImages(Movie movie)
+        private static IEnumerable<ImageFileResult> ProcessMovieImages(Movie movie)
         {
             return new List<ImageFileResult>();
         }
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
index 9526da43f6..4ade57eae5 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
@@ -149,12 +149,12 @@ public override List<ImageFileResult> MovieImages(Movie movie)
             return new List<ImageFileResult> { new ImageFileResult(destination, source) };
         }
 
-        private string GetMovieFileMetadataFilename(string movieFilePath)
+        private static string GetMovieFileMetadataFilename(string movieFilePath)
         {
             return Path.ChangeExtension(movieFilePath, "xml");
         }
 
-        private string GetMovieFileImageFilename(string movieFilePath)
+        private static string GetMovieFileImageFilename(string movieFilePath)
         {
             return Path.ChangeExtension(movieFilePath, "jpg");
         }
diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
index ed5686b0b8..3650ba556f 100644
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
@@ -148,12 +148,12 @@ public override List<ImageFileResult> MovieImages(Movie movie)
                    };
         }
 
-        private string GetMovieFileMetadataFilename(string movieFilePath)
+        private static string GetMovieFileMetadataFilename(string movieFilePath)
         {
             return Path.ChangeExtension(movieFilePath, "xml");
         }
 
-        private string GetMovieFileImageFilename(string movieFilePath)
+        private static string GetMovieFileImageFilename(string movieFilePath)
         {
             return Path.ChangeExtension(movieFilePath, "metathumb");
         }
diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
index a0bd090025..6e634bdcfb 100644
--- a/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
@@ -202,7 +202,7 @@ public override IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieF
             return Enumerable.Empty<ExtraFile>();
         }
 
-        private List<MetadataFile> GetMetadataFilesForConsumer(IMetadata consumer, List<MetadataFile> movieMetadata)
+        private static List<MetadataFile> GetMetadataFilesForConsumer(IMetadata consumer, List<MetadataFile> movieMetadata)
         {
             return movieMetadata.Where(c => c.Consumer == consumer.GetType().Name).ToList();
         }
diff --git a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
index 00fea36aa3..de537b4d71 100644
--- a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
+++ b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
@@ -235,7 +235,7 @@ public override IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieF
             return importedFiles;
         }
 
-        private string GetSuffix(Language language, int copy, List<string> languageTags, bool multipleCopies = false, string title = null)
+        private static string GetSuffix(Language language, int copy, List<string> languageTags, bool multipleCopies = false, string title = null)
         {
             var suffixBuilder = new StringBuilder();
 
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs
index 3005647084..8e2a053e45 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/ImportListRootFolderCheck.cs
@@ -87,7 +87,7 @@ public override HealthCheck Check()
             return new HealthCheck(GetType());
         }
 
-        private string FormatRootFolder(string rootFolderPath, List<ImportListDefinition> importLists)
+        private static string FormatRootFolder(string rootFolderPath, List<ImportListDefinition> importLists)
         {
             return $"{rootFolderPath} ({string.Join(", ", importLists.Select(l => l.Name))})";
         }
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MovieCollectionRootFolderCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MovieCollectionRootFolderCheck.cs
index 58524c45cc..234e9767b9 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/MovieCollectionRootFolderCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/MovieCollectionRootFolderCheck.cs
@@ -82,7 +82,7 @@ public override HealthCheck Check()
             return new HealthCheck(GetType());
         }
 
-        private string FormatRootFolder(string rootFolderPath, List<MovieCollection> collections)
+        private static string FormatRootFolder(string rootFolderPath, List<MovieCollection> collections)
         {
             return $"{rootFolderPath} ({string.Join(", ", collections.Select(c => c.Title))})";
         }
diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs
index 84a67f3b06..d4efbaa903 100644
--- a/src/NzbDrone.Core/History/HistoryRepository.cs
+++ b/src/NzbDrone.Core/History/HistoryRepository.cs
@@ -133,7 +133,7 @@ protected override IEnumerable<MovieHistory> PagedQuery(SqlBuilder builder) =>
                 return hist;
             });
 
-        private string BuildLanguageWhereClause(int[] languages)
+        private static string BuildLanguageWhereClause(int[] languages)
         {
             var clauses = new List<string>();
 
@@ -153,7 +153,7 @@ private string BuildLanguageWhereClause(int[] languages)
             return $"({string.Join(" OR ", clauses)})";
         }
 
-        private string BuildQualityWhereClause(int[] qualities)
+        private static string BuildQualityWhereClause(int[] qualities)
         {
             var clauses = new List<string>();
 
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs
index 9bb87a771b..17b6b2750f 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs
@@ -49,7 +49,7 @@ public void Clean()
             }
         }
 
-        private int[] GetUsedTags(string table, IDbConnection mapper)
+        private static int[] GetUsedTags(string table, IDbConnection mapper)
         {
             return mapper
                 .Query<List<int>>(
diff --git a/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs b/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
index 32beb8080b..0b73343acd 100644
--- a/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
+++ b/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
@@ -49,7 +49,7 @@ public HttpProxySettings GetProxySettings()
                                 _configService.ProxyPassword);
         }
 
-        public bool ShouldProxyBeBypassed(HttpProxySettings proxySettings, HttpUri url)
+        public static bool ShouldProxyBeBypassed(HttpProxySettings proxySettings, HttpUri url)
         {
             // We are utilizing the WebProxy implementation here to save us having to re-implement it. This way we use Microsofts implementation
             var proxy = new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray);
diff --git a/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoRequestGenerator.cs b/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoRequestGenerator.cs
index 5abd911dba..39cbeb29ae 100644
--- a/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoRequestGenerator.cs
+++ b/src/NzbDrone.Core/ImportLists/CouchPotato/CouchPotatoRequestGenerator.cs
@@ -21,7 +21,7 @@ private IEnumerable<ImportListRequest> GetMovies(string searchParameters)
             var urlBase = "";
             if (!string.IsNullOrWhiteSpace(Settings.UrlBase))
             {
-                urlBase = Settings.UrlBase.StartsWith("/") ? Settings.UrlBase : $"/{Settings.UrlBase}";
+                urlBase = Settings.UrlBase.StartsWith('/') ? Settings.UrlBase : $"/{Settings.UrlBase}";
             }
 
             var status = "";
diff --git a/src/NzbDrone.Core/ImportLists/Plex/PlexParser.cs b/src/NzbDrone.Core/ImportLists/Plex/PlexParser.cs
index 21032c5ecf..524c14aa82 100644
--- a/src/NzbDrone.Core/ImportLists/Plex/PlexParser.cs
+++ b/src/NzbDrone.Core/ImportLists/Plex/PlexParser.cs
@@ -66,7 +66,7 @@ protected virtual bool PreProcess(ImportListResponse importListResponse)
             return true;
         }
 
-        private string FindGuid(List<PlexSectionItemGuid> guids, string prefix)
+        private static string FindGuid(List<PlexSectionItemGuid> guids, string prefix)
         {
             var scheme = $"{prefix}://";
 
diff --git a/src/NzbDrone.Core/ImportLists/RSSImport/RSSImportParser.cs b/src/NzbDrone.Core/ImportLists/RSSImport/RSSImportParser.cs
index 5f9b8dc7dd..c59b59e371 100644
--- a/src/NzbDrone.Core/ImportLists/RSSImport/RSSImportParser.cs
+++ b/src/NzbDrone.Core/ImportLists/RSSImport/RSSImportParser.cs
@@ -199,7 +199,7 @@ protected virtual string GetImdbId(XElement item)
             return Parser.Parser.ParseImdbId(url);
         }
 
-        protected IEnumerable<XElement> GetItems(XDocument document)
+        protected static IEnumerable<XElement> GetItems(XDocument document)
         {
             var root = document.Root;
 
diff --git a/src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs b/src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs
index 6ed288b719..da4b471969 100644
--- a/src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs
+++ b/src/NzbDrone.Core/ImportLists/Radarr/RadarrV3Proxy.cs
@@ -85,7 +85,7 @@ public ValidationFailure Test(RadarrSettings settings)
             return null;
         }
 
-        private HttpRequestBuilder BuildRequest(string resource, RadarrSettings settings)
+        private static HttpRequestBuilder BuildRequest(string resource, RadarrSettings settings)
         {
             var baseUrl = settings.BaseUrl.TrimEnd('/');
 
diff --git a/src/NzbDrone.Core/ImportLists/Rss/RssImportBaseParser.cs b/src/NzbDrone.Core/ImportLists/Rss/RssImportBaseParser.cs
index b2c68a518a..3dd897e887 100644
--- a/src/NzbDrone.Core/ImportLists/Rss/RssImportBaseParser.cs
+++ b/src/NzbDrone.Core/ImportLists/Rss/RssImportBaseParser.cs
@@ -98,7 +98,7 @@ protected virtual XDocument LoadXmlDocument(ImportListResponse importListRespons
             }
         }
 
-        protected IEnumerable<XElement> GetItems(XDocument document)
+        protected static IEnumerable<XElement> GetItems(XDocument document)
         {
             var root = document.Root;
 
diff --git a/src/NzbDrone.Core/ImportLists/TMDb/TMDbParser.cs b/src/NzbDrone.Core/ImportLists/TMDb/TMDbParser.cs
index cede5d9852..9d7c1eaf1b 100644
--- a/src/NzbDrone.Core/ImportLists/TMDb/TMDbParser.cs
+++ b/src/NzbDrone.Core/ImportLists/TMDb/TMDbParser.cs
@@ -47,7 +47,7 @@ protected ImportListMovie MapListMovie(MovieResultResource movieResult)
             return movie;
         }
 
-        private MediaCover.MediaCover MapPosterImage(string path)
+        private static MediaCover.MediaCover MapPosterImage(string path)
         {
             if (path.IsNotNullOrWhiteSpace())
             {
diff --git a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
index e21b0262fe..a87cba171d 100644
--- a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
@@ -141,7 +141,7 @@ private async Task<IList<ReleaseInfo>> DispatchIndexer(Func<IIndexer, Task<IList
             return Array.Empty<ReleaseInfo>();
         }
 
-        private List<DownloadDecision> DeDupeDecisions(List<DownloadDecision> decisions)
+        private static List<DownloadDecision> DeDupeDecisions(List<DownloadDecision> decisions)
         {
             // De-dupe reports by guid so duplicate results aren't returned. Pick the one with the least rejections and higher indexer priority.
             return decisions.GroupBy(d => d.RemoteMovie.Release.Guid)
diff --git a/src/NzbDrone.Core/Indexers/HDBits/HDBitsRequestGenerator.cs b/src/NzbDrone.Core/Indexers/HDBits/HDBitsRequestGenerator.cs
index 7d21db9f3f..5516c52aa0 100644
--- a/src/NzbDrone.Core/Indexers/HDBits/HDBitsRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/HDBits/HDBitsRequestGenerator.cs
@@ -44,7 +44,7 @@ public IndexerPageableRequestChain GetSearchRequests(AudiobookSearchCriteria sea
             return new IndexerPageableRequestChain();
         }
 
-        private bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
+        private static bool TryAddSearchParameters(TorrentQuery query, SearchCriteriaBase searchCriteria)
         {
             if (searchCriteria.Movie.MovieMetadata.Value.ImdbId.IsNullOrWhiteSpace())
             {
diff --git a/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseParser.cs b/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseParser.cs
index 3910c59d8c..e4d606bafc 100644
--- a/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseParser.cs
+++ b/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseParser.cs
@@ -72,48 +72,19 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                 var id = item.Id;
                 var title = item.Title;
 
-                if (item.AuthorInfo != null)
+                var author = ParseAuthorInfo(item);
+                if (author != null)
                 {
-                    try
-                    {
-                        var authorInfo = JsonConvert.DeserializeObject<Dictionary<string, string>>(item.AuthorInfo);
-                        var author = authorInfo?.Take(5).Select(v => v.Value).Join(", ");
-
-                        if (author.IsNotNullOrWhiteSpace())
-                        {
-                            title += " by " + author;
-                        }
-                    }
-                    catch (JsonException ex)
-                    {
-                        _logger.Debug(ex, "Failed to parse author info for torrent {0}", id);
-                    }
+                    title += " by " + author;
                 }
 
-                var flags = new List<string>();
-
-                if (item.LanguageCode.IsNotNullOrWhiteSpace())
-                {
-                    flags.Add(item.LanguageCode);
-                }
-
-                if (item.Filetype.IsNotNullOrWhiteSpace())
-                {
-                    flags.Add(item.Filetype.ToUpper());
-                }
-
-                if (flags.Count > 0)
-                {
-                    title += " [" + flags.Join(" / ") + "]";
-                }
+                title += BuildTitleFlags(item);
 
                 if (item.Vip)
                 {
                     title += " [VIP]";
                 }
 
-                var isFreeLeech = item.Free || item.PersonalFreeLeech || item.FreeVip;
-
                 torrentInfos.Add(new TorrentInfo
                 {
                     Guid = $"MyAnonamouse-{id}",
@@ -124,7 +95,7 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                     Seeders = item.Seeders,
                     Peers = item.Leechers + item.Seeders,
                     PublishDate = ParseDate(item.Added),
-                    IndexerFlags = GetIndexerFlags(isFreeLeech)
+                    IndexerFlags = GetIndexerFlags(IsFreeLeech(item))
                 });
             }
 
@@ -202,5 +173,48 @@ private string GetInfoUrl(int torrentId)
         }
 
         public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+
+        private string ParseAuthorInfo(MyAnonamouseTorrent item)
+        {
+            if (item.AuthorInfo == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                var authorInfo = JsonConvert.DeserializeObject<Dictionary<string, string>>(item.AuthorInfo);
+                var author = authorInfo?.Take(5).Select(v => v.Value).Join(", ");
+
+                return author.IsNotNullOrWhiteSpace() ? author : null;
+            }
+            catch (JsonException ex)
+            {
+                _logger.Debug(ex, "Failed to parse author info for torrent {0}", item.Id);
+                return null;
+            }
+        }
+
+        private static string BuildTitleFlags(MyAnonamouseTorrent item)
+        {
+            var flags = new List<string>();
+
+            if (item.LanguageCode.IsNotNullOrWhiteSpace())
+            {
+                flags.Add(item.LanguageCode);
+            }
+
+            if (item.Filetype.IsNotNullOrWhiteSpace())
+            {
+                flags.Add(item.Filetype.ToUpper());
+            }
+
+            return flags.Count > 0 ? " [" + flags.Join(" / ") + "]" : string.Empty;
+        }
+
+        private static bool IsFreeLeech(MyAnonamouseTorrent item)
+        {
+            return item.Free || item.PersonalFreeLeech || item.FreeVip;
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseRequestGenerator.cs b/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseRequestGenerator.cs
index 95e0e0c7bb..cc7eca1d8d 100644
--- a/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/MyAnonamouse/MyAnonamouseRequestGenerator.cs
@@ -61,7 +61,7 @@ public IndexerPageableRequestChain GetSearchRequests(AudiobookSearchCriteria sea
             return pageableRequests;
         }
 
-        private string BuildSearchTerm(SearchCriteriaBase searchCriteria)
+        private static string BuildSearchTerm(SearchCriteriaBase searchCriteria)
         {
             var terms = new List<string>();
 
diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs
index a95f9840b4..fe2447b772 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs
@@ -241,7 +241,7 @@ protected IndexerFlags GetFlags(XElement item)
             return flags;
         }
 
-        protected string TryGetNewznabAttribute(XElement item, string key, string defaultValue = "")
+        protected static string TryGetNewznabAttribute(XElement item, string key, string defaultValue = "")
         {
             var attrElement = item.Elements(ns + "attr").FirstOrDefault(e => e.Attribute("name").Value.Equals(key, StringComparison.OrdinalIgnoreCase));
             if (attrElement != null)
@@ -256,7 +256,7 @@ protected string TryGetNewznabAttribute(XElement item, string key, string defaul
             return defaultValue;
         }
 
-        protected List<string> TryGetMultipleNewznabAttributes(XElement item, string key)
+        protected static List<string> TryGetMultipleNewznabAttributes(XElement item, string key)
         {
             var attrElements = item.Elements(ns + "attr").Where(e => e.Attribute("name").Value.Equals(key, StringComparison.OrdinalIgnoreCase));
             var results = new List<string>();
diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs
index fdf76bac7b..b8c56f4f11 100644
--- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs
@@ -52,7 +52,7 @@ private IEnumerable<IndexerRequest> GetPagedRequests(string term)
             yield return new IndexerRequest(baseUrl, HttpAccept.Rss);
         }
 
-        private string PrepareQuery(string query)
+        private static string PrepareQuery(string query)
         {
             return query.Replace(' ', '+');
         }
diff --git a/src/NzbDrone.Core/Indexers/RssParser.cs b/src/NzbDrone.Core/Indexers/RssParser.cs
index 239cebc4da..412ec472e8 100644
--- a/src/NzbDrone.Core/Indexers/RssParser.cs
+++ b/src/NzbDrone.Core/Indexers/RssParser.cs
@@ -323,7 +323,7 @@ protected virtual RssEnclosure GetEnclosure(RssEnclosure[] enclosures, bool enfo
             return enclosures.SingleOrDefault();
         }
 
-        protected IEnumerable<XElement> GetItems(XDocument document)
+        protected static IEnumerable<XElement> GetItems(XDocument document)
         {
             var root = document.Root;
 
diff --git a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoParser.cs b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoParser.cs
index 069a49902b..48d118b345 100644
--- a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoParser.cs
+++ b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoParser.cs
@@ -50,7 +50,7 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
 
         public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-        private string GetGuid(Result torrent)
+        private static string GetGuid(Result torrent)
         {
             var match = RegexGuid.Match(torrent.download_url);
 
diff --git a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs
index 0e13aec355..16cc55f707 100644
--- a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs
+++ b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssSettingsDetector.cs
@@ -274,7 +274,7 @@ private void ValidateReleases(TorrentInfo[] releases, TorrentRssIndexerSettings
             }
         }
 
-        private void ValidateReleaseSize(TorrentInfo[] releases, TorrentRssIndexerSettings indexerSettings)
+        private static void ValidateReleaseSize(TorrentInfo[] releases, TorrentRssIndexerSettings indexerSettings)
         {
             if (!indexerSettings.AllowZeroSize && releases.Any(r => r.Size == 0))
             {
diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabRssParser.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabRssParser.cs
index 0e873447d6..674e9ec43b 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/TorznabRssParser.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabRssParser.cs
@@ -266,7 +266,7 @@ protected IndexerFlags GetFlags(XElement item)
             return flags;
         }
 
-        protected string TryGetTorznabAttribute(XElement item, string key, string defaultValue = "")
+        protected static string TryGetTorznabAttribute(XElement item, string key, string defaultValue = "")
         {
             var attr = item.Elements(ns + "attr").FirstOrDefault(e => e.Attribute("name").Value.Equals(key, StringComparison.CurrentCultureIgnoreCase));
 
@@ -290,7 +290,7 @@ protected float TryGetFloatTorznabAttribute(XElement item, string key, float def
             return defaultValue;
         }
 
-        protected List<string> TryGetMultipleTorznabAttributes(XElement item, string key)
+        protected static List<string> TryGetMultipleTorznabAttributes(XElement item, string key)
         {
             var attrElements = item.Elements(ns + "attr").Where(e => e.Attribute("name").Value.Equals(key, StringComparison.OrdinalIgnoreCase));
             var results = new List<string>();
diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
index d49bb06d76..42ea662781 100644
--- a/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
+++ b/src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs
@@ -142,7 +142,7 @@ private void SetSyslogParameters(string syslogServer, int syslogPort, LogLevel m
             LogManager.Configuration.LoggingRules.Add(loggingRule);
         }
 
-        private List<LogLevel> GetLogLevels()
+        private static List<LogLevel> GetLogLevels()
         {
             return new List<LogLevel>
                        {
diff --git a/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs b/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
index 2d8f14b202..e90d4c2c66 100644
--- a/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
+++ b/src/NzbDrone.Core/Instrumentation/ReconfigureSentry.cs
@@ -30,7 +30,7 @@ public void Reconfigure()
             var sentryTarget = LogManager.Configuration.AllTargets.OfType<SentryTarget>().FirstOrDefault();
             if (sentryTarget != null)
             {
-                sentryTarget.UpdateScope(_database.Version, _database.Migration, _configFileProvider.Branch, _platformInfo);
+                SentryTarget.UpdateScope(_database.Version, _database.Migration, _configFileProvider.Branch, _platformInfo);
             }
         }
 
diff --git a/src/NzbDrone.Core/Localization/LocalizationService.cs b/src/NzbDrone.Core/Localization/LocalizationService.cs
index 1a5a708032..87d0f4d757 100644
--- a/src/NzbDrone.Core/Localization/LocalizationService.cs
+++ b/src/NzbDrone.Core/Localization/LocalizationService.cs
@@ -97,7 +97,7 @@ public string GetLanguageIdentifier()
             return language;
         }
 
-        private string ReplaceTokens(string input, Dictionary<string, object> tokens)
+        private static string ReplaceTokens(string input, Dictionary<string, object> tokens)
         {
             tokens.TryAdd("appName", "Radarr");
 
diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
index 8a2a32a39c..223dd0d939 100644
--- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
+++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
@@ -252,7 +252,7 @@ private void EnsureResizedCovers(Movie movie, MediaCover cover, bool forceResize
             }
         }
 
-        private string GetExtension(MediaCoverTypes coverType)
+        private static string GetExtension(MediaCoverTypes coverType)
         {
             return coverType switch
             {
diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 3a82235217..1f2c632450 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -84,14 +84,14 @@ public void Scan(Movie movie)
             {
                 if (!_diskProvider.FolderExists(rootFolder))
                 {
-                    _logger.Warn("Movie's root folder ({0}) doesn't exist.", rootFolder);
+                    _logger.Warn("Movie's root folder ({0}) doesn't exist.", rootFolder.SanitizeForLog());
                     _eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderDoesNotExist));
                     return;
                 }
 
                 if (_diskProvider.FolderEmpty(rootFolder))
                 {
-                    _logger.Warn("Movie's root folder ({0}) is empty. Rescan will not update movies as a failsafe.", rootFolder);
+                    _logger.Warn("Movie's root folder ({0}) is empty. Rescan will not update movies as a failsafe.", rootFolder.SanitizeForLog());
                     _eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderIsEmpty));
                     return;
                 }
@@ -105,11 +105,11 @@ public void Scan(Movie movie)
                 {
                     if (_configService.DeleteEmptyFolders)
                     {
-                        _logger.Debug("Not creating missing movie folder: {0} because delete empty movie folders is enabled", movie.Path);
+                        _logger.Debug("Not creating missing movie folder: {0} because delete empty movie folders is enabled", movie.Path.SanitizeForLog());
                     }
                     else
                     {
-                        _logger.Debug("Creating missing movie folder: {0}", movie.Path);
+                        _logger.Debug("Creating missing movie folder: {0}", movie.Path.SanitizeForLog());
 
                         _diskProvider.CreateFolder(movie.Path);
                         SetPermissions(movie.Path);
@@ -117,7 +117,7 @@ public void Scan(Movie movie)
                 }
                 else
                 {
-                    _logger.Debug("Movie's folder doesn't exist: {0}", movie.Path);
+                    _logger.Debug("Movie's folder doesn't exist: {0}", movie.Path.SanitizeForLog());
                 }
 
                 CleanMediaFiles(movie, new List<string>());
@@ -194,30 +194,30 @@ private void CompletedScanning(Movie movie, List<string> possibleExtraFiles)
 
         public string[] GetVideoFiles(string path, bool allDirectories = true)
         {
-            _logger.Debug("Scanning '{0}' for video files", path);
+            _logger.Debug("Scanning '{0}' for video files", path.SanitizeForLog());
 
             var filesOnDisk = _diskProvider.GetFiles(path, allDirectories).ToList();
 
             var mediaFileList = filesOnDisk.Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file)))
                                            .ToList();
 
-            _logger.Trace("{0} files were found in {1}", filesOnDisk.Count, path);
-            _logger.Debug("{0} video files were found in {1}", mediaFileList.Count, path);
+            _logger.Trace("{0} files were found in {1}", filesOnDisk.Count, path.SanitizeForLog());
+            _logger.Debug("{0} video files were found in {1}", mediaFileList.Count, path.SanitizeForLog());
 
             return mediaFileList.ToArray();
         }
 
         public string[] GetNonVideoFiles(string path, bool allDirectories = true)
         {
-            _logger.Debug("Scanning '{0}' for non-video files", path);
+            _logger.Debug("Scanning '{0}' for non-video files", path.SanitizeForLog());
 
             var filesOnDisk = _diskProvider.GetFiles(path, allDirectories).ToList();
 
             var mediaFileList = filesOnDisk.Where(file => !MediaFileExtensions.Extensions.Contains(Path.GetExtension(file)))
                                            .ToList();
 
-            _logger.Trace("{0} files were found in {1}", filesOnDisk.Count, path);
-            _logger.Debug("{0} non-video files were found in {1}", mediaFileList.Count, path);
+            _logger.Trace("{0} files were found in {1}", filesOnDisk.Count, path.SanitizeForLog());
+            _logger.Debug("{0} non-video files were found in {1}", mediaFileList.Count, path.SanitizeForLog());
 
             return mediaFileList.ToArray();
         }
@@ -251,7 +251,7 @@ private void SetPermissions(string path)
             }
             catch (Exception ex)
             {
-                _logger.Warn(ex, "Unable to apply permissions to: " + path);
+                _logger.Warn(ex, "Unable to apply permissions to: " + path.SanitizeForLog());
                 _logger.Debug(ex, ex.Message);
             }
         }
diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs
index dc50cac168..720623fb6c 100644
--- a/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs
@@ -325,7 +325,7 @@ private List<ImportResult> ProcessFile(FileInfo fileInfo, ImportMode importMode,
             return _importApprovedMovie.Import(decisions, true, downloadClientItem, importMode);
         }
 
-        private string GetCleanedUpFolderName(string folder)
+        private static string GetCleanedUpFolderName(string folder)
         {
             folder = folder.Replace("_UNPACK_", "")
                            .Replace("_FAILED_", "");
@@ -346,7 +346,7 @@ private ImportResult UnknownMovieResult(string message, string videoFile = null)
             return new ImportResult(new ImportDecision(localMovie, new ImportRejection(ImportRejectionReason.UnknownMovie, "Unknown Movie")), message);
         }
 
-        private ImportResult RejectionResult(ImportRejectionReason reason, string message)
+        private static ImportResult RejectionResult(ImportRejectionReason reason, string message)
         {
             return new ImportResult(new ImportDecision(null, new ImportRejection(reason, message)), message);
         }
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
index cbfb17e888..163ec332e8 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
@@ -63,7 +63,7 @@ public MediaInfoModel GetMediaInfo(string filename)
             // TODO: Cache media info by path, mtime and length so we don't need to read files multiple times
             try
             {
-                _logger.Debug("Getting media info from {0}", filename);
+                _logger.Debug("Getting media info from {0}", filename.SanitizeForLog());
                 var ffprobeOutput = FFProbe.GetStreamJson(filename, ffOptions: new FFOptions { ExtraArguments = "-probesize 50000000" });
 
                 var analysis = FFProbe.AnalyseStreamJson(ffprobeOutput);
@@ -133,7 +133,7 @@ public MediaInfoModel GetMediaInfo(string filename)
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Unable to parse media info from file: {0}", filename);
+                _logger.Error(ex, "Unable to parse media info from file: {0}", filename.SanitizeForLog());
             }
 
             return null;
@@ -176,7 +176,7 @@ private static long GetBitrate(MediaStream mediaStream)
             return 0;
         }
 
-        private VideoStream GetPrimaryVideoStream(IMediaAnalysis mediaAnalysis)
+        private static VideoStream GetPrimaryVideoStream(IMediaAnalysis mediaAnalysis)
         {
             if (mediaAnalysis.VideoStreams.Count <= 1)
             {
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/AggregationService.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/AggregationService.cs
index f141317dc4..624860a710 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/AggregationService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Aggregation/AggregationService.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles.MediaInfo;
@@ -68,7 +69,7 @@ public LocalMovie Augment(LocalMovie localMovie, DownloadClientItem downloadClie
                 }
                 catch (Exception ex)
                 {
-                    var message = $"Unable to augment information for file: '{localMovie.Path}'. Movie: {localMovie.Movie} Error: {ex.Message}";
+                    var message = $"Unable to augment information for file: '{localMovie.Path.SanitizeForLog()}'. Movie: {localMovie.Movie} Error: {ex.Message}";
 
                     _logger.Warn(ex, message);
                 }
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
index 4036547114..e513493144 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/DetectSample.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MediaFiles.MediaInfo;
 using NzbDrone.Core.Movies;
 
@@ -43,7 +44,7 @@ public DetectSampleResult IsSample(MovieMetadata movie, string path)
 
                 if (new string[] { ".iso", ".img", ".m2ts" }.Contains(extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    _logger.Debug($"Skipping sample check for DVD/BR image file '{path}'");
+                    _logger.Debug($"Skipping sample check for DVD/BR image file '{path.SanitizeForLog()}'");
                     return DetectSampleResult.NotSample;
                 }
             }
@@ -61,21 +62,21 @@ public DetectSampleResult IsSample(MovieMetadata movie, string path)
 
             if (runTime.Value.TotalMinutes.Equals(0))
             {
-                _logger.Error("[{0}] has a runtime of 0, is it a valid video file?", path);
+                _logger.Error("[{0}] has a runtime of 0, is it a valid video file?", path.SanitizeForLog());
                 return DetectSampleResult.Sample;
             }
 
             if (runTime.Value.TotalSeconds < minimumRuntime)
             {
-                _logger.Debug("[{0}] appears to be a sample. Runtime: {1} seconds. Expected at least: {2} seconds", path, runTime.Value.TotalSeconds, minimumRuntime);
+                _logger.Debug("[{0}] appears to be a sample. Runtime: {1} seconds. Expected at least: {2} seconds", path.SanitizeForLog(), runTime.Value.TotalSeconds, minimumRuntime);
                 return DetectSampleResult.Sample;
             }
 
-            _logger.Debug("[{0}] does not appear to be a sample. Runtime {1} seconds is more than minimum of {2} seconds", path, runTime, minimumRuntime);
+            _logger.Debug("[{0}] does not appear to be a sample. Runtime {1} seconds is more than minimum of {2} seconds", path.SanitizeForLog(), runTime, minimumRuntime);
             return DetectSampleResult.NotSample;
         }
 
-        private int GetMinimumAllowedRuntime(MovieMetadata movie)
+        private static int GetMinimumAllowedRuntime(MovieMetadata movie)
         {
             // Anime short - 15 seconds
             if (movie.Runtime <= 3)
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs
index 5bf3cad387..12a1f10be3 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs
@@ -208,7 +208,7 @@ public List<ImportResult> Import(List<ImportDecision> decisions, bool newDownloa
             return importResults;
         }
 
-        private string GetOriginalFilePath(DownloadClientItem downloadClientItem, LocalMovie localMovie)
+        private static string GetOriginalFilePath(DownloadClientItem downloadClientItem, LocalMovie localMovie)
         {
             var path = localMovie.Path;
 
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportDecisionMaker.cs
index 46c464fefd..a6fb851c1f 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportDecisionMaker.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportDecisionMaker.cs
@@ -153,14 +153,14 @@ private ImportDecision GetDecision(LocalMovie localMovie, DownloadClientItem dow
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Couldn't import file. {0}", localMovie.Path);
+                _logger.Error(ex, "Couldn't import file. {0}", localMovie.Path.SanitizeForLog());
 
                 decision = new ImportDecision(localMovie, new ImportRejection(ImportRejectionReason.Error, "Unexpected error processing file"));
             }
 
             if (decision == null)
             {
-                _logger.Error("Unable to make a decision on {0}", localMovie.Path);
+                _logger.Error("Unable to make a decision on {0}", localMovie.Path.SanitizeForLog());
             }
             else if (decision.Rejections.Any())
             {
@@ -192,7 +192,7 @@ private ImportRejection EvaluateSpec(IImportDecisionEngineSpecification spec, Lo
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Couldn't evaluate decision on {0}", localMovie.Path);
+                _logger.Error(ex, "Couldn't evaluate decision on {0}", localMovie.Path.SanitizeForLog());
                 return new ImportRejection(ImportRejectionReason.DecisionError, $"{spec.GetType().Name}: {ex.Message}");
             }
 
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs
index 3c70885b10..15a7461661 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs
@@ -303,7 +303,7 @@ private ManualImportItem ProcessFile(string rootFolder, string baseFolder, strin
             }
             catch (Exception ex)
             {
-                _logger.Warn(ex, "Failed to process file: {0}", file);
+                _logger.Warn(ex, "Failed to process file: {0}", file.SanitizeForLog());
             }
 
             return new ManualImportItem
@@ -336,7 +336,7 @@ private List<ManualImportItem> ProcessDownloadDirectory(string rootFolder, List<
             return items;
         }
 
-        private bool SceneSource(Movie movie, string folder)
+        private static bool SceneSource(Movie movie, string folder)
         {
             return !(movie.Path.PathEquals(folder) || movie.Path.IsParentPath(folder));
         }
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/FreeSpaceSpecification.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/FreeSpaceSpecification.cs
index cc9330f6a8..6b01d99247 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/FreeSpaceSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/FreeSpaceSpecification.cs
@@ -43,7 +43,7 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
 
                 if (!freeSpace.HasValue)
                 {
-                    _logger.Debug("Free space check returned an invalid result for: {0}", path);
+                    _logger.Debug("Free space check returned an invalid result for: {0}", path.FullName.SanitizeForLog());
                     return ImportSpecDecision.Accept();
                 }
 
@@ -59,7 +59,7 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Unable to check free disk space while importing: {0}", localMovie.Path);
+                _logger.Error(ex, "Unable to check free disk space while importing: {0}", localMovie.Path.SanitizeForLog());
             }
 
             return ImportSpecDecision.Accept();
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/NotUnpackingSpecification.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/NotUnpackingSpecification.cs
index 05773fac83..5da2d750d3 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/NotUnpackingSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/NotUnpackingSpecification.cs
@@ -3,6 +3,7 @@
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Parser.Model;
@@ -26,7 +27,7 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
         {
             if (localMovie.ExistingFile)
             {
-                _logger.Debug("{0} is in movie folder, skipping unpacking check", localMovie.Path);
+                _logger.Debug("{0} is in movie folder, skipping unpacking check", localMovie.Path.SanitizeForLog());
                 return ImportSpecDecision.Accept();
             }
 
@@ -39,13 +40,13 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
                     {
                         if (OsInfo.IsNotWindows)
                         {
-                            _logger.Debug("{0} is still being unpacked", localMovie.Path);
+                            _logger.Debug("{0} is still being unpacked", localMovie.Path.SanitizeForLog());
                             return ImportSpecDecision.Reject(ImportRejectionReason.Unpacking, "File is still being unpacked");
                         }
 
                         if (_diskProvider.FileGetLastWrite(localMovie.Path) > DateTime.UtcNow.AddMinutes(-5))
                         {
-                            _logger.Debug("{0} appears to be unpacking still", localMovie.Path);
+                            _logger.Debug("{0} appears to be unpacking still", localMovie.Path.SanitizeForLog());
                             return ImportSpecDecision.Reject(ImportRejectionReason.Unpacking, "File is still being unpacked");
                         }
                     }
diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/UpgradeSpecification.cs
index aac399bc43..391eab73b4 100644
--- a/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/UpgradeSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/UpgradeSpecification.cs
@@ -44,7 +44,7 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
 
                 if (qualityCompare < 0)
                 {
-                    _logger.Debug("This file isn't a quality upgrade for movie. Existing quality: {0}. New Quality {1}. Skipping {2}", movieFile.Quality.Quality, localMovie.Quality.Quality, localMovie.Path);
+                    _logger.Debug("This file isn't a quality upgrade for movie. Existing quality: {0}. New Quality {1}. Skipping {2}", movieFile.Quality.Quality, localMovie.Quality.Quality, localMovie.Path.SanitizeForLog());
                     return ImportSpecDecision.Reject(ImportRejectionReason.NotQualityUpgrade, "Not an upgrade for existing movie file. Existing quality: {0}. New Quality {1}.", movieFile.Quality.Quality, localMovie.Quality.Quality);
                 }
 
@@ -54,7 +54,7 @@ public ImportSpecDecision IsSatisfiedBy(LocalMovie localMovie, DownloadClientIte
                     downloadPropersAndRepacks != ProperDownloadTypes.DoNotPrefer &&
                     localMovie.Quality.Revision.CompareTo(movieFile.Quality.Revision) < 0)
                 {
-                    _logger.Debug("This file isn't a quality revision upgrade for movie. Skipping {0}", localMovie.Path);
+                    _logger.Debug("This file isn't a quality revision upgrade for movie. Skipping {0}", localMovie.Path.SanitizeForLog());
                     return ImportSpecDecision.Reject(ImportRejectionReason.NotRevisionUpgrade, "Not a quality revision upgrade for existing movie file(s)");
                 }
 
diff --git a/src/NzbDrone.Core/MediaFiles/UpdateMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/UpdateMovieFileService.cs
index 58691bb1aa..4a60d4a38c 100644
--- a/src/NzbDrone.Core/MediaFiles/UpdateMovieFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpdateMovieFileService.cs
@@ -51,7 +51,7 @@ private bool ChangeFileDate(MovieFile movieFile, Movie movie)
                     {
                         var releaseDate = movie.MovieMetadata.Value.PhysicalRelease ?? movie.MovieMetadata.Value.DigitalRelease;
 
-                        if (releaseDate.HasValue == false)
+                        if (!releaseDate.HasValue)
                         {
                             return false;
                         }
@@ -63,7 +63,7 @@ private bool ChangeFileDate(MovieFile movieFile, Movie movie)
                     {
                         var airDate = movie.MovieMetadata.Value.InCinemas;
 
-                        if (airDate.HasValue == false)
+                        if (!airDate.HasValue)
                         {
                             return false;
                         }
diff --git a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
index 3b24899ac9..368f9e9eb7 100644
--- a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
+++ b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
@@ -17,7 +17,7 @@ public class EventAggregator : IEventAggregator
         private readonly TaskFactory _taskFactory;
         private readonly Dictionary<string, object> _eventSubscribers;
 
-        private class EventSubscribers<TEvent>
+        private sealed class EventSubscribers<TEvent>
             where TEvent : class, IEvent
         {
             public IHandle<TEvent>[] _syncHandlers;
diff --git a/src/NzbDrone.Core/MetadataSource/SearchMovieComparer.cs b/src/NzbDrone.Core/MetadataSource/SearchMovieComparer.cs
index dc23bba7fe..d354464524 100644
--- a/src/NzbDrone.Core/MetadataSource/SearchMovieComparer.cs
+++ b/src/NzbDrone.Core/MetadataSource/SearchMovieComparer.cs
@@ -75,7 +75,7 @@ public int Compare(Movie x, Movie y)
             return Compare(x, y, s => SearchQuery.LevenshteinDistanceClean(s.Title) - GetYearFactor(s));
         }
 
-        public int Compare<T>(Movie x, Movie y, Func<Movie, T> keySelector)
+        public static int Compare<T>(Movie x, Movie y, Func<Movie, T> keySelector)
             where T : IComparable<T>
         {
             var keyX = keySelector(x);
@@ -106,14 +106,14 @@ public int CompareWithYear(Movie x, Movie y, Predicate<Movie> canMatch)
             return matchX.CompareTo(matchY);
         }
 
-        private string CleanPunctuation(string title)
+        private static string CleanPunctuation(string title)
         {
             title = RegexCleanPunctuation.Replace(title, "");
 
             return title.ToLowerInvariant();
         }
 
-        private string CleanTitle(string title)
+        private static string CleanTitle(string title)
         {
             title = RegexCleanPunctuation.Replace(title, "");
             title = RegexCleanCountryYearPostfix.Replace(title, "");
@@ -121,7 +121,7 @@ private string CleanTitle(string title)
             return title.ToLowerInvariant();
         }
 
-        private string CleanArticles(string title)
+        private static string CleanArticles(string title)
         {
             title = ArticleRegex.Replace(title, "");
 
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
index 45fcb7f6cd..6368d6d4df 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
@@ -325,7 +325,7 @@ public MovieMetadata MapMovie(MovieResource resource)
             return movie;
         }
 
-        private string StripTrailingTheFromTitle(string title)
+        private static string StripTrailingTheFromTitle(string title)
         {
             if (title.EndsWith(",the"))
             {
diff --git a/src/NzbDrone.Core/MovieStats/MovieStatisticsRepository.cs b/src/NzbDrone.Core/MovieStats/MovieStatisticsRepository.cs
index 69505e1593..ac57177091 100644
--- a/src/NzbDrone.Core/MovieStats/MovieStatisticsRepository.cs
+++ b/src/NzbDrone.Core/MovieStats/MovieStatisticsRepository.cs
@@ -37,7 +37,7 @@ public List<MovieStatistics> MovieStatistics(int movieId)
                 Query(MovieFilesBuilder().Where<MovieFile>(x => x.MovieId == movieId), _selectMovieFilesTemplate));
         }
 
-        private List<MovieStatistics> MapResults(List<MovieStatistics> moviesResult, List<MovieStatistics> filesResult)
+        private static List<MovieStatistics> MapResults(List<MovieStatistics> moviesResult, List<MovieStatistics> filesResult)
         {
             moviesResult.ForEach(e =>
             {
diff --git a/src/NzbDrone.Core/Movies/AddMovieService.cs b/src/NzbDrone.Core/Movies/AddMovieService.cs
index f479522d98..fd573e1436 100644
--- a/src/NzbDrone.Core/Movies/AddMovieService.cs
+++ b/src/NzbDrone.Core/Movies/AddMovieService.cs
@@ -51,7 +51,7 @@ public Movie AddMovie(Movie newMovie)
             newMovie = AddSkyhookData(newMovie);
             newMovie = SetPropertiesAndValidate(newMovie);
 
-            _logger.Info("Adding Movie {0} Path: [{1}]", newMovie, newMovie.Path);
+            _logger.Info("Adding Movie {0} Path: [{1}]", newMovie, newMovie.Path.SanitizeForLog());
 
             _movieMetadataService.Upsert(newMovie.MovieMetadata.Value);
             newMovie.MovieMetadataId = newMovie.MovieMetadata.Value.Id;
@@ -72,11 +72,11 @@ public List<Movie> AddMovies(List<Movie> newMovies, bool ignoreErrors = false)
             {
                 if (m.Path.IsNullOrWhiteSpace())
                 {
-                    _logger.Info("Adding Movie {0} Root Folder Path: [{1}]", m, m.RootFolderPath);
+                    _logger.Info("Adding Movie {0} Root Folder Path: [{1}]", m, m.RootFolderPath.SanitizeForLog());
                 }
                 else
                 {
-                    _logger.Info("Adding Movie {0} Path: [{1}]", m, m.Path);
+                    _logger.Info("Adding Movie {0} Path: [{1}]", m, m.Path.SanitizeForLog());
                 }
 
                 try
@@ -115,7 +115,7 @@ private Movie AddSkyhookData(Movie newMovie)
             }
             catch (MovieNotFoundException)
             {
-                _logger.Error("TmdbId {0} was not found, it may have been removed from TMDb. Path: {1}", newMovie.TmdbId, newMovie.Path);
+                _logger.Error("TmdbId {0} was not found, it may have been removed from TMDb. Path: {1}", newMovie.TmdbId, newMovie.Path.SanitizeForLog());
 
                 throw new ValidationException(new List<ValidationFailure>
                                               {
diff --git a/src/NzbDrone.Core/Movies/Collections/AddMovieCollectionService.cs b/src/NzbDrone.Core/Movies/Collections/AddMovieCollectionService.cs
index d1a1359de3..d19670b963 100644
--- a/src/NzbDrone.Core/Movies/Collections/AddMovieCollectionService.cs
+++ b/src/NzbDrone.Core/Movies/Collections/AddMovieCollectionService.cs
@@ -74,7 +74,7 @@ private MovieCollection AddSkyhookData(MovieCollection newCollection)
             return collection;
         }
 
-        private MovieCollection SetPropertiesAndValidate(MovieCollection newCollection)
+        private static MovieCollection SetPropertiesAndValidate(MovieCollection newCollection)
         {
             newCollection.CleanTitle = newCollection.Title.CleanMovieTitle();
             newCollection.SortTitle = MovieTitleNormalizer.Normalize(newCollection.Title, newCollection.TmdbId);
diff --git a/src/NzbDrone.Core/Movies/MovieRepository.cs b/src/NzbDrone.Core/Movies/MovieRepository.cs
index ed235a30df..90e9b76c79 100644
--- a/src/NzbDrone.Core/Movies/MovieRepository.cs
+++ b/src/NzbDrone.Core/Movies/MovieRepository.cs
@@ -61,7 +61,7 @@ protected override IEnumerable<Movie> PagedQuery(SqlBuilder builder) =>
             .LeftJoin<Movie, MovieFile>((m, f) => m.Id == f.MovieId)
             .LeftJoin<MovieMetadata, AlternativeTitle>((mm, t) => mm.Id == t.MovieMetadataId);
 
-        private Movie Map(Dictionary<int, Movie> dict, Movie movie, MovieMetadata metadata, QualityProfile qualityProfile, MovieFile movieFile, AlternativeTitle altTitle = null, MovieTranslation translation = null)
+        private static Movie Map(Dictionary<int, Movie> dict, Movie movie, MovieMetadata metadata, QualityProfile qualityProfile, MovieFile movieFile, AlternativeTitle altTitle = null, MovieTranslation translation = null)
         {
             if (!dict.TryGetValue(movie.Id, out var movieEntry))
             {
diff --git a/src/NzbDrone.Core/Movies/MovieService.cs b/src/NzbDrone.Core/Movies/MovieService.cs
index e5248df2b7..60242f938d 100644
--- a/src/NzbDrone.Core/Movies/MovieService.cs
+++ b/src/NzbDrone.Core/Movies/MovieService.cs
@@ -421,7 +421,7 @@ public HashSet<int> AllMovieWithCollectionsTmdbIds()
             return _movieRepository.AllMovieWithCollectionsTmdbIds();
         }
 
-        private Movie ReturnSingleMovieOrThrow(List<Movie> movies)
+        private static Movie ReturnSingleMovieOrThrow(List<Movie> movies)
         {
             if (movies.Count == 0)
             {
diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
index b23653490d..93f756343f 100755
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -381,7 +381,7 @@ private ProcessOutput ExecuteScript(StringDictionary environmentVariables)
             return processOutput;
         }
 
-        private bool ValidatePathParent(string possibleParent, string path)
+        private static bool ValidatePathParent(string possibleParent, string path)
         {
             return possibleParent.IsParentPath(path);
         }
diff --git a/src/NzbDrone.Core/Notifications/Discord/Discord.cs b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
index e9f28825aa..c4f3cee64b 100644
--- a/src/NzbDrone.Core/Notifications/Discord/Discord.cs
+++ b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
@@ -637,7 +637,7 @@ private static string GetLinksString(Movie movie)
             return string.Join(" / ", links);
         }
 
-        private string GetTitle(Movie movie)
+        private static string GetTitle(Movie movie)
         {
             if (movie == null)
             {
diff --git a/src/NzbDrone.Core/Notifications/Mailgun/MailgunProxy.cs b/src/NzbDrone.Core/Notifications/Mailgun/MailgunProxy.cs
index 8bd1796a03..e350840bdc 100644
--- a/src/NzbDrone.Core/Notifications/Mailgun/MailgunProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Mailgun/MailgunProxy.cs
@@ -43,7 +43,7 @@ public void SendNotification(string title, string message, MailgunSettings setti
             }
         }
 
-        private HttpRequestBuilder BuildRequest(MailgunSettings settings, string resource, HttpMethod method, string messageSubject, string messageBody)
+        private static HttpRequestBuilder BuildRequest(MailgunSettings settings, string resource, HttpMethod method, string messageSubject, string messageBody)
         {
             var loginCredentials = new NetworkCredential("api", settings.ApiKey);
             var url = settings.UseEuEndpoint ? BaseUrlEu : BaseUrlUs;
diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
index 8af5104ec7..2d817de01e 100644
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
@@ -152,7 +152,7 @@ private string ProcessRequest(HttpRequest request, MediaBrowserSettings settings
             return response.Content;
         }
 
-        private string GetUrl(MediaBrowserSettings settings)
+        private static string GetUrl(MediaBrowserSettings settings)
         {
             var scheme = settings.UseSsl ? "https" : "http";
             return $@"{scheme}://{settings.Address}";
diff --git a/src/NzbDrone.Core/Notifications/MediaServerUpdateQueue.cs b/src/NzbDrone.Core/Notifications/MediaServerUpdateQueue.cs
index 80cf96b3e6..4983154c83 100644
--- a/src/NzbDrone.Core/Notifications/MediaServerUpdateQueue.cs
+++ b/src/NzbDrone.Core/Notifications/MediaServerUpdateQueue.cs
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Notifications
     public class MediaServerUpdateQueue<TQueueHost, TItemInfo>
         where TQueueHost : class
     {
-        private class UpdateQueue
+        private sealed class UpdateQueue
         {
             public Dictionary<int, UpdateQueueItem<TItemInfo>> Pending { get; } = new ();
             public bool Refreshing { get; set; }
diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs
index ba43d98f35..d7d22f50d0 100644
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -42,7 +42,7 @@ public NotificationService(INotificationFactory notificationFactory, INotificati
             _logger = logger;
         }
 
-        private string GetMessage(Movie movie, QualityModel quality)
+        private static string GetMessage(Movie movie, QualityModel quality)
         {
             var qualityString = quality.Quality.ToString();
             var imdbUrl = "https://www.imdb.com/title/" + movie.MovieMetadata.Value.ImdbId + "/";
@@ -78,7 +78,7 @@ private bool ShouldHandleMovie(ProviderDefinition definition, Movie movie)
             return false;
         }
 
-        private bool ShouldHandleHealthFailure(HealthCheck.HealthCheck healthCheck, bool includeWarnings)
+        private static bool ShouldHandleHealthFailure(HealthCheck.HealthCheck healthCheck, bool includeWarnings)
         {
             if (healthCheck.Type == HealthCheckResult.Error)
             {
diff --git a/src/NzbDrone.Core/Notifications/Ntfy/NtfyProxy.cs b/src/NzbDrone.Core/Notifications/Ntfy/NtfyProxy.cs
index 1fb3dc4444..267d4e6e0a 100644
--- a/src/NzbDrone.Core/Notifications/Ntfy/NtfyProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Ntfy/NtfyProxy.cs
@@ -59,7 +59,7 @@ public void SendNotification(string title, string message, NtfySettings settings
             }
         }
 
-        private HttpRequestBuilder BuildTopicRequest(string serverUrl, string topic)
+        private static HttpRequestBuilder BuildTopicRequest(string serverUrl, string topic)
         {
             var trimServerUrl = serverUrl.TrimEnd('/');
 
diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs
index 199ae0a597..2290376fef 100644
--- a/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexTv/PlexTvProxy.cs
@@ -90,7 +90,7 @@ public List<PlexTvResource> GetResources(string clientIdentifier, string authTok
             return new List<PlexTvResource>();
         }
 
-        private HttpRequestBuilder BuildRequest(string clientIdentifier)
+        private static HttpRequestBuilder BuildRequest(string clientIdentifier)
         {
             var requestBuilder = new HttpRequestBuilder("https://plex.tv")
                                  .Accept(HttpAccept.Json)
diff --git a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerService.cs b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerService.cs
index 63c0c7c216..698d2d3bcd 100644
--- a/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerService.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/Server/PlexServerService.cs
@@ -77,7 +77,7 @@ private List<PlexSection> GetSections(PlexServerSettings settings)
             return _plexServerProxy.GetMovieSections(settings).ToList();
         }
 
-        private void ValidateVersion(Version version)
+        private static void ValidateVersion(Version version)
         {
             if (version >= new Version(1, 3, 0) && version < new Version(1, 3, 1))
             {
diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs
index 4457857721..49e3c53dd9 100644
--- a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs
@@ -152,7 +152,7 @@ public ValidationFailure Test(PushBulletSettings settings)
             return null;
         }
 
-        private HttpRequestBuilder BuildDeviceRequest(string deviceId)
+        private static HttpRequestBuilder BuildDeviceRequest(string deviceId)
         {
             var requestBuilder = new HttpRequestBuilder(PUSH_URL).Post();
 
@@ -173,7 +173,7 @@ private HttpRequestBuilder BuildDeviceRequest(string deviceId)
             return requestBuilder;
         }
 
-        private HttpRequestBuilder BuildChannelRequest(string channelTag)
+        private static HttpRequestBuilder BuildChannelRequest(string channelTag)
         {
             var requestBuilder = new HttpRequestBuilder(PUSH_URL).Post();
 
diff --git a/src/NzbDrone.Core/Notifications/Pushcut/Pushcut.cs b/src/NzbDrone.Core/Notifications/Pushcut/Pushcut.cs
index 1451b4bec2..717de132d6 100644
--- a/src/NzbDrone.Core/Notifications/Pushcut/Pushcut.cs
+++ b/src/NzbDrone.Core/Notifications/Pushcut/Pushcut.cs
@@ -74,7 +74,7 @@ public override void OnManualInteractionRequired(ManualInteractionRequiredMessag
             _proxy.SendNotification(MANUAL_INTERACTION_REQUIRED_TITLE_BRANDED, manualInteractionRequiredMessage.Message, null, new List<NotificationMetadataLink>(), Settings);
         }
 
-        private string GetPosterUrl(Movie movie)
+        private static string GetPosterUrl(Movie movie)
         {
             return movie.MovieMetadata.Value.Images.FirstOrDefault(x => x.CoverType == MediaCoverTypes.Poster)?.RemoteUrl;
         }
diff --git a/src/NzbDrone.Core/Notifications/SendGrid/SendGridProxy.cs b/src/NzbDrone.Core/Notifications/SendGrid/SendGridProxy.cs
index 6a3b41ca9f..b79d5aa509 100644
--- a/src/NzbDrone.Core/Notifications/SendGrid/SendGridProxy.cs
+++ b/src/NzbDrone.Core/Notifications/SendGrid/SendGridProxy.cs
@@ -69,7 +69,7 @@ public void SendNotification(string title, string message, SendGridSettings sett
             }
         }
 
-        private HttpRequest BuildRequest(SendGridSettings settings, string resource, HttpMethod method)
+        private static HttpRequest BuildRequest(SendGridSettings settings, string resource, HttpMethod method)
         {
             var request = new HttpRequestBuilder(settings.BaseUrl).Resource(resource)
                 .SetHeader("Authorization", $"Bearer {settings.ApiKey}")
diff --git a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerProxy.cs b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerProxy.cs
index 89d2135674..5b35535615 100644
--- a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerProxy.cs
@@ -87,7 +87,7 @@ private void ExecuteCommand(string args, bool throwOnStdOut = true)
             }
         }
 
-        private string Escape(string arg)
+        private static string Escape(string arg)
         {
             return string.Format("\"{0}\"", arg.Replace("\"", "\\\""));
         }
diff --git a/src/NzbDrone.Core/Notifications/Trakt/Trakt.cs b/src/NzbDrone.Core/Notifications/Trakt/Trakt.cs
index 078e650607..bcf3cfe333 100644
--- a/src/NzbDrone.Core/Notifications/Trakt/Trakt.cs
+++ b/src/NzbDrone.Core/Notifications/Trakt/Trakt.cs
@@ -204,7 +204,7 @@ private void RemoveMovieFromCollection(TraktSettings settings, Movie movie)
             _proxy.RemoveFromCollection(payload, settings.AccessToken);
         }
 
-        private string MapMediaType(QualitySource source)
+        private static string MapMediaType(QualitySource source)
         {
             var traktSource = source switch
             {
@@ -219,7 +219,7 @@ private string MapMediaType(QualitySource source)
             return traktSource;
         }
 
-        private string MapResolution(int resolution, string scanType)
+        private static string MapResolution(int resolution, string scanType)
         {
             var scanIdentifier = scanType.IsNotNullOrWhiteSpace() && TraktInterlacedTypes.InterlacedTypes.Contains(scanType) ? "i" : "p";
 
@@ -236,7 +236,7 @@ private string MapResolution(int resolution, string scanType)
             return traktResolution;
         }
 
-        private string MapHdr(MovieFile movieFile)
+        private static string MapHdr(MovieFile movieFile)
         {
             var traktHdr = movieFile.MediaInfo?.VideoHdrFormat switch
             {
@@ -250,7 +250,7 @@ private string MapHdr(MovieFile movieFile)
             return traktHdr;
         }
 
-        private string MapAudio(MovieFile movieFile)
+        private static string MapAudio(MovieFile movieFile)
         {
             var audioCodec = movieFile.MediaInfo != null ? MediaInfoFormatter.FormatAudioCodec(movieFile.MediaInfo, movieFile.SceneName) : string.Empty;
 
@@ -280,7 +280,7 @@ private string MapAudio(MovieFile movieFile)
             return traktAudioFormat;
         }
 
-        private string MapAudioChannels(MovieFile movieFile)
+        private static string MapAudioChannels(MovieFile movieFile)
         {
             var audioChannels = movieFile.MediaInfo != null ? MediaInfoFormatter.FormatAudioChannels(movieFile.MediaInfo).ToString("0.0") : string.Empty;
 
diff --git a/src/NzbDrone.Core/Notifications/Twitter/TwitterProxy.cs b/src/NzbDrone.Core/Notifications/Twitter/TwitterProxy.cs
index 3330e4a07c..9331529733 100644
--- a/src/NzbDrone.Core/Notifications/Twitter/TwitterProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterProxy.cs
@@ -85,12 +85,12 @@ public void DirectMessage(string message, TwitterSettings settings)
             ExecuteRequest(request);
         }
 
-        private string GetCustomParametersString(Dictionary<string, string> customParams)
+        private static string GetCustomParametersString(Dictionary<string, string> customParams)
         {
             return customParams.Select(x => string.Format("{0}={1}", x.Key, x.Value)).Join("&");
         }
 
-        private HttpRequest GetRequest(OAuthRequest oAuthRequest, Dictionary<string, string> customParams)
+        private static HttpRequest GetRequest(OAuthRequest oAuthRequest, Dictionary<string, string> customParams)
         {
             var auth = oAuthRequest.GetAuthorizationHeader(customParams);
             var request = new HttpRequest(oAuthRequest.RequestUrl);
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 24d69c7cb4..401e81f1eb 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -317,7 +317,7 @@ private void AddEditionTagsTokens(Dictionary<string, Func<TokenMatch, string>> t
             }
         }
 
-        private void AddReleaseDateTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, int releaseYear)
+        private static void AddReleaseDateTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, int releaseYear)
         {
             if (releaseYear == 0)
             {
@@ -328,7 +328,7 @@ private void AddReleaseDateTokens(Dictionary<string, Func<TokenMatch, string>> t
             tokenHandlers["{Release Year}"] = m => string.Format("{0}", releaseYear.ToString()); // Do I need m.CustomFormat?
         }
 
-        private void AddIdTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Movie movie)
+        private static void AddIdTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Movie movie)
         {
             tokenHandlers["{ImdbId}"] = m => movie.MovieMetadata.Value.ImdbId ?? string.Empty;
             tokenHandlers["{TmdbId}"] = m => movie.MovieMetadata.Value.TmdbId.ToString();
@@ -437,7 +437,7 @@ private void AddCustomFormats(Dictionary<string, Func<TokenMatch, string>> token
             };
         }
 
-        private string GetCustomFormatsToken(List<CustomFormat> customFormats, string filter)
+        private static string GetCustomFormatsToken(List<CustomFormat> customFormats, string filter)
         {
             var tokens = customFormats.Where(x => x.IncludeCustomFormatWhenRenaming).ToList();
 
@@ -460,7 +460,7 @@ private string GetCustomFormatsToken(List<CustomFormat> customFormats, string fi
             return string.Join(" ", filteredTokens);
         }
 
-        private string GetLanguagesToken(List<string> mediaInfoLanguages, string filter, bool skipEnglishOnly, bool quoted)
+        private static string GetLanguagesToken(List<string> mediaInfoLanguages, string filter, bool skipEnglishOnly, bool quoted)
         {
             var tokens = new List<string>();
             foreach (var item in mediaInfoLanguages)
@@ -529,7 +529,7 @@ private string GetLanguagesToken(List<string> mediaInfoLanguages, string filter,
             }
         }
 
-        private string GetEditionToken(MovieFile movieFile)
+        private static string GetEditionToken(MovieFile movieFile)
         {
             var edition = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(movieFile.Edition.ToLowerInvariant());
 
@@ -610,7 +610,7 @@ private string ReplaceToken(Match match, Dictionary<string, Func<TokenMatch, str
             return replacementText;
         }
 
-        private string ReplaceNumberToken(string token, int value)
+        private static string ReplaceNumberToken(string token, int value)
         {
             var split = token.Trim('{', '}').Split(':');
             if (split.Length == 1)
@@ -621,7 +621,7 @@ private string ReplaceNumberToken(string token, int value)
             return value.ToString(split[1]);
         }
 
-        private string GetQualityProper(Movie movie, QualityModel quality)
+        private static string GetQualityProper(Movie movie, QualityModel quality)
         {
             if (quality.Revision.Version > 1)
             {
@@ -631,7 +631,7 @@ private string GetQualityProper(Movie movie, QualityModel quality)
             return string.Empty;
         }
 
-        private string GetQualityReal(Movie movie, QualityModel quality)
+        private static string GetQualityReal(Movie movie, QualityModel quality)
         {
             if (quality.Revision.Real > 0)
             {
@@ -651,7 +651,7 @@ private string GetOriginalTitle(MovieFile movieFile, bool multipleTokens)
             return CleanFileName(movieFile.SceneName);
         }
 
-        private string GetOriginalFileName(MovieFile movieFile, bool multipleTokens)
+        private static string GetOriginalFileName(MovieFile movieFile, bool multipleTokens)
         {
             if (multipleTokens)
             {
@@ -666,7 +666,7 @@ private string GetOriginalFileName(MovieFile movieFile, bool multipleTokens)
             return Path.GetFileNameWithoutExtension(movieFile.RelativePath);
         }
 
-        private string ReplaceReservedDeviceNames(string input)
+        private static string ReplaceReservedDeviceNames(string input)
         {
             // Replace reserved windows device names with an alternative
             return ReservedDeviceNamesRegex.Replace(input, match => match.Value.Replace(".", "_"));
@@ -739,7 +739,7 @@ private string Truncate(string input, string formatter)
             return $"{input.Truncate(maxLength - 3).TrimEnd(' ', '.')}{{ellipsis}}";
         }
 
-        private int GetMaxLengthFromFormatter(string formatter)
+        private static int GetMaxLengthFromFormatter(string formatter)
         {
             int.TryParse(formatter, out var maxCustomLength);
 
diff --git a/src/NzbDrone.Core/Parser/LanguageParser.cs b/src/NzbDrone.Core/Parser/LanguageParser.cs
index 7bace29bb8..d4a20398ec 100644
--- a/src/NzbDrone.Core/Parser/LanguageParser.cs
+++ b/src/NzbDrone.Core/Parser/LanguageParser.cs
@@ -15,6 +15,94 @@ public static class LanguageParser
     {
         private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(LanguageParser));
 
+        private static readonly Dictionary<string, Language> KeywordToLanguage = new Dictionary<string, Language>
+        {
+            { "english", Language.English },
+            { "spanish", Language.Spanish },
+            { "danish", Language.Danish },
+            { "dutch", Language.Dutch },
+            { "japanese", Language.Japanese },
+            { "icelandic", Language.Icelandic },
+            { "mandarin", Language.Chinese },
+            { "cantonese", Language.Chinese },
+            { "chinese", Language.Chinese },
+            { "korean", Language.Korean },
+            { "russian", Language.Russian },
+            { "romanian", Language.Romanian },
+            { "hindi", Language.Hindi },
+            { "arabic", Language.Arabic },
+            { "thai", Language.Thai },
+            { "bulgarian", Language.Bulgarian },
+            { "polish", Language.Polish },
+            { "vietnamese", Language.Vietnamese },
+            { "swedish", Language.Swedish },
+            { "norwegian", Language.Norwegian },
+            { "finnish", Language.Finnish },
+            { "turkish", Language.Turkish },
+            { "portuguese", Language.Portuguese },
+            { "brazilian", Language.PortugueseBR },
+            { "hungarian", Language.Hungarian },
+            { "hebrew", Language.Hebrew },
+            { "ukrainian", Language.Ukrainian },
+            { "persian", Language.Persian },
+            { "bengali", Language.Bengali },
+            { "slovak", Language.Slovak },
+            { "latvian", Language.Latvian },
+            { "latino", Language.SpanishLatino },
+            { "tamil", Language.Tamil },
+            { "telugu", Language.Telugu },
+            { "malayalam", Language.Malayalam },
+            { "kannada", Language.Kannada },
+            { "albanian", Language.Albanian },
+            { "afrikaans", Language.Afrikaans },
+            { "marathi", Language.Marathi },
+            { "tagalog", Language.Tagalog }
+        };
+
+        private static readonly Dictionary<string, Language> CaseSensitiveGroupToLanguage = new Dictionary<string, Language>
+        {
+            { "english", Language.English },
+            { "lithuanian", Language.Lithuanian },
+            { "czech", Language.Czech },
+            { "polish", Language.Polish },
+            { "bulgarian", Language.Bulgarian },
+            { "slovak", Language.Slovak },
+            { "spanish", Language.Spanish },
+            { "german", Language.German }
+        };
+
+        private static readonly Dictionary<string, Language> CaseInsensitiveGroupToLanguage = new Dictionary<string, Language>
+        {
+            { "english", Language.English },
+            { "italian", Language.Italian },
+            { "german", Language.German },
+            { "flemish", Language.Flemish },
+            { "greek", Language.Greek },
+            { "french", Language.French },
+            { "russian", Language.Russian },
+            { "bulgarian", Language.Bulgarian },
+            { "brazilian", Language.PortugueseBR },
+            { "dutch", Language.Dutch },
+            { "hungarian", Language.Hungarian },
+            { "hebrew", Language.Hebrew },
+            { "polish", Language.Polish },
+            { "chinese", Language.Chinese },
+            { "spanish", Language.Spanish },
+            { "catalan", Language.Catalan },
+            { "ukrainian", Language.Ukrainian },
+            { "latvian", Language.Latvian },
+            { "romanian", Language.Romanian },
+            { "telugu", Language.Telugu },
+            { "vietnamese", Language.Vietnamese },
+            { "japanese", Language.Japanese },
+            { "korean", Language.Korean },
+            { "urdu", Language.Urdu },
+            { "romansh", Language.Romansh },
+            { "mongolian", Language.Mongolian },
+            { "georgian", Language.Georgian },
+            { "original", Language.Original }
+        };
+
         private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_|^)(?<english>\beng\b)|
                                                                             (?<italian>\b(?:ita|italian)\b)|
                                                                             (?<german>(?:swiss)?german\b|videomann|ger[. ]dub|\bger\b)|
@@ -68,411 +156,83 @@ public static List<Language> ParseLanguages(string title)
             var lowerTitle = title.ToLower();
             var languages = new List<Language>();
 
-            if (lowerTitle.Contains("english"))
-            {
-                languages.Add(Language.English);
-            }
-
-            if (lowerTitle.Contains("spanish"))
-            {
-                languages.Add(Language.Spanish);
-            }
-
-            if (lowerTitle.Contains("danish"))
-            {
-                languages.Add(Language.Danish);
-            }
-
-            if (lowerTitle.Contains("dutch"))
-            {
-                languages.Add(Language.Dutch);
-            }
-
-            if (lowerTitle.Contains("japanese"))
-            {
-                languages.Add(Language.Japanese);
-            }
-
-            if (lowerTitle.Contains("icelandic"))
-            {
-                languages.Add(Language.Icelandic);
-            }
-
-            if (lowerTitle.Contains("mandarin") || lowerTitle.Contains("cantonese") || lowerTitle.Contains("chinese"))
-            {
-                languages.Add(Language.Chinese);
-            }
-
-            if (lowerTitle.Contains("korean"))
-            {
-                languages.Add(Language.Korean);
-            }
-
-            if (lowerTitle.Contains("russian"))
-            {
-                languages.Add(Language.Russian);
-            }
-
-            if (lowerTitle.Contains("romanian"))
-            {
-                languages.Add(Language.Romanian);
-            }
-
-            if (lowerTitle.Contains("hindi"))
-            {
-                languages.Add(Language.Hindi);
-            }
-
-            if (lowerTitle.Contains("arabic"))
-            {
-                languages.Add(Language.Arabic);
-            }
-
-            if (lowerTitle.Contains("thai"))
-            {
-                languages.Add(Language.Thai);
-            }
-
-            if (lowerTitle.Contains("bulgarian"))
-            {
-                languages.Add(Language.Bulgarian);
-            }
-
-            if (lowerTitle.Contains("polish"))
-            {
-                languages.Add(Language.Polish);
-            }
-
-            if (lowerTitle.Contains("vietnamese"))
-            {
-                languages.Add(Language.Vietnamese);
-            }
-
-            if (lowerTitle.Contains("swedish"))
-            {
-                languages.Add(Language.Swedish);
-            }
-
-            if (lowerTitle.Contains("norwegian"))
-            {
-                languages.Add(Language.Norwegian);
-            }
-
-            if (lowerTitle.Contains("finnish"))
-            {
-                languages.Add(Language.Finnish);
-            }
-
-            if (lowerTitle.Contains("turkish"))
-            {
-                languages.Add(Language.Turkish);
-            }
-
-            if (lowerTitle.Contains("portuguese"))
-            {
-                languages.Add(Language.Portuguese);
-            }
-
-            if (lowerTitle.Contains("brazilian"))
-            {
-                languages.Add(Language.PortugueseBR);
-            }
-
-            if (lowerTitle.Contains("hungarian"))
-            {
-                languages.Add(Language.Hungarian);
-            }
-
-            if (lowerTitle.Contains("hebrew"))
-            {
-                languages.Add(Language.Hebrew);
-            }
-
-            if (lowerTitle.Contains("ukrainian"))
-            {
-                languages.Add(Language.Ukrainian);
-            }
-
-            if (lowerTitle.Contains("persian"))
-            {
-                languages.Add(Language.Persian);
-            }
-
-            if (lowerTitle.Contains("bengali"))
-            {
-                languages.Add(Language.Bengali);
-            }
-
-            if (lowerTitle.Contains("slovak"))
-            {
-                languages.Add(Language.Slovak);
-            }
-
-            if (lowerTitle.Contains("latvian"))
-            {
-                languages.Add(Language.Latvian);
-            }
-
-            if (lowerTitle.Contains("latino"))
-            {
-                languages.Add(Language.SpanishLatino);
-            }
-
-            if (lowerTitle.Contains("tamil"))
-            {
-                languages.Add(Language.Tamil);
-            }
-
-            if (lowerTitle.Contains("telugu"))
-            {
-                languages.Add(Language.Telugu);
-            }
-
-            if (lowerTitle.Contains("malayalam"))
-            {
-                languages.Add(Language.Malayalam);
-            }
-
-            if (lowerTitle.Contains("kannada"))
-            {
-                languages.Add(Language.Kannada);
-            }
-
-            if (lowerTitle.Contains("albanian"))
-            {
-                languages.Add(Language.Albanian);
-            }
-
-            if (lowerTitle.Contains("afrikaans"))
-            {
-                languages.Add(Language.Afrikaans);
-            }
-
-            if (lowerTitle.Contains("marathi"))
-            {
-                languages.Add(Language.Marathi);
-            }
-
-            if (lowerTitle.Contains("tagalog"))
-            {
-                languages.Add(Language.Tagalog);
-            }
-
-            // Case-sensitive
-            var caseSensitiveMatches = CaseSensitiveLanguageRegex.Matches(title);
-
-            foreach (Match match in caseSensitiveMatches)
-            {
-                if (match.Groups["english"].Captures.Any())
-                {
-                    languages.Add(Language.English);
-                }
-
-                if (match.Groups["lithuanian"].Captures.Any())
-                {
-                    languages.Add(Language.Lithuanian);
-                }
-
-                if (match.Groups["czech"].Captures.Any())
-                {
-                    languages.Add(Language.Czech);
-                }
-
-                if (match.Groups["polish"].Captures.Any())
-                {
-                    languages.Add(Language.Polish);
-                }
-
-                if (match.Groups["bulgarian"].Captures.Any())
-                {
-                    languages.Add(Language.Bulgarian);
-                }
-
-                if (match.Groups["slovak"].Captures.Any())
-                {
-                    languages.Add(Language.Slovak);
-                }
-
-                if (match.Groups["spanish"].Captures.Any())
-                {
-                    languages.Add(Language.Spanish);
-                }
-
-                if (match.Groups["german"].Captures.Any())
-                {
-                    languages.Add(Language.German);
-                }
-            }
-
-            // Case-insensitive
-            var matches = LanguageRegex.Matches(title);
-
-            foreach (Match match in matches)
-            {
-                if (match.Groups["english"].Success)
-                {
-                    languages.Add(Language.English);
-                }
-
-                if (match.Groups["italian"].Captures.Any())
-                {
-                    languages.Add(Language.Italian);
-                }
-
-                if (match.Groups["german"].Captures.Any())
-                {
-                    languages.Add(Language.German);
-                }
-
-                if (match.Groups["flemish"].Captures.Any())
-                {
-                    languages.Add(Language.Flemish);
-                }
-
-                if (match.Groups["greek"].Captures.Any())
-                {
-                    languages.Add(Language.Greek);
-                }
-
-                if (match.Groups["french"].Success)
-                {
-                    languages.Add(Language.French);
-                }
-
-                if (match.Groups["russian"].Success)
-                {
-                    languages.Add(Language.Russian);
-                }
-
-                if (match.Groups["bulgarian"].Success)
-                {
-                    languages.Add(Language.Bulgarian);
-                }
-
-                if (match.Groups["brazilian"].Success)
-                {
-                    languages.Add(Language.PortugueseBR);
-                }
-
-                if (match.Groups["dutch"].Success)
-                {
-                    languages.Add(Language.Dutch);
-                }
-
-                if (match.Groups["hungarian"].Success)
-                {
-                    languages.Add(Language.Hungarian);
-                }
-
-                if (match.Groups["hebrew"].Success)
-                {
-                    languages.Add(Language.Hebrew);
-                }
-
-                if (match.Groups["polish"].Success)
-                {
-                    languages.Add(Language.Polish);
-                }
-
-                if (match.Groups["chinese"].Success)
-                {
-                    languages.Add(Language.Chinese);
-                }
-
-                if (match.Groups["spanish"].Success)
-                {
-                    languages.Add(Language.Spanish);
-                }
-
-                if (match.Groups["catalan"].Success)
-                {
-                    languages.Add(Language.Catalan);
-                }
-
-                if (match.Groups["ukrainian"].Success)
-                {
-                    languages.Add(Language.Ukrainian);
-                }
-
-                if (match.Groups["latvian"].Success)
-                {
-                    languages.Add(Language.Latvian);
-                }
-
-                if (match.Groups["romanian"].Success)
-                {
-                    languages.Add(Language.Romanian);
-                }
-
-                if (match.Groups["telugu"].Success)
-                {
-                    languages.Add(Language.Telugu);
-                }
-
-                if (match.Groups["vietnamese"].Success)
-                {
-                    languages.Add(Language.Vietnamese);
-                }
-
-                if (match.Groups["japanese"].Success)
-                {
-                    languages.Add(Language.Japanese);
-                }
-
-                if (match.Groups["korean"].Success)
-                {
-                    languages.Add(Language.Korean);
-                }
-
-                if (match.Groups["urdu"].Success)
-                {
-                    languages.Add(Language.Urdu);
-                }
-
-                if (match.Groups["romansh"].Success)
-                {
-                    languages.Add(Language.Romansh);
-                }
-
-                if (match.Groups["mongolian"].Success)
-                {
-                    languages.Add(Language.Mongolian);
-                }
-
-                if (match.Groups["georgian"].Success)
-                {
-                    languages.Add(Language.Georgian);
-                }
-
-                if (match.Groups["original"].Success)
-                {
-                    languages.Add(Language.Original);
-                }
-            }
+            AddLanguagesFromKeywords(lowerTitle, languages);
+            AddLanguagesFromCaseSensitiveRegex(title, languages);
+            AddLanguagesFromCaseInsensitiveRegex(title, languages);
 
             if (!languages.Any())
             {
                 languages.Add(Language.Unknown);
             }
 
-            if (languages.Count == 1 && languages.Single() == Language.German)
-            {
-                if (GermanDualLanguageRegex.IsMatch(title))
-                {
-                    Logger.Trace("Adding original language because the release title contains German DL tag");
-                    languages.Add(Language.Original);
-                }
-                else if (GermanMultiLanguageRegex.IsMatch(title))
-                {
-                    Logger.Trace("Adding original language and English because the release title contains German ML tag");
-                    languages.Add(Language.Original);
-                    languages.Add(Language.English);
-                }
-            }
+            AddGermanMultiLanguageVariants(title, languages);
 
             return languages.DistinctBy(l => (int)l).ToList();
         }
 
+        private static void AddLanguagesFromKeywords(string lowerTitle, List<Language> languages)
+        {
+            foreach (var mapping in KeywordToLanguage)
+            {
+                if (lowerTitle.Contains(mapping.Key))
+                {
+                    languages.Add(mapping.Value);
+                }
+            }
+        }
+
+        private static void AddLanguagesFromCaseSensitiveRegex(string title, List<Language> languages)
+        {
+            var matches = CaseSensitiveLanguageRegex.Matches(title);
+
+            foreach (Match match in matches)
+            {
+                foreach (var mapping in CaseSensitiveGroupToLanguage)
+                {
+                    if (match.Groups[mapping.Key].Captures.Any())
+                    {
+                        languages.Add(mapping.Value);
+                    }
+                }
+            }
+        }
+
+        private static void AddLanguagesFromCaseInsensitiveRegex(string title, List<Language> languages)
+        {
+            var matches = LanguageRegex.Matches(title);
+
+            foreach (Match match in matches)
+            {
+                foreach (var mapping in CaseInsensitiveGroupToLanguage)
+                {
+                    if (match.Groups[mapping.Key].Success)
+                    {
+                        languages.Add(mapping.Value);
+                    }
+                }
+            }
+        }
+
+        private static void AddGermanMultiLanguageVariants(string title, List<Language> languages)
+        {
+            if (languages.Count != 1 || languages.Single() != Language.German)
+            {
+                return;
+            }
+
+            if (GermanDualLanguageRegex.IsMatch(title))
+            {
+                Logger.Trace("Adding original language because the release title contains German DL tag");
+                languages.Add(Language.Original);
+            }
+            else if (GermanMultiLanguageRegex.IsMatch(title))
+            {
+                Logger.Trace("Adding original language and English because the release title contains German ML tag");
+                languages.Add(Language.Original);
+                languages.Add(Language.English);
+            }
+        }
+
         public static List<string> ParseLanguageTags(string fileName)
         {
             try
@@ -486,7 +246,7 @@ public static List<string> ParseLanguageTags(string fileName)
             }
             catch (Exception ex)
             {
-                Logger.Debug(ex, "Failed parsing language tags from subtitle file: {0}", fileName);
+                Logger.Debug(ex, "Failed parsing language tags from subtitle file: {0}", fileName.SanitizeForLog());
             }
 
             return new List<string>();
@@ -496,7 +256,7 @@ public static Language ParseSubtitleLanguage(string fileName)
         {
             try
             {
-                Logger.Debug("Parsing language from subtitle file: {0}", fileName);
+                Logger.Debug("Parsing language from subtitle file: {0}", fileName.SanitizeForLog());
 
                 var simpleFilename = Path.GetFileNameWithoutExtension(fileName);
                 var languageMatch = SubtitleLanguageRegex.Match(simpleFilename);
@@ -517,11 +277,11 @@ public static Language ParseSubtitleLanguage(string fileName)
                     }
                 }
 
-                Logger.Debug("Unable to parse language from subtitle file: {0}", fileName);
+                Logger.Debug("Unable to parse language from subtitle file: {0}", fileName.SanitizeForLog());
             }
             catch (Exception ex)
             {
-                Logger.Debug(ex, "Failed parsing language from subtitle file: {0}", fileName);
+                Logger.Debug(ex, "Failed parsing language from subtitle file: {0}", fileName.SanitizeForLog());
             }
 
             return Language.Unknown;
@@ -544,7 +304,7 @@ public static SubtitleTitleInfo ParseSubtitleLanguageInformation(string fileName
 
             if (!matchTitle.Groups["title"].Success || (matchTitle.Groups["iso_code"].Captures.Count is var languageCodeNumber && languageCodeNumber != 1))
             {
-                Logger.Debug("Could not parse a title from subtitle file: {0}. Falling back to parsing without title.", fileName);
+                Logger.Debug("Could not parse a title from subtitle file: {0}. Falling back to parsing without title.", fileName.SanitizeForLog());
 
                 return ParseBasicSubtitle(fileName);
             }
diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index ed82f00119..5a614c1efc 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -43,9 +43,10 @@ public static class Parser
             new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*" + EditionRegex + @".{1,3}(?<year>(1(8|9)|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
-            // Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition //TODO: Seems to slow down parsing heavily!
-            /*new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|(19|20)\d{2}|\]|\W(19|20)\d{2})))+(\W+|_|$)(?!\\)\(?(?<edition>(((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final(?=(.(Cut|Edition|Version)))|Extended|Rogue|Special|Despecialized|\d{2,3}(th)?.Anniversary)(.(Cut|Edition|Version))?(.(Extended|Uncensored|Remastered|Unrated|Uncut|IMAX|Fan.?Edit))?|((Uncensored|Remastered|Unrated|Uncut|IMAX|Fan.?Edit|Edition|Restored|((2|3|4)in1))))))\)?",
-                          RegexOptions.IgnoreCase | RegexOptions.Compiled),*/
+            // DISABLED: Complex regex for edition movies with year before edition text
+            // e.g: Mission.Impossible.3.2011.Special.Edition
+            // Reason: Causes ReDoS-like performance degradation due to catastrophic backtracking
+            // Keep for reference; covered by simpler patterns above
 
             // Normal movie format, e.g: Mission.Impossible.3.2011
             new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(1(8|9)|20)\d{2}(?!p|i|(1(8|9)|20)\d{2}|\]|\W(1(8|9)|20)\d{2})))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -153,13 +154,13 @@ public static ParsedMovieInfo ParseMoviePath(string path)
 
             if (result == null)
             {
-                Logger.Debug("Attempting to parse movie info using directory and file names. {0}", fileInfo.Directory.Name);
+                Logger.Debug("Attempting to parse movie info using directory and file names. {0}", fileInfo.Directory.Name.SanitizeForLog());
                 result = ParseMovieTitle(fileInfo.Directory.Name + " " + fileInfo.Name);
             }
 
             if (result == null)
             {
-                Logger.Debug("Attempting to parse movie info using directory name. {0}", fileInfo.Directory.Name);
+                Logger.Debug("Attempting to parse movie info using directory name. {0}", fileInfo.Directory.Name.SanitizeForLog());
                 result = ParseMovieTitle(fileInfo.Directory.Name + fileInfo.Extension);
             }
 
@@ -176,7 +177,7 @@ public static ParsedMovieInfo ParseMovieTitle(string title, bool isDir = false)
                     return null;
                 }
 
-                Logger.Debug("Parsing string '{0}'", title);
+                Logger.Debug("Parsing string '{0}'", title.SanitizeForLog());
 
                 if (ReversedTitleRegex.IsMatch(title))
                 {
@@ -185,7 +186,7 @@ public static ParsedMovieInfo ParseMovieTitle(string title, bool isDir = false)
 
                     title = $"{titleWithoutExtension}{title.Substring(titleWithoutExtension.Length)}";
 
-                    Logger.Debug("Reversed name detected. Converted to '{0}'", title);
+                    Logger.Debug("Reversed name detected. Converted to '{0}'", title.SanitizeForLog());
                 }
 
                 var releaseTitle = FileExtensions.RemoveFileExtension(title);
@@ -200,7 +201,7 @@ public static ParsedMovieInfo ParseMovieTitle(string title, bool isDir = false)
                     if (replace.TryReplace(ref releaseTitle))
                     {
                         Logger.Trace($"Replace regex: {replace}");
-                        Logger.Debug("Substituted with " + releaseTitle);
+                        Logger.Debug("Substituted with " + releaseTitle.SanitizeForLog());
                     }
                 }
 
@@ -312,11 +313,11 @@ public static ParsedMovieInfo ParseMovieTitle(string title, bool isDir = false)
             {
                 if (!title.ToLower().Contains("password") && !title.ToLower().Contains("yenc"))
                 {
-                    Logger.Error(e, "An error has occurred while trying to parse {0}", title);
+                    Logger.Error(e, "An error has occurred while trying to parse {0}", title.SanitizeForLog());
                 }
             }
 
-            Logger.Debug("Unable to parse {0}", title);
+            Logger.Debug("Unable to parse {0}", title.SanitizeForLog());
             return null;
         }
 
@@ -598,7 +599,7 @@ private static bool ValidateBeforeParsing(string title)
 
             if (RejectHashedReleasesRegex.Any(v => v.IsMatch(titleWithoutExtension)))
             {
-                Logger.Debug("Rejected Hashed Release Title: " + title);
+                Logger.Debug("Rejected Hashed Release Title: " + title.SanitizeForLog());
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs
index cd406d50c7..b3b411edc3 100644
--- a/src/NzbDrone.Core/Parser/ParsingService.cs
+++ b/src/NzbDrone.Core/Parser/ParsingService.cs
@@ -209,7 +209,7 @@ private FindMovieResult TryGetMovieByTitleAndOrYear(ParsedMovieInfo parsedMovieI
             return null;
         }
 
-        private FindMovieResult TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo, string imdbId, int tmdbId, SearchCriteriaBase searchCriteria)
+        private static FindMovieResult TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo, string imdbId, int tmdbId, SearchCriteriaBase searchCriteria)
         {
             Movie possibleMovie = null;
 
diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs
index 828b6492a7..4426e7d9c3 100644
--- a/src/NzbDrone.Core/Parser/QualityParser.cs
+++ b/src/NzbDrone.Core/Parser/QualityParser.cs
@@ -78,7 +78,7 @@ public class QualityParser
 
         public static QualityModel ParseQuality(string name)
         {
-            Logger.Debug("Trying to parse quality for '{0}'", name);
+            Logger.Debug("Trying to parse quality for '{0}'", name.SanitizeForLog());
 
             if (name.IsNullOrWhiteSpace())
             {
diff --git a/src/NzbDrone.Core/Parser/RegexReplace.cs b/src/NzbDrone.Core/Parser/RegexReplace.cs
index 456eefca08..1a2d81971a 100644
--- a/src/NzbDrone.Core/Parser/RegexReplace.cs
+++ b/src/NzbDrone.Core/Parser/RegexReplace.cs
@@ -1,22 +1,25 @@
+using System;
 using System.Text.RegularExpressions;
 
 namespace NzbDrone.Core.Parser
 {
     public class RegexReplace
     {
+        private static readonly TimeSpan RegexTimeout = TimeSpan.FromSeconds(5);
+
         private readonly Regex _regex;
         private readonly string _replacementFormat;
         private readonly MatchEvaluator _replacementFunc;
 
         public RegexReplace(string pattern, string replacement, RegexOptions regexOptions)
         {
-            _regex = new Regex(pattern, regexOptions);
+            _regex = new Regex(pattern, regexOptions | RegexOptions.Compiled, RegexTimeout);
             _replacementFormat = replacement;
         }
 
         public RegexReplace(string pattern, MatchEvaluator replacement, RegexOptions regexOptions)
         {
-            _regex = new Regex(pattern, regexOptions);
+            _regex = new Regex(pattern, regexOptions | RegexOptions.Compiled, RegexTimeout);
             _replacementFunc = replacement;
         }
 
diff --git a/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs b/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
index b71f80dd4f..93bbf6d032 100644
--- a/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
@@ -150,7 +150,7 @@ public List<DelayProfile> Reorder(int id, int? afterId)
             return All();
         }
 
-        private int GetAfterOrder(DelayProfile moving, DelayProfile after)
+        private static int GetAfterOrder(DelayProfile moving, DelayProfile after)
         {
             if (after == null)
             {
diff --git a/src/NzbDrone.Core/Profiles/Releases/TermMatcherService.cs b/src/NzbDrone.Core/Profiles/Releases/TermMatcherService.cs
index 69df8e4503..0f88c92761 100644
--- a/src/NzbDrone.Core/Profiles/Releases/TermMatcherService.cs
+++ b/src/NzbDrone.Core/Profiles/Releases/TermMatcherService.cs
@@ -34,7 +34,7 @@ public ITermMatcher GetMatcher(string term)
             return _matcherCache.Get(term, () => CreateMatcherInternal(term), TimeSpan.FromHours(24));
         }
 
-        private ITermMatcher CreateMatcherInternal(string term)
+        private static ITermMatcher CreateMatcherInternal(string term)
         {
             if (PerlRegexFactory.TryCreateRegex(term, out var regex))
             {
diff --git a/src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs b/src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs
index 37885c47dc..e1a51cd0ac 100644
--- a/src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs
+++ b/src/NzbDrone.Core/ProgressMessaging/ProgressMessageTarget.cs
@@ -44,7 +44,7 @@ protected override void Write(LogEventInfo logEvent)
             }
         }
 
-        private bool IsClientMessage(LogEventInfo logEvent, CommandModel command)
+        private static bool IsClientMessage(LogEventInfo logEvent, CommandModel command)
         {
             if (command == null || !command.Body.SendUpdatesToClient)
             {
diff --git a/src/NzbDrone.Core/RemotePathMappings/RemotePathMappingService.cs b/src/NzbDrone.Core/RemotePathMappings/RemotePathMappingService.cs
index 188db31903..0cd6f39158 100644
--- a/src/NzbDrone.Core/RemotePathMappings/RemotePathMappingService.cs
+++ b/src/NzbDrone.Core/RemotePathMappings/RemotePathMappingService.cs
@@ -96,7 +96,7 @@ private void ValidateMapping(List<RemotePathMapping> existing, RemotePathMapping
                 throw new ArgumentException("Invalid Host");
             }
 
-            if (mapping.RemotePath.StartsWith(" "))
+            if (mapping.RemotePath.StartsWith(' '))
             {
                 throw new ArgumentException("Remote Path must not start with a space");
             }
diff --git a/src/NzbDrone.Core/RootFolders/RootFolderService.cs b/src/NzbDrone.Core/RootFolders/RootFolderService.cs
index 3277a16071..4ef24c319f 100644
--- a/src/NzbDrone.Core/RootFolders/RootFolderService.cs
+++ b/src/NzbDrone.Core/RootFolders/RootFolderService.cs
@@ -92,7 +92,7 @@ public List<RootFolder> AllWithUnmappedFolders()
                 // We don't want an exception to prevent the root folders from loading in the UI, so they can still be deleted
                 catch (Exception ex)
                 {
-                    _logger.Error(ex, "Unable to get free space and unmapped folders for root folder {0}", folder.Path);
+                    _logger.Error(ex, "Unable to get free space and unmapped folders for root folder {0}", folder.Path.SanitizeForLog());
                     folder.UnmappedFolders = new List<UnmappedFolder>();
                 }
             });
@@ -153,7 +153,7 @@ private List<UnmappedFolder> GetUnmappedFolders(string path, Dictionary<int, str
 
             if (!_diskProvider.FolderExists(path))
             {
-                _logger.Debug("Path supplied does not exist: {0}", path);
+                _logger.Debug("Path supplied does not exist: {0}", path.SanitizeForLog());
                 return results;
             }
 
diff --git a/src/NzbDrone.Core/Security/X509CertificateValidationService.cs b/src/NzbDrone.Core/Security/X509CertificateValidationService.cs
index 41d1cdf604..1816f605d8 100644
--- a/src/NzbDrone.Core/Security/X509CertificateValidationService.cs
+++ b/src/NzbDrone.Core/Security/X509CertificateValidationService.cs
@@ -75,7 +75,7 @@ public bool ShouldByPassValidationError(object sender, X509Certificate certifica
             return false;
         }
 
-        private IPAddress[] GetIPAddresses(string host)
+        private static IPAddress[] GetIPAddresses(string host)
         {
             if (IPAddress.TryParse(host, out var ipAddress))
             {
diff --git a/src/NzbDrone.Core/Tags/TagService.cs b/src/NzbDrone.Core/Tags/TagService.cs
index 93c85fe369..90c23e0153 100644
--- a/src/NzbDrone.Core/Tags/TagService.cs
+++ b/src/NzbDrone.Core/Tags/TagService.cs
@@ -190,7 +190,7 @@ public void Delete(int tagId)
             _eventAggregator.PublishEvent(new TagsUpdatedEvent());
         }
 
-        private List<int> GetAutoTagIds(Tag tag, List<AutoTag> autoTags)
+        private static List<int> GetAutoTagIds(Tag tag, List<AutoTag> autoTags)
         {
             var autoTagIds = autoTags.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList();
 
diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs
index 0fe738bb5a..7d75cf3268 100644
--- a/src/NzbDrone.Core/Update/InstallUpdateService.cs
+++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs
@@ -99,7 +99,7 @@ private bool InstallUpdate(UpdatePackage updatePackage)
                 }
             }
 
-            if (_appFolderInfo.StartUpFolder.EndsWith("_output"))
+            if (Path.GetFileName(_appFolderInfo.StartUpFolder) == "_output")
             {
                 _logger.ProgressDebug("Running in developer environment, not updating.");
                 return false;
@@ -181,7 +181,7 @@ private void EnsureValidBranch(UpdatePackage package)
             {
                 try
                 {
-                    _logger.Info("Branch [{0}] is being redirected to [{1}]]", currentBranch, package.Branch);
+                    _logger.Info("Branch [{0}] is being redirected to [{1}]", currentBranch, package.Branch);
                     var config = new Dictionary<string, object>();
                     config["Branch"] = package.Branch;
                     _configFileProvider.SaveConfigDictionary(config);
diff --git a/src/NzbDrone.Host/CancelHandler.cs b/src/NzbDrone.Host/CancelHandler.cs
index fbe142c816..82e373df8b 100644
--- a/src/NzbDrone.Host/CancelHandler.cs
+++ b/src/NzbDrone.Host/CancelHandler.cs
@@ -57,7 +57,7 @@ private void GracefulShutdown()
             _lifecycleService.Shutdown();
         }
 
-        private void UngracefulShutdown()
+        private static void UngracefulShutdown()
         {
             Console.WriteLine("Termination requested.");
 
diff --git a/src/NzbDrone.Host/Startup.cs b/src/NzbDrone.Host/Startup.cs
index eebf6f08d9..e2b2d5a8ab 100644
--- a/src/NzbDrone.Host/Startup.cs
+++ b/src/NzbDrone.Host/Startup.cs
@@ -306,7 +306,7 @@ public void Configure(IApplicationBuilder app,
             });
         }
 
-        private void EnsureSingleInstance(bool isService, IStartupContext startupContext, ISingleInstancePolicy instancePolicy)
+        private static void EnsureSingleInstance(bool isService, IStartupContext startupContext, ISingleInstancePolicy instancePolicy)
         {
             if (startupContext.Flags.Contains(StartupContext.NO_SINGLE_INSTANCE_CHECK))
             {
diff --git a/src/NzbDrone.Integration.Test/ApiTests/IndexerFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/IndexerFixture.cs
index 9acb6a5a38..ca8dd9d62e 100644
--- a/src/NzbDrone.Integration.Test/ApiTests/IndexerFixture.cs
+++ b/src/NzbDrone.Integration.Test/ApiTests/IndexerFixture.cs
@@ -46,7 +46,7 @@ private IndexerResource GetNewznabSchemav3(string name = null)
             return schema;
         }
 
-        private Field GetCategoriesField(IndexerResource resource)
+        private static Field GetCategoriesField(IndexerResource resource)
         {
             var field = resource.Fields.First(v => v.Name == "categories");
 
diff --git a/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs
index 8c4fdfb3f4..3cc7c8ccea 100644
--- a/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs
+++ b/src/NzbDrone.Integration.Test/ApiTests/ReleaseFixture.cs
@@ -41,7 +41,7 @@ public void should_accept_request_with_only_guid_supplied()
             var result = Releases.Post(new ReleaseResource { Guid = releases.First().Guid }, HttpStatusCode.InternalServerError);
         }
 
-        private bool BeValidRelease(ReleaseResource releaseResource)
+        private static bool BeValidRelease(ReleaseResource releaseResource)
         {
             releaseResource.Guid.Should().NotBeNullOrEmpty();
             releaseResource.Age.Should().BeGreaterOrEqualTo(-1);
diff --git a/src/NzbDrone.Integration.Test/CorsFixture.cs b/src/NzbDrone.Integration.Test/CorsFixture.cs
index ed5a178ac5..be59415077 100644
--- a/src/NzbDrone.Integration.Test/CorsFixture.cs
+++ b/src/NzbDrone.Integration.Test/CorsFixture.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Integration.Test
     [TestFixture]
     public class CorsFixture : IntegrationTest
     {
-        private RestRequest BuildGet(string route = "movie")
+        private static RestRequest BuildGet(string route = "movie")
         {
             var request = new RestRequest(route, Method.GET);
             request.AddHeader("Origin", "http://a.different.domain");
@@ -17,7 +17,7 @@ private RestRequest BuildGet(string route = "movie")
             return request;
         }
 
-        private RestRequest BuildOptions(string route = "movie")
+        private static RestRequest BuildOptions(string route = "movie")
         {
             var request = new RestRequest(route, Method.OPTIONS);
             request.AddHeader("Origin", "http://a.different.domain");
diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
index a09a68a98b..cfc56b8382 100644
--- a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
+++ b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
@@ -54,7 +54,7 @@ protected override void SetWritePermissions(string path, bool writable)
             SetWritePermissionsInternal(path, writable, false);
         }
 
-        protected void SetWritePermissionsInternal(string path, bool writable, bool setgid)
+        protected static void SetWritePermissionsInternal(string path, bool writable, bool setgid)
         {
             // Remove Write permissions, we're still owner so we can clean it up, but we'll have to do that explicitly.
             Syscall.stat(path, out var stat);
diff --git a/src/NzbDrone.Mono/Disk/DiskProvider.cs b/src/NzbDrone.Mono/Disk/DiskProvider.cs
index a44966bc53..e17962d75e 100644
--- a/src/NzbDrone.Mono/Disk/DiskProvider.cs
+++ b/src/NzbDrone.Mono/Disk/DiskProvider.cs
@@ -46,7 +46,7 @@ public override IMount GetMount(string path)
 
             if (mount == null)
             {
-                _logger.Debug("Unable to get free space for '{0}', unable to find suitable drive", path);
+                _logger.Debug("Unable to get free space for '{0}', unable to find suitable drive", path.SanitizeForLog());
                 return null;
             }
 
@@ -82,7 +82,7 @@ public override void SetPermissions(string path, string mask, string group)
 
         protected void SetPermissions(string path, string mask, string group, FilePermissions permissions)
         {
-            _logger.Debug("Setting permissions: {0} on {1}", mask, path);
+            _logger.Debug("Setting permissions: {0} on {1}", mask, path.SanitizeForLog());
 
             // Preserve non-access permissions
             if (Syscall.stat(path, out var curStat) < 0)
@@ -162,7 +162,7 @@ public override void CopyPermissions(string sourcePath, string targetPath)
             }
             catch (Exception ex)
             {
-                _logger.Debug(ex, "Failed to copy permissions from {0} to {1}", sourcePath, targetPath);
+                _logger.Debug(ex, "Failed to copy permissions from {0} to {1}", sourcePath.SanitizeForLog(), targetPath.SanitizeForLog());
             }
         }
 
@@ -190,7 +190,7 @@ protected override List<IMount> GetAllMounts()
                         }
                         catch (Exception ex)
                         {
-                            _logger.Debug(ex, "Failed to fetch drive info for mount point: {0}", d.Name);
+                            _logger.Debug(ex, "Failed to fetch drive info for mount point: {0}", d.Name.SanitizeForLog());
 
                             return null;
                         }
@@ -340,7 +340,7 @@ private void TransferFilePatched(string source, string destination, bool overwri
                     Syscall.lstat(destination, out var deststat) != 0 &&
                     Syscall.rename(source, destination) == 0)
                 {
-                    _logger.Trace("Moved '{0}' -> '{1}' using Syscall.rename", source, destination);
+                    _logger.Trace("Moved '{0}' -> '{1}' using Syscall.rename", source.SanitizeForLog(), destination.SanitizeForLog());
                     return;
                 }
             }
@@ -365,7 +365,7 @@ private void TransferFilePatched(string source, string destination, bool overwri
                 if (exists && dstInfo.Length == srcInfo.Length)
                 {
                     // mono 6.0, mono 6.4 and netcore 3.1 bug: full length file since utime and chmod happens at the end
-                    _logger.Debug("{3} failed to {2} file likely due to known {3} bug, attempting to {2} directly. '{0}' -> '{1}'", source, destination, move ? "move" : "copy", PlatformInfo.PlatformName);
+                    _logger.Debug("{3} failed to {2} file likely due to known {3} bug, attempting to {2} directly. '{0}' -> '{1}'", source.SanitizeForLog(), destination.SanitizeForLog(), move ? "move" : "copy", PlatformInfo.PlatformName);
 
                     // Check at least part of the file since UnauthorizedAccess can happen due to legitimate reasons too
                     var checkLength = (int)Math.Min(64 * 1024, dstInfo.Length);
@@ -374,7 +374,7 @@ private void TransferFilePatched(string source, string destination, bool overwri
                         var srcData = new byte[checkLength];
                         var dstData = new byte[checkLength];
 
-                        _logger.Trace("Check last {0} bytes from {1}", checkLength, destination);
+                        _logger.Trace("Check last {0} bytes from {1}", checkLength, destination.SanitizeForLog());
 
                         using (var srcStream = new FileStream(source, FileMode.Open, FileAccess.Read))
                         using (var dstStream = new FileStream(destination, FileMode.Open, FileAccess.Read))
@@ -413,12 +413,12 @@ private void TransferFilePatched(string source, string destination, bool overwri
                     }
                     catch
                     {
-                        _logger.Debug("Unable to change last modified date for {0}, skipping.", destination);
+                        _logger.Debug("Unable to change last modified date for {0}, skipping.", destination.SanitizeForLog());
                     }
 
                     if (move)
                     {
-                        _logger.Trace("Removing source file {0}", source);
+                        _logger.Trace("Removing source file {0}", source.SanitizeForLog());
                         File.Delete(source);
                     }
                 }
@@ -448,18 +448,18 @@ public override bool TryCreateHardLink(string source, string destination)
             {
                 if (ex.ErrorCode == Errno.EXDEV)
                 {
-                    _logger.Trace("Hardlink '{0}' to '{1}' failed due to cross-device access.", source, destination);
+                    _logger.Trace("Hardlink '{0}' to '{1}' failed due to cross-device access.", source.SanitizeForLog(), destination.SanitizeForLog());
                 }
                 else
                 {
-                    _logger.Debug(ex, "Hardlink '{0}' to '{1}' failed.", source, destination);
+                    _logger.Debug(ex, "Hardlink '{0}' to '{1}' failed.", source.SanitizeForLog(), destination.SanitizeForLog());
                 }
 
                 return false;
             }
             catch (Exception ex)
             {
-                _logger.Debug(ex, "Hardlink '{0}' to '{1}' failed.", source, destination);
+                _logger.Debug(ex, "Hardlink '{0}' to '{1}' failed.", source.SanitizeForLog(), destination.SanitizeForLog());
                 return false;
             }
         }
@@ -469,7 +469,7 @@ public override bool TryCreateRefLink(string source, string destination)
             return _createRefLink.TryCreateRefLink(source, destination);
         }
 
-        private uint GetUserId(string user)
+        private static uint GetUserId(string user)
         {
             if (user.IsNullOrWhiteSpace())
             {
@@ -491,7 +491,7 @@ private uint GetUserId(string user)
             return u.pw_uid;
         }
 
-        private uint GetGroupId(string group)
+        private static uint GetGroupId(string group)
         {
             if (group.IsNullOrWhiteSpace())
             {
diff --git a/src/NzbDrone.Mono/Disk/ProcMountProvider.cs b/src/NzbDrone.Mono/Disk/ProcMountProvider.cs
index 2cce7d8b64..960c8979c2 100644
--- a/src/NzbDrone.Mono/Disk/ProcMountProvider.cs
+++ b/src/NzbDrone.Mono/Disk/ProcMountProvider.cs
@@ -110,7 +110,7 @@ private IMount ParseLine(string line)
             var type = split[2];
             var options = ParseOptions(split[3]);
 
-            if (!mount.StartsWith("/"))
+            if (!mount.StartsWith('/'))
             {
                 // Possible a namespace like 'net:[1234]'.
                 // But we just filter anything not starting with /, we're not interested in anything that isn't mounted somewhere.
@@ -147,7 +147,7 @@ private Dictionary<string, string> ParseOptions(string options)
             return result;
         }
 
-        private string ExpandEscapes(string mount)
+        private static string ExpandEscapes(string mount)
         {
             return OctalRegex.Replace(mount, match => match.Captures[0].Value.FromOctalString());
         }
diff --git a/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs b/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs
index 103bdf430e..1776812236 100644
--- a/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs
+++ b/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs
@@ -2,6 +2,7 @@
 using Mono.Unix;
 using Mono.Unix.Native;
 using NLog;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Mono.Disk
 {
@@ -39,12 +40,12 @@ public string GetCompleteRealPath(string path)
                 }
 
                 var ex = new UnixIOException(Errno.ELOOP);
-                _logger.Warn("Failed to check for symlinks in the path {0}: {1}", path, ex.Message);
+                _logger.Warn("Failed to check for symlinks in the path {0}: {1}", path.SanitizeForLog(), ex.Message);
                 return path;
             }
             catch (Exception ex)
             {
-                _logger.Debug(ex, "Failed to check for symlinks in the path {0}", path);
+                _logger.Debug(ex, "Failed to check for symlinks in the path {0}", path.SanitizeForLog());
                 return path;
             }
         }
@@ -144,7 +145,7 @@ private bool TryFollowSymbolicLink(ref string path, out bool wasSymLink)
                 var errno = Stdlib.GetLastError();
                 if (errno != Errno.EINVAL)
                 {
-                    _logger.Trace("Checking path {0} for symlink returned error {1}, assuming it's not a symlink.", path, errno);
+                    _logger.Trace("Checking path {0} for symlink returned error {1}, assuming it's not a symlink.", path.SanitizeForLog(), errno);
                 }
 
                 wasSymLink = true;
diff --git a/src/NzbDrone.Update/UpdateApp.cs b/src/NzbDrone.Update/UpdateApp.cs
index 176b419097..9a9f0ba620 100644
--- a/src/NzbDrone.Update/UpdateApp.cs
+++ b/src/NzbDrone.Update/UpdateApp.cs
@@ -97,7 +97,7 @@ private UpdateStartupContext ParseArgs(string[] args)
             return startupContext;
         }
 
-        private int ParseProcessId(string arg)
+        private static int ParseProcessId(string arg)
         {
             if (!int.TryParse(arg, out var id) || id <= 0)
             {
diff --git a/src/NzbDrone.Windows/Disk/DiskProvider.cs b/src/NzbDrone.Windows/Disk/DiskProvider.cs
index a7a204a5e8..1cabb5c1aa 100644
--- a/src/NzbDrone.Windows/Disk/DiskProvider.cs
+++ b/src/NzbDrone.Windows/Disk/DiskProvider.cs
@@ -184,7 +184,7 @@ public override bool TryCreateHardLink(string source, string destination)
             }
         }
 
-        private IMount GetReparsePoint(string path)
+        private static IMount GetReparsePoint(string path)
         {
             if (!Directory.Exists(path))
             {
diff --git a/src/Radarr.Api.V3/AutoTagging/AutoTaggingController.cs b/src/Radarr.Api.V3/AutoTagging/AutoTaggingController.cs
index ca112e41df..2ffc9cffa3 100644
--- a/src/Radarr.Api.V3/AutoTagging/AutoTaggingController.cs
+++ b/src/Radarr.Api.V3/AutoTagging/AutoTaggingController.cs
@@ -102,7 +102,7 @@ private void Validate(AutoTag definition)
             }
         }
 
-        private void VerifyValidationResult(ValidationResult validationResult)
+        private static void VerifyValidationResult(ValidationResult validationResult)
         {
             var result = new NzbDroneValidationResult(validationResult.Errors);
 
diff --git a/src/Radarr.Api.V3/Calendar/CalendarFeedController.cs b/src/Radarr.Api.V3/Calendar/CalendarFeedController.cs
index e7f1634649..271e3ba24b 100644
--- a/src/Radarr.Api.V3/Calendar/CalendarFeedController.cs
+++ b/src/Radarr.Api.V3/Calendar/CalendarFeedController.cs
@@ -76,7 +76,7 @@ public IActionResult GetCalendarFeed(int pastDays = 7, int futureDays = 28, stri
             return Content(icalendar, "text/calendar");
         }
 
-        private void CreateEvent(Ical.Net.Calendar calendar, MovieMetadata movie, string releaseType)
+        private static void CreateEvent(Ical.Net.Calendar calendar, MovieMetadata movie, string releaseType)
         {
             var date = movie.InCinemas;
             var eventType = "_cinemas";
diff --git a/src/Radarr.Api.V3/CustomFormats/CustomFormatController.cs b/src/Radarr.Api.V3/CustomFormats/CustomFormatController.cs
index 5adbaeeec4..fd04d841af 100644
--- a/src/Radarr.Api.V3/CustomFormats/CustomFormatController.cs
+++ b/src/Radarr.Api.V3/CustomFormats/CustomFormatController.cs
@@ -138,7 +138,7 @@ private void Validate(CustomFormat definition)
             }
         }
 
-        protected void VerifyValidationResult(ValidationResult validationResult)
+        protected static void VerifyValidationResult(ValidationResult validationResult)
         {
             var result = new NzbDroneValidationResult(validationResult.Errors);
 
diff --git a/src/Radarr.Api.V3/Indexers/ReleaseController.cs b/src/Radarr.Api.V3/Indexers/ReleaseController.cs
index c5f991b5b5..68bcf445f5 100644
--- a/src/Radarr.Api.V3/Indexers/ReleaseController.cs
+++ b/src/Radarr.Api.V3/Indexers/ReleaseController.cs
@@ -173,7 +173,7 @@ protected override ReleaseResource MapDecision(DownloadDecision decision, int in
             return resource;
         }
 
-        private string GetCacheKey(ReleaseResource resource)
+        private static string GetCacheKey(ReleaseResource resource)
         {
             return string.Concat(resource.IndexerId, "_", resource.Guid);
         }
diff --git a/src/Radarr.Api.V3/Indexers/ReleasePushController.cs b/src/Radarr.Api.V3/Indexers/ReleasePushController.cs
index fb16fd166b..3e836a15a0 100644
--- a/src/Radarr.Api.V3/Indexers/ReleasePushController.cs
+++ b/src/Radarr.Api.V3/Indexers/ReleasePushController.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
 using Microsoft.AspNetCore.Mvc;
@@ -24,7 +26,7 @@ public class ReleasePushController : ReleaseControllerBase
         private readonly IDownloadClientFactory _downloadClientFactory;
         private readonly Logger _logger;
 
-        private static readonly object PushLock = new object();
+        private static readonly SemaphoreSlim PushLock = new SemaphoreSlim(1, 1);
 
         public ReleasePushController(IMakeDownloadDecision downloadDecisionMaker,
                                  IProcessDownloadDecisions downloadDecisionProcessor,
@@ -49,9 +51,9 @@ public ReleasePushController(IMakeDownloadDecision downloadDecisionMaker,
 
         [HttpPost]
         [Consumes("application/json")]
-        public ActionResult<List<ReleaseResource>> Create([FromBody] ReleaseResource release)
+        public async Task<ActionResult<List<ReleaseResource>>> Create([FromBody] ReleaseResource release)
         {
-            _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl ?? release.MagnetUrl);
+            _logger.Info("Release pushed: {0} - {1}", release.Title.SanitizeForLog(), (release.DownloadUrl ?? release.MagnetUrl).SanitizeForLog());
 
             ValidateResource(release);
 
@@ -65,13 +67,18 @@ public ActionResult<List<ReleaseResource>> Create([FromBody] ReleaseResource rel
 
             DownloadDecision decision;
 
-            lock (PushLock)
+            await PushLock.WaitAsync();
+            try
             {
                 var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info }, true);
 
                 decision = decisions.FirstOrDefault();
 
-                _downloadDecisionProcessor.ProcessDecision(decision, downloadClientId).GetAwaiter().GetResult();
+                await _downloadDecisionProcessor.ProcessDecision(decision, downloadClientId);
+            }
+            finally
+            {
+                PushLock.Release();
             }
 
             if (decision?.RemoteMovie.ParsedMovieInfo == null)
@@ -91,11 +98,11 @@ private void ResolveIndexer(ReleaseInfo release)
                 if (indexer != null)
                 {
                     release.IndexerId = indexer.Id;
-                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title, release.IndexerId, release.Indexer);
+                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title.SanitizeForLog(), release.IndexerId, release.Indexer.SanitizeForLog());
                 }
                 else
                 {
-                    _logger.Debug("Push Release {0} not associated with known indexer {1}.", release.Title, release.Indexer);
+                    _logger.Debug("Push Release {0} not associated with known indexer {1}.", release.Title.SanitizeForLog(), release.Indexer.SanitizeForLog());
                 }
             }
             else if (release.IndexerId != 0 && release.Indexer.IsNullOrWhiteSpace())
@@ -104,17 +111,17 @@ private void ResolveIndexer(ReleaseInfo release)
                 {
                     var indexer = _indexerFactory.Get(release.IndexerId);
                     release.Indexer = indexer.Name;
-                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title, release.IndexerId, release.Indexer);
+                    _logger.Debug("Push Release {0} associated with indexer {1} - {2}.", release.Title.SanitizeForLog(), release.IndexerId, release.Indexer.SanitizeForLog());
                 }
                 catch (ModelNotFoundException)
                 {
-                    _logger.Debug("Push Release {0} not associated with known indexer {1}.", release.Title, release.IndexerId);
+                    _logger.Debug("Push Release {0} not associated with known indexer {1}.", release.Title.SanitizeForLog(), release.IndexerId);
                     release.IndexerId = 0;
                 }
             }
             else
             {
-                _logger.Debug("Push Release {0} not associated with an indexer.", release.Title);
+                _logger.Debug("Push Release {0} not associated with an indexer.", release.Title.SanitizeForLog());
             }
         }
 
@@ -128,12 +135,12 @@ private void ResolveIndexer(ReleaseInfo release)
 
                 if (downloadClient != null)
                 {
-                    _logger.Debug("Push Release {0} associated with download client {1} - {2}.", release.Title, downloadClientId, release.DownloadClient);
+                    _logger.Debug("Push Release {0} associated with download client {1} - {2}.", release.Title.SanitizeForLog(), downloadClientId, release.DownloadClient.SanitizeForLog());
 
                     return downloadClient.Id;
                 }
 
-                _logger.Debug("Push Release {0} not associated with known download client {1}.", release.Title, release.DownloadClient);
+                _logger.Debug("Push Release {0} not associated with known download client {1}.", release.Title.SanitizeForLog(), release.DownloadClient.SanitizeForLog());
             }
 
             return release.DownloadClientId;
diff --git a/src/Radarr.Api.V3/ManualImport/ManualImportController.cs b/src/Radarr.Api.V3/ManualImport/ManualImportController.cs
index 8215ab4396..f8396ad40b 100644
--- a/src/Radarr.Api.V3/ManualImport/ManualImportController.cs
+++ b/src/Radarr.Api.V3/ManualImport/ManualImportController.cs
@@ -73,7 +73,7 @@ public object ReprocessItems([FromBody] List<ManualImportReprocessResource> item
             return items;
         }
 
-        private ManualImportResource AddQualityWeight(ManualImportResource item)
+        private static ManualImportResource AddQualityWeight(ManualImportResource item)
         {
             if (item.Quality != null)
             {
diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs
index 7bc3ea3c12..430f6c3085 100644
--- a/src/Radarr.Api.V3/Movies/MovieController.cs
+++ b/src/Radarr.Api.V3/Movies/MovieController.cs
@@ -273,7 +273,7 @@ public ActionResult<MovieResource> UpdateMovie([FromBody] MovieResource moviesRe
 
             BroadcastResourceChange(ModelAction.Updated, MapToResource(updatedMovie));
 
-            return Accepted(moviesResource.Id);
+            return Ok(moviesResource);
         }
 
         [RestDeleteById]
@@ -308,7 +308,7 @@ private void LinkMovieStatistics(List<MovieResource> resources, Dictionary<int,
             }
         }
 
-        private void LinkMovieStatistics(MovieResource resource, MovieStatistics movieStatistics)
+        private static void LinkMovieStatistics(MovieResource resource, MovieStatistics movieStatistics)
         {
             resource.Statistics = movieStatistics.ToResource();
             resource.HasFile = movieStatistics.MovieFileCount > 0;
diff --git a/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs b/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs
index 54c7e55c45..ad23e4d547 100644
--- a/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs
+++ b/src/Radarr.Api.V3/Movies/MovieControllerWithSignalR.cs
@@ -134,7 +134,7 @@ private void FetchAndLinkMovieStatistics(MovieResource resource)
             LinkMovieStatistics(resource, _movieStatisticsService.MovieStatistics(resource.Id));
         }
 
-        private void LinkMovieStatistics(MovieResource resource, MovieStatistics movieStatistics)
+        private static void LinkMovieStatistics(MovieResource resource, MovieStatistics movieStatistics)
         {
             resource.Statistics = movieStatistics.ToResource();
             resource.HasFile = movieStatistics.MovieFileCount > 0;
diff --git a/src/Radarr.Api.V3/ProviderControllerBase.cs b/src/Radarr.Api.V3/ProviderControllerBase.cs
index b431397a8f..a9e2b0cc2e 100644
--- a/src/Radarr.Api.V3/ProviderControllerBase.cs
+++ b/src/Radarr.Api.V3/ProviderControllerBase.cs
@@ -304,7 +304,7 @@ protected virtual void Test(TProviderDefinition definition, bool includeWarnings
             VerifyValidationResult(validationResult, includeWarnings);
         }
 
-        protected void VerifyValidationResult(ValidationResult validationResult, bool includeWarnings)
+        protected static void VerifyValidationResult(ValidationResult validationResult, bool includeWarnings)
         {
             var result = validationResult as NzbDroneValidationResult ?? new NzbDroneValidationResult(validationResult.Errors);
 
diff --git a/src/Radarr.Api.V3/Queue/QueueController.cs b/src/Radarr.Api.V3/Queue/QueueController.cs
index 31377f4ed6..061e359528 100644
--- a/src/Radarr.Api.V3/Queue/QueueController.cs
+++ b/src/Radarr.Api.V3/Queue/QueueController.cs
@@ -376,7 +376,7 @@ private TrackedDownload GetTrackedDownload(int queueId)
             return trackedDownload;
         }
 
-        private QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeMovie)
+        private static QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeMovie)
         {
             return queueItem.ToResource(includeMovie);
         }
diff --git a/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingController.cs b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingController.cs
index 9a15bb5299..93a39c4634 100644
--- a/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingController.cs
+++ b/src/Radarr.Api.V3/RemotePathMappings/RemotePathMappingController.cs
@@ -29,11 +29,11 @@ public RemotePathMappingController(IRemotePathMappingService remotePathMappingSe
                 .NotEmpty();
 
             SharedValidator.RuleFor(c => c.RemotePath)
-                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.StartsWith(" "))
+                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.StartsWith(' '))
                 .WithMessage("Remote Path '{PropertyValue}' must not start with a space");
 
             SharedValidator.RuleFor(c => c.RemotePath)
-                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.EndsWith(" "))
+                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.EndsWith(' '))
                 .WithMessage("Remote Path '{PropertyValue}' must not end with a space");
 
             SharedValidator.RuleFor(c => c.LocalPath)
diff --git a/src/Radarr.Api.V3/System/Backup/BackupController.cs b/src/Radarr.Api.V3/System/Backup/BackupController.cs
index a7c76cc0d0..ed1a062f56 100644
--- a/src/Radarr.Api.V3/System/Backup/BackupController.cs
+++ b/src/Radarr.Api.V3/System/Backup/BackupController.cs
@@ -129,7 +129,7 @@ private string GetBackupPath(NzbDrone.Core.Backup.Backup backup)
             return Path.Combine(_backupService.GetBackupFolder(backup.Type), backup.Name);
         }
 
-        private int GetBackupId(NzbDrone.Core.Backup.Backup backup)
+        private static int GetBackupId(NzbDrone.Core.Backup.Backup backup)
         {
             return HashConverter.GetHashInt31($"backup-{backup.Type}-{backup.Name}");
         }
diff --git a/src/Radarr.Http/Authentication/AuthenticationService.cs b/src/Radarr.Http/Authentication/AuthenticationService.cs
index fb83fa50ef..93b7514b80 100644
--- a/src/Radarr.Http/Authentication/AuthenticationService.cs
+++ b/src/Radarr.Http/Authentication/AuthenticationService.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;
 using Radarr.Http.Extensions;
@@ -62,27 +63,27 @@ public void Logout(HttpContext context)
 
         public void LogUnauthorized(HttpRequest context)
         {
-            _authLogger.Info("Auth-Unauthorized ip {0} url '{1}'", context.GetRemoteIP(), context.Path);
+            _authLogger.Info("Auth-Unauthorized ip {0} url '{1}'", context.GetRemoteIP(), context.Path.Value.SanitizeForLog());
         }
 
-        private void LogInvalidated(HttpRequest context)
+        private static void LogInvalidated(HttpRequest context)
         {
             _authLogger.Info("Auth-Invalidated ip {0}", context.GetRemoteIP());
         }
 
-        private void LogFailure(HttpRequest context, string username)
+        private static void LogFailure(HttpRequest context, string username)
         {
-            _authLogger.Warn("Auth-Failure ip {0} username '{1}'", context.GetRemoteIP(), username);
+            _authLogger.Warn("Auth-Failure ip {0} username '{1}'", context.GetRemoteIP(), username.SanitizeForLog());
         }
 
-        private void LogSuccess(HttpRequest context, string username)
+        private static void LogSuccess(HttpRequest context, string username)
         {
-            _authLogger.Debug("Auth-Success ip {0} username '{1}'", context.GetRemoteIP(), username);
+            _authLogger.Debug("Auth-Success ip {0} username '{1}'", context.GetRemoteIP(), username.SanitizeForLog());
         }
 
-        private void LogLogout(HttpRequest context, string username)
+        private static void LogLogout(HttpRequest context, string username)
         {
-            _authLogger.Info("Auth-Logout ip {0} username '{1}'", context.GetRemoteIP(), username);
+            _authLogger.Info("Auth-Logout ip {0} username '{1}'", context.GetRemoteIP(), username.SanitizeForLog());
         }
     }
 }
diff --git a/src/Radarr.Http/ErrorManagement/RadarrErrorPipeline.cs b/src/Radarr.Http/ErrorManagement/RadarrErrorPipeline.cs
index b4ce151aaa..e8b13ee075 100644
--- a/src/Radarr.Http/ErrorManagement/RadarrErrorPipeline.cs
+++ b/src/Radarr.Http/ErrorManagement/RadarrErrorPipeline.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Exceptions;
@@ -74,11 +75,11 @@ public async Task HandleException(HttpContext context)
                     }
                 }
 
-                _logger.Error(sqLiteException, "[{0} {1}]", context.Request.Method, context.Request.Path);
+                _logger.Error(sqLiteException, "[{0} {1}]", context.Request.Method, context.Request.Path.Value.SanitizeForLog());
             }
             else
             {
-                _logger.Fatal(exception, "Request Failed. {0} {1}", context.Request.Method, context.Request.Path);
+                _logger.Fatal(exception, "Request Failed. {0} {1}", context.Request.Method, context.Request.Path.Value.SanitizeForLog());
             }
 
             await errorModel.WriteToResponse(response, statusCode);
diff --git a/src/Radarr.Http/Frontend/StaticResourceController.cs b/src/Radarr.Http/Frontend/StaticResourceController.cs
index f4158e40f4..f66ea54f20 100644
--- a/src/Radarr.Http/Frontend/StaticResourceController.cs
+++ b/src/Radarr.Http/Frontend/StaticResourceController.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using NLog;
+using NzbDrone.Common.Extensions;
 using Radarr.Http.Extensions;
 using Radarr.Http.Frontend.Mappers;
 
@@ -69,7 +70,7 @@ private async Task<IActionResult> MapResource(string path)
                 return NotFound();
             }
 
-            _logger.Warn("Couldn't find handler for {0}", path);
+            _logger.Warn("Couldn't find handler for {0}", path.SanitizeForLog());
 
             return NotFound();
         }
diff --git a/src/Radarr.Http/Middleware/LoggingMiddleware.cs b/src/Radarr.Http/Middleware/LoggingMiddleware.cs
index 2cbac8a5f5..4fff0272cf 100644
--- a/src/Radarr.Http/Middleware/LoggingMiddleware.cs
+++ b/src/Radarr.Http/Middleware/LoggingMiddleware.cs
@@ -35,19 +35,20 @@ public async Task InvokeAsync(HttpContext context)
             LogEnd(context);
         }
 
-        private void LogStart(HttpContext context)
+        private static void LogStart(HttpContext context)
         {
             var id = Interlocked.Increment(ref _requestSequenceID);
 
             context.Items["ApiRequestSequenceID"] = id;
             context.Items["ApiRequestStartTime"] = DateTime.UtcNow;
 
-            var reqPath = GetRequestPathAndQuery(context.Request);
+            var reqPath = GetRequestPathAndQuery(context.Request).SanitizeForLog();
+            var origin = GetOrigin(context).SanitizeForLog();
 
-            _loggerHttp.Trace("Req: {0} [{1}] {2} (from {3})", id, context.Request.Method, reqPath, GetOrigin(context));
+            _loggerHttp.Trace("Req: {0} [{1}] {2} (from {3})", id, context.Request.Method, reqPath, origin);
         }
 
-        private void LogEnd(HttpContext context)
+        private static void LogEnd(HttpContext context)
         {
             var id = (int)context.Items["ApiRequestSequenceID"];
             var startTime = (DateTime)context.Items["ApiRequestStartTime"];
@@ -55,7 +56,7 @@ private void LogEnd(HttpContext context)
             var endTime = DateTime.UtcNow;
             var duration = endTime - startTime;
 
-            var reqPath = GetRequestPathAndQuery(context.Request);
+            var reqPath = GetRequestPathAndQuery(context.Request).SanitizeForLog();
 
             _loggerHttp.Trace("Res: {0} [{1}] {2}: {3}.{4} ({5} ms)", id, context.Request.Method, reqPath, context.Response.StatusCode, (HttpStatusCode)context.Response.StatusCode, (int)duration.TotalMilliseconds);
 
diff --git a/src/Radarr.Http/REST/RestController.cs b/src/Radarr.Http/REST/RestController.cs
index a87ed04049..86f1bcf9f9 100644
--- a/src/Radarr.Http/REST/RestController.cs
+++ b/src/Radarr.Http/REST/RestController.cs
@@ -27,7 +27,7 @@ public abstract class RestController<TResource> : Controller
         protected ResourceValidator<TResource> PutValidator { get; private set; }
         protected ResourceValidator<TResource> SharedValidator { get; private set; }
 
-        protected void ValidateId(int id)
+        protected static void ValidateId(int id)
         {
             if (id <= 0)
             {
diff --git a/src/Radarr.Http/Validation/DuplicateEndpointDetector.cs b/src/Radarr.Http/Validation/DuplicateEndpointDetector.cs
index eb2b5249a3..6e937cc7f3 100644
--- a/src/Radarr.Http/Validation/DuplicateEndpointDetector.cs
+++ b/src/Radarr.Http/Validation/DuplicateEndpointDetector.cs
@@ -48,7 +48,7 @@ public Dictionary<string, List<string>> GetDuplicateEndpoints(EndpointDataSource
             var endpoints = dataSource.Endpoints;
             foreach (var t in endpoints)
             {
-                if (t is RouteEndpoint endpoint && (endpoint.Metadata.GetMetadata<ISuppressMatchingMetadata>()?.SuppressMatching ?? false) == false)
+                if (t is RouteEndpoint endpoint && !(endpoint.Metadata.GetMetadata<ISuppressMatchingMetadata>()?.SuppressMatching ?? false))
                 {
                     builder.AddEndpoint(endpoint);
                 }
diff --git a/yarn.lock b/yarn.lock
index 6568a76631..25fd42cfb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1106,6 +1106,18 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -2187,18 +2199,10 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+brace-expansion@^1.1.7, brace-expansion@^2.0.1, brace-expansion@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
   dependencies:
     balanced-match "^1.0.0"
 
@@ -2331,7 +2335,7 @@ caniuse-lite@^1.0.30001716:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz#dae13a9c80d517c30c6197515a96131c194d8f82"
   integrity sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==
 
-chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2435,12 +2439,13 @@ color-name@^1.0.0, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  integrity sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==
+color-string@^0.3.0, color-string@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
   dependencies:
     color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
 
 color@^0.11.0:
   version "0.11.4"
@@ -2491,11 +2496,6 @@ compress-commons@^4.1.2:
     normalize-path "^3.0.0"
     readable-stream "^3.6.0"
 
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
 connected-react-router@6.9.3:
   version "6.9.3"
   resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972"
@@ -2590,10 +2590,10 @@ create-react-context@^0.3.0:
     gud "^1.0.0"
     warning "^4.0.3"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -3534,12 +3534,12 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreground-child@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
-  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
+foreground-child@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
 fork-ts-checker-webpack-plugin@8.0.0:
@@ -3584,11 +3584,6 @@ fs-monkey@^1.0.4:
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2"
   integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -3692,30 +3687,18 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e"
-  integrity sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==
+glob@^11.0.0, glob@^11.1.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
+  integrity sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==
   dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^4.0.1"
-    minimatch "^10.0.0"
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.1.1"
     minipass "^7.1.2"
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -4000,15 +3983,7 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4060,6 +4035,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
+is-arrayish@^0.3.1:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.4.tgz#1ee5553818511915685d33bb13d31bf854e5059d"
+  integrity sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==
+
 is-async-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
@@ -4307,10 +4287,10 @@ iterator.prototype@^1.1.3:
     reflect.getprototypeof "^1.0.4"
     set-function-name "^2.0.1"
 
-jackspeak@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.0.2.tgz#11f9468a3730c6ff6f56823a820d7e3be9bef015"
-  integrity sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==
+jackspeak@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
+  integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
 
@@ -4794,14 +4774,14 @@ mini-css-extract-plugin@2.9.1:
     schema-utils "^4.0.0"
     tapable "^2.2.1"
 
-minimatch@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
-  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
+minimatch@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
   dependencies:
-    brace-expansion "^2.0.1"
+    "@isaacs/brace-expansion" "^5.0.0"
 
-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5045,7 +5025,7 @@ object.values@^1.1.6, object.values@^1.2.0:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-once@^1.3.0, once@^1.4.0:
+once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -5171,11 +5151,6 @@ path-exists@^5.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
   integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -5397,7 +5372,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.5.6:
+postcss@8.5.6, postcss@^6.0.23, postcss@^8.5.6:
   version "8.5.6"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
   integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
@@ -5406,15 +5381,6 @@ postcss@8.5.6:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 postcss@^8.0.0, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.32:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.0.tgz#15244b9fd65f809b2819682456f0e7e1e30c145b"
@@ -6301,6 +6267,13 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
+simple-swizzle@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.4.tgz#a8d11a45a11600d6a1ecdff6363329e3648c3667"
+  integrity sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==
+  dependencies:
+    is-arrayish "^0.3.1"
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -6628,7 +6601,7 @@ sugarss@^4.0.1:
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-4.0.1.tgz#128a783ed71ee0fc3b489ce1f7d5a89bc1e24383"
   integrity sha512-WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw==
 
-supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==