diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index 59d9e50e..77480344 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -95,10 +95,10 @@
       "about": "About",
       "dmca": "DMCA",
       "login": "Login",
+      "onboarding": "Setup",
       "pagetitle": "{{title}} - movie-web",
       "register": "Register",
-      "settings": "Settings",
-      "onboarding": "Setup"
+      "settings": "Settings"
     }
   },
   "home": {
@@ -128,11 +128,15 @@
       },
       "morning": {
         "default": "What would you like to watch this morning?",
-        "extra": ["I hear Before Sunrise is good"]
+        "extra": [
+          "I hear Before Sunrise is good"
+        ]
       },
       "night": {
         "default": "What would you like to watch tonight?",
-        "extra": ["Tired? I hear The Exorcist is good."]
+        "extra": [
+          "Tired? I hear The Exorcist is good."
+        ]
       }
     }
   },
@@ -162,16 +166,73 @@
     "message": "We looked everywhere: under the bins, in the closet, behind the proxy but ultimately couldn't find the page you are looking for.",
     "title": "Couldn't find that page"
   },
+  "onboarding": {
+    "defaultConfirm": {
+      "cancel": "Cancel",
+      "confirm": "Use default setup",
+      "description": "The default setup does not have the best streams and can be unbearably slow.",
+      "title": "Are you sure?"
+    },
+    "extension": {
+      "back": "Go back",
+      "explainer": "Using the browser extension, you can get the best streams we have to offer. With just a simple install.",
+      "explainerIos": "Unfortunately, the browser extension is not supported on iOS, Press <bold>Go back</bold> to choose another option.",
+      "extensionHelp": "If you've installed the extension but it's not detected. <bold>Open the extension through your browsers extension menu</bold> and follow the steps on screen.",
+      "linkChrome": "Install Chrome extension",
+      "linkFirefox": "Install Firefox extension",
+      "notDetecting": "Installed on Chrome, but the site isn't detecting it? Try reloading the page!",
+      "notDetectingAction": "Reload page",
+      "status": {
+        "disallowed": "Extension is not enabled for this page",
+        "disallowedAction": "Enable extension",
+        "failed": "Failed to request status",
+        "loading": "Waiting for you to install the extension",
+        "outdated": "Extension version too old",
+        "success": "Extension is working as expected!"
+      },
+      "submit": "Continue",
+      "title": "Let's start with an extension"
+    },
+    "proxy": {
+      "back": "Go back",
+      "explainer": "With the proxy method, you can get great quality streams by making a self-service proxy.",
+      "input": {
+        "errorConnection": "Could not connect to proxy",
+        "errorInvalidUrl": "Not a valid URL",
+        "errorNotProxy": "Expected a proxy but got a website",
+        "label": "Proxy URL",
+        "placeholder": "https://"
+      },
+      "link": "Learn how to make a proxy",
+      "submit": "Submit proxy",
+      "title": "Let's make a new proxy"
+    },
+    "start": {
+      "explainer": "To get the best streams possible. You will need to choose which streaming method you want to use.",
+      "options": {
+        "default": {
+          "text": "I don't want good quality streams,<0 /> <1>use the default setup</1>"
+        },
+        "extension": {
+          "action": "Install extension",
+          "description": "Install browser extension and gain access to the best sources.",
+          "quality": "Best quality",
+          "title": "Browser extension"
+        },
+        "proxy": {
+          "action": "Setup proxy",
+          "description": "Setup a proxy in just 5 minutes and gain access to great sources.",
+          "quality": "Good quality",
+          "title": "Custom proxy"
+        }
+      },
+      "title": "Let's get you setup with movie-web"
+    }
+  },
   "overlays": {
     "close": "Close"
   },
   "player": {
-    "turnstile": {
-      "verifyingHumanity": "Verifying your humanity...",
-      "title": "We need to verify that you're human.",
-      "description": "Please verify that you are human by completing the Captcha on the right. This is to keep movie-web safe!",
-      "error": "Failed to verify your humanity. Please try again."
-    },
     "back": {
       "default": "Back to home",
       "short": "Back"
@@ -180,57 +241,10 @@
       "enabled": "Casting to device..."
     },
     "menus": {
-      "settings": {
-        "videoSection": "Video settings",
-        "experienceSection": "Viewing experience",
-        "enableSubtitles": "Enable Subtitles",
-        "subtitleItem": "Subtitle settings",
-        "sourceItem": "Video sources",
-        "playbackItem": "Playback settings",
-        "downloadItem": "Download",
-        "qualityItem": "Quality"
-      },
-      "episodes": {
-        "button": "Episodes",
-        "loadingTitle": "Loading...",
-        "loadingList": "Loading...",
-        "loadingError": "Error loading season",
-        "emptyState": "There are no episodes in this season, check back later!",
-        "episodeBadge": "E{{episode}}",
-        "unairedEpisodes": "One or more episodes in this season have been disabled because they haven't been aired yet."
-      },
-      "sources": {
-        "title": "Sources",
-        "unknownOption": "Unknown",
-        "noStream": {
-          "title": "No stream",
-          "text": "This source has no streams for this movie or show."
-        },
-        "noEmbeds": {
-          "title": "No embeds found",
-          "text": "We were unable to find any embeds, please try a different source."
-        },
-        "failed": {
-          "title": "Failed to scrape",
-          "text": "There was an error while trying to find any videos, please try a different source."
-        }
-      },
-      "subtitles": {
-        "title": "Subtitles",
-        "customizeLabel": "Customize",
-        "settings": {
-          "fixCapitals": "Fix capitalization",
-          "delay": "Subtitle delay",
-          "backlink": "Custom subtitles"
-        },
-        "customChoice": "Select subtitle from file",
-        "offChoice": "Off",
-        "unknownLanguage": "Unknown"
-      },
       "downloads": {
         "disclaimer": "Downloads are taken directly from the provider. movie-web does not have control over how the downloads are provided.",
-        "downloadSubtitle": "Download current subtitle",
         "downloadPlaylist": "Download playlist",
+        "downloadSubtitle": "Download current subtitle",
         "downloadVideo": "Download video",
         "hlsDisclaimer": "Downloads are taken directly from the provider. movie-web does not have control over how the downloads are provided.<br /><br />Please note that you are downloading an HLS playlist, <bold>it is not recommended to download if you are not familiar with advanced streaming formats</bold>. Try different sources for different formats.",
         "onAndroid": {
@@ -250,6 +264,15 @@
         },
         "title": "Download"
       },
+      "episodes": {
+        "button": "Episodes",
+        "emptyState": "There are no episodes in this season, check back later!",
+        "episodeBadge": "E{{episode}}",
+        "loadingError": "Error loading season",
+        "loadingList": "Loading...",
+        "loadingTitle": "Loading...",
+        "unairedEpisodes": "One or more episodes in this season have been disabled because they haven't been aired yet."
+      },
       "playback": {
         "speedLabel": "Playback speed",
         "title": "Playback settings"
@@ -259,35 +282,73 @@
         "hint": "You can try <0>switching source</0> to get different quality options.",
         "iosNoQuality": "Due to Apple-defined limitations, quality selection is not available on iOS for this source. You can try <0>switching to another source</0> to get different quality options.",
         "title": "Quality"
+      },
+      "settings": {
+        "downloadItem": "Download",
+        "enableSubtitles": "Enable Subtitles",
+        "experienceSection": "Viewing experience",
+        "playbackItem": "Playback settings",
+        "qualityItem": "Quality",
+        "sourceItem": "Video sources",
+        "subtitleItem": "Subtitle settings",
+        "videoSection": "Video settings"
+      },
+      "sources": {
+        "failed": {
+          "text": "There was an error while trying to find any videos, please try a different source.",
+          "title": "Failed to scrape"
+        },
+        "noEmbeds": {
+          "text": "We were unable to find any embeds, please try a different source.",
+          "title": "No embeds found"
+        },
+        "noStream": {
+          "text": "This source has no streams for this movie or show.",
+          "title": "No stream"
+        },
+        "title": "Sources",
+        "unknownOption": "Unknown"
+      },
+      "subtitles": {
+        "customChoice": "Select subtitle from file",
+        "customizeLabel": "Customize",
+        "offChoice": "Off",
+        "settings": {
+          "backlink": "Custom subtitles",
+          "delay": "Subtitle delay",
+          "fixCapitals": "Fix capitalization"
+        },
+        "title": "Subtitles",
+        "unknownLanguage": "Unknown"
       }
     },
     "metadata": {
+      "api": {
+        "text": "Could not load API metadata, please check your internet connection.",
+        "title": "Failed to load API metadata"
+      },
+      "dmca": {
+        "badge": "Removed",
+        "text": "This media is no longer available due to a takedown notice or copyright claim.",
+        "title": "Media has been removed"
+      },
+      "extensionPermission": {
+        "badge": "Permission Missing",
+        "button": "Use extension",
+        "text": "You have the browser extension, but we need your permission to get started using the extension.",
+        "title": "Configure the extension"
+      },
       "failed": {
         "badge": "Failed",
         "homeButton": "Go home",
         "text": "Could not load the media's metadata from TMDB. Please check whether TMDB is down or blocked on your internet connection.",
         "title": "Failed to load metadata"
       },
-      "api": {
-        "text": "Could not load API metadata, please check your internet connection.",
-        "title": "Failed to load API metadata"
-      },
       "notFound": {
         "badge": "Not found",
         "homeButton": "Back to home",
         "text": "We couldn't find the media you requested. Either it's been removed or you tampered with the URL.",
         "title": "Couldn't find that media."
-      },
-      "extensionPermission": {
-        "badge": "Permission Missing",
-        "title": "Configure the extension",
-        "text": "You have the browser extension, but we need your permission to get started using the extension.",
-        "button": "Use extension"
-      },
-      "dmca": {
-        "badge": "Removed",
-        "title": "Media has been removed",
-        "text": "This media is no longer available due to a takedown notice or copyright claim."
       }
     },
     "nextEpisode": {
@@ -326,6 +387,12 @@
       "remaining": "{{timeLeft}} left • Finish at {{timeFinished, datetime}}",
       "shortRegular": "{{timeWatched}}",
       "shortRemaining": "-{{timeLeft}}"
+    },
+    "turnstile": {
+      "description": "Please verify that you are human by completing the Captcha on the right. This is to keep movie-web safe!",
+      "error": "Failed to verify your humanity. Please try again.",
+      "title": "We need to verify that you're human.",
+      "verifyingHumanity": "Verifying your humanity..."
     }
   },
   "screens": {
@@ -396,41 +463,34 @@
       },
       "title": "Appearance"
     },
