diff --git a/media_management/naming.yml b/media_management/naming.yml
index b57ead1..e6cb769 100644
--- a/media_management/naming.yml
+++ b/media_management/naming.yml
@@ -1,17 +1,17 @@
 radarr:
   rename: true
-  movieFormat: "{Movie CleanTitle} {(Release Year)} - {{Edition Tags}} {[MediaInfo 3D]}{[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}"
-  movieFolderFormat: "{Movie CleanTitle} ({Release Year})"
+  movieFormat: '{Movie CleanTitle} {(Release Year)} - {{Edition Tags}} {[MediaInfo 3D]}{[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}'
+  movieFolderFormat: '{Movie CleanTitle} ({Release Year})'
   replaceIllegalCharacters: false
   colonReplacementFormat: smart
 sonarr:
   rename: true
-  standardEpisodeFormat: "{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}"
-  dailyEpisodeFormat: "{Series TitleYear} - {Air-Date} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}"
-  animeEpisodeFormat: "{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoDynamicRangeType]}[{Mediainfo VideoCodec }{MediaInfo VideoBitDepth}bit]{-Release Group}"
-  seriesFolderFormat: "{Series TitleYear}"
+  standardEpisodeFormat: '{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}'
+  dailyEpisodeFormat: '{Series TitleYear} - {Air-Date} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoDynamicRangeType]}{[Mediainfo VideoCodec]}{-Release Group}'
+  animeEpisodeFormat: '{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle:90} {[Custom Formats]}{[Quality Full]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{[MediaInfo VideoDynamicRangeType]}[{Mediainfo VideoCodec }{MediaInfo VideoBitDepth}bit]{-Release Group}'
+  seriesFolderFormat: '{Series TitleYear}'
   seasonFolderFormat: Season {season:00}
   replaceIllegalCharacters: false
   colonReplacementFormat: 4
-  customColonReplacementFormat: ""
+  customColonReplacementFormat: ''
   multiEpisodeStyle: 5