-    "subtitles": {
-      "title": "Subtitles",
-      "previewQuote": "I must not fear. Fear is the mind-killer.",
-      "textSizeLabel": "Text size",
-      "backgroundLabel": "Background opacity",
-      "colorLabel": "Color"
-    },
     "connections": {
-      "setup": {
-        "errorStatus": {
-          "title": "Something needs your attention",
-          "description": "It seems that one or more items in this setup need your attention."
-        },
-        "unsetStatus": {
-          "title": "You haven't gone through setup",
-          "description": "Please click the button to the right to start the setup process."
-        },
-        "successStatus": {
-          "title": "Everything is set up!",
-          "description": "All things are in place for you to start watching your favourite media."
-        },
-        "redoSetup": "Redo setup",
-        "doSetup": "Do setup",
-        "itemError": "There is something wrong with this setting. Go through setup again to fix it.",
-        "items": {
-          "extension": "Extension",
-          "proxy": "Custom proxy",
-          "default": "Default setup"
-        }
-      },
       "server": {
         "description": "If you would like to connect to a custom backend to store your data, enable this and provide the URL. <0>Instructions.</0>",
         "label": "Custom server",
         "urlLabel": "Custom server URL"
       },
+      "setup": {
+        "doSetup": "Do setup",
+        "errorStatus": {
+          "description": "It seems that one or more items in this setup need your attention.",
+          "title": "Something needs your attention"
+        },
+        "itemError": "There is something wrong with this setting. Go through setup again to fix it.",
+        "items": {
+          "default": "Default setup",
+          "extension": "Extension",
+          "proxy": "Custom proxy"
+        },
+        "redoSetup": "Redo setup",
+        "successStatus": {
+          "description": "All things are in place for you to start watching your favourite media.",
+          "title": "Everything is set up!"
+        },
+        "unsetStatus": {
+          "description": "Please click the button to the right to start the setup process.",
+          "title": "You haven't gone through setup"
+        }
+      },
       "title": "Connections",
       "workers": {
         "addButton": "Add new worker",
@@ -444,10 +504,10 @@
     "preferences": {
       "language": "Application language",
       "languageDescription": "Language applied to the entire application.",
-      "title": "Preferences",
       "thumbnail": "Generate thumbnails",
       "thumbnailDescription": "Most of the time, videos don't have thumbnails. You can enable this setting to generate them on the fly but they can make your video slower.",
-      "thumbnailLabel": "Generate thumbnails"
+      "thumbnailLabel": "Generate thumbnails",
+      "title": "Preferences"
     },
     "reset": "Reset",
     "save": "Save",
@@ -465,69 +525,13 @@
         "userId": "User ID"
       }
     },
+    "subtitles": {
+      "backgroundLabel": "Background opacity",
+      "colorLabel": "Color",
+      "previewQuote": "I must not fear. Fear is the mind-killer.",
+      "textSizeLabel": "Text size",
+      "title": "Subtitles"
+    },
     "unsaved": "You have unsaved changes"
-  },
-  "onboarding": {
-    "start": {
-      "title": "Let's get you setup with movie-web",
-      "explainer": "To get the best streams possible. You will need to choose which streaming method you want to use.",
-      "options": {
-        "proxy": {
-          "quality": "Good quality",
-          "title": "Custom proxy",
-          "description": "Setup a proxy in just 5 minutes and gain access to great sources.",
-          "action": "Setup proxy"
-        },
-        "extension": {
-          "quality": "Best quality",
-          "title": "Browser extension",
-          "description": "Install browser extension and gain access to the best sources.",
-          "action": "Install extension"
-        },
-        "default": {
-          "text": "I don't want good quality streams,<0 /> <1>use the default setup</1>"
-        }
-      }
-    },
-    "proxy": {
-      "title": "Let's make a new proxy",
-      "explainer": "With the proxy method, you can get great quality streams by making a self-service proxy.",
-      "link": "Learn how to make a proxy",
-      "input": {
-        "label": "Proxy URL",
-        "placeholder": "https://",
-        "errorInvalidUrl": "Not a valid URL",
-        "errorConnection": "Could not connect to proxy",
-        "errorNotProxy": "Expected a proxy but got a website"
-      },
-      "back": "Go back",
-      "submit": "Submit proxy"
-    },
-    "extension": {
-      "title": "Let's start with an extension",
-      "explainer": "Using the browser extension, you can get the best streams we have to offer. With just a simple install.",
-      "explainerIos": "Unfortunately, the browser extension is not supported on IOS, Press <bold>Go back</bold> to choose another option.",
-      "extensionHelp": "If you've installed the extension but it's not detected. <bold>Open the extension through your browsers extension menu</bold> and follow the steps on screen.",
-      "notDetecting": "Installed on chrome but not showing up? Try reloading the page!",
-      "notDetectingAction": "Reload page",
-      "linkChrome": "Install Chrome extension",
-      "linkFirefox": "Install Firefox extension",
-      "back": "Go back",
-      "status": {
-        "loading": "Waiting for you to install the extension",
-        "disallowed": "Extension is not enabled for this page",
-        "disallowedAction": "Enable extension",
-        "failed": "Failed to request status",
-        "outdated": "Extension version too old",
-        "success": "Extension is working as expected!"
-      },
-      "submit": "Continue"
-    },
-    "defaultConfirm": {
-      "title": "Are you sure?",
-      "description": "The default setup does not have the best streams and can be unbearably slow.",
-      "cancel": "Cancel",
-      "confirm": "Use default setup"
-    }
   }
 }