diff --git a/media_management/quality_definitions.yml b/media_management/quality_definitions.yml
index 91ea471..ab0fa11 100644
--- a/media_management/quality_definitions.yml
+++ b/media_management/quality_definitions.yml
@@ -1,114 +1,115 @@
-radarr:
-  Remux-2160p:
-    max: 2000
-    min: 187.4
-    preferred: 1999
-  Bluray-2160p:
-    max: 2000
-    min: 102
-    preferred: 1999
-  WEBRip-2160p:
-    max: 2000
-    min: 34.5
-    preferred: 1999
-  WEBDL-2160p:
-    max: 2000
-    min: 34.5
-    preferred: 1999
-  HDTV-2160p:
-    max: 2000
-    min: 85
-    preferred: 1999
-  Remux-1080p:
-    max: 2000
-    min: 102
-    preferred: 1999
-  Bluray-1080p:
-    max: 2000
-    min: 50.8
-    preferred: 1999
-  WEBRip-1080p:
-    max: 2000
-    min: 12.5
-    preferred: 1999
-  WEBDL-1080p:
-    max: 2000
-    min: 12.5
-    preferred: 1999
-  HDTV-1080p:
-    max: 2000
-    min: 33.8
-    preferred: 1999
-  Bluray-720p:
-    max: 2000
-    min: 25.7
-    preferred: 1999
-  WEBRip-720p:
-    max: 2000
-    min: 12.5
-    preferred: 1999
-  WEBDL-720p:
-    max: 2000
-    min: 12.5
-    preferred: 1999
-  HDTV-720p:
-    max: 2000
-    min: 17.1
-    preferred: 1999
-sonarr:
-  Bluray-2160p Remux:
-    max: 1000
-    min: 187.4
-    preferred: 995
-  Bluray-2160p:
-    max: 1000
-    min: 94.6
-    preferred: 995
-  WEBDL-2160p:
-    max: 1000
-    min: 25
-    preferred: 995
-  WEBRip-2160p:
-    max: 1000
-    min: 25
-    preferred: 995
-  HDTV-2160p:
-    max: 1000
-    min: 25
-    preferred: 995
-  Bluray-1080p Remux:
-    max: 1000
-    min: 69.1
-    preferred: 995
-  Bluray-1080p:
-    max: 1000
-    min: 50.4
-    preferred: 995
-  WEBDL-1080p:
-    max: 1000
-    min: 15
-    preferred: 995
-  WEBRip-1080p:
-    max: 1000
-    min: 15
-    preferred: 995
-  Bluray-720p:
-    max: 1000
-    min: 17.1
-    preferred: 995
-  WEBDL-720p:
-    max: 1000
-    min: 10
-    preferred: 995
-  WEBRip-720p:
-    max: 1000
-    min: 10
-    preferred: 995
-  HDTV-1080p:
-    max: 1000
-    min: 15
-    preferred: 995
-  HDTV-720p:
-    max: 1000
-    min: 10
-    preferred: 995
+qualityDefinitions:
+  radarr:
+    Remux-2160p:
+      max: 2000
+      min: 187.4
+      preferred: 1999
+    Bluray-2160p:
+      max: 2000
+      min: 102
+      preferred: 1999
+    WEBRip-2160p:
+      max: 2000
+      min: 34.5
+      preferred: 1999
+    WEBDL-2160p:
+      max: 2000
+      min: 34.5
+      preferred: 1999
+    HDTV-2160p:
+      max: 2000
+      min: 85
+      preferred: 1999
+    Remux-1080p:
+      max: 2000
+      min: 102
+      preferred: 1999
+    Bluray-1080p:
+      max: 2000
+      min: 50.8
+      preferred: 1999
+    WEBRip-1080p:
+      max: 2000
+      min: 12.5
+      preferred: 1999
+    WEBDL-1080p:
+      max: 2000
+      min: 12.5
+      preferred: 1999
+    HDTV-1080p:
+      max: 2000
+      min: 33.8
+      preferred: 1999
+    Bluray-720p:
+      max: 2000
+      min: 25.7
+      preferred: 1999
+    WEBRip-720p:
+      max: 2000
+      min: 12.5
+      preferred: 1999
+    WEBDL-720p:
+      max: 2000
+      min: 12.5
+      preferred: 1999
+    HDTV-720p:
+      max: 2000
+      min: 17.1
+      preferred: 1999
+  sonarr:
+    Bluray-2160p Remux:
+      max: 1000
+      min: 187.4
+      preferred: 995
+    Bluray-2160p:
+      max: 1000
+      min: 94.6
+      preferred: 995
+    WEBDL-2160p:
+      max: 1000
+      min: 25
+      preferred: 995
+    WEBRip-2160p:
+      max: 1000
+      min: 25
+      preferred: 995
+    HDTV-2160p:
+      max: 1000
+      min: 25
+      preferred: 995
+    Bluray-1080p Remux:
+      max: 1000
+      min: 69.1
+      preferred: 995
+    Bluray-1080p:
+      max: 1000
+      min: 50.4
+      preferred: 995
+    WEBDL-1080p:
+      max: 1000
+      min: 15
+      preferred: 995
+    WEBRip-1080p:
+      max: 1000
+      min: 15
+      preferred: 995
+    Bluray-720p:
+      max: 1000
+      min: 17.1
+      preferred: 995
+    WEBDL-720p:
+      max: 1000
+      min: 10
+      preferred: 995
+    WEBRip-720p:
+      max: 1000
+      min: 10
+      preferred: 995
+    HDTV-1080p:
+      max: 1000
+      min: 15
+      preferred: 995
+    HDTV-720p:
+      max: 1000
+      min: 10
+      preferred: 995
diff --git a/scripts/utils/media_management.py b/scripts/utils/media_management.py
index 7e07de3..45dbc0d 100644
--- a/scripts/utils/media_management.py
+++ b/scripts/utils/media_management.py
@@ -25,7 +25,7 @@ BASE_NAMING_CONFIG = {
         "multiEpisodeStyle": 5,
     },
 }
-BASE_QUALITY_DEFINITIONS = {"radarr": {}, "sonarr": {}}
+BASE_QUALITY_DEFINITIONS = {"qualityDefinitions": {"radarr": {}, "sonarr": {}}}
 
 
 def collect_misc_config(output_dir):
@@ -86,7 +86,9 @@ def collect_quality_definitions(input_dir, output_dir):
                 "min": quality["min"],
                 "preferred": quality["preferred"],
             }
-            output_structure["radarr"][quality["quality"]] = profilarr_quality
+            output_structure["qualityDefinitions"]["radarr"][
+                quality["quality"]
+            ] = profilarr_quality
 
     sonarr_input_file_path = os.path.join(
         input_dir, "sonarr", "quality-size", "series.json"
@@ -99,7 +101,9 @@ def collect_quality_definitions(input_dir, output_dir):
                 "min": quality["min"],
                 "preferred": quality["preferred"],
             }
-            output_structure["sonarr"][quality["quality"]] = profilarr_quality
+            output_structure["qualityDefinitions"]["sonarr"][
+                quality["quality"]
+            ] = profilarr_quality
 
     with open(output_file, "w", encoding="utf-8") as f:
         yaml.dump(output_structure, f, sort_keys=False, allow_unicode=True)