diff --git a/src/renderer/components/FtKeyboardShortcutPrompt/FtKeyboardShortcutPrompt.vue b/src/renderer/components/FtKeyboardShortcutPrompt/FtKeyboardShortcutPrompt.vue
index acb9b29eea8e7..32739ec274261 100644
--- a/src/renderer/components/FtKeyboardShortcutPrompt/FtKeyboardShortcutPrompt.vue
+++ b/src/renderer/components/FtKeyboardShortcutPrompt/FtKeyboardShortcutPrompt.vue
@@ -17,17 +17,14 @@
       </div>
     </template>
 
-    <div
-      v-if="primarySections"
-      class="primarySections"
-    >
+    <div class="primarySections">
       <div
         v-for="(primarySection, index) of primarySections"
         :key="index"
         class="primarySection"
       >
         <div
-          v-for="secondarySection in primarySection.secondarySections"
+          v-for="secondarySection in primarySection"
           :key="secondarySection.title"
           class="secondarySection"
         >
@@ -85,30 +82,26 @@ const situationalAppShortcuts = computed(() =>
 )
 
 const primarySections = computed(() => [
-  {
-    secondarySections: [
-      {
-        title: t('KeyboardShortcutPrompt.Sections.Video.Playback'),
-        shortcutDictionary: playbackPlayerShortcuts.value
-      },
-      {
-        title: t('KeyboardShortcutPrompt.Sections.Video.General'),
-        shortcutDictionary: generalPlayerShortcuts.value
-      },
-    ]
-  },
-  {
-    secondarySections: [
-      {
-        title: t('KeyboardShortcutPrompt.Sections.App.General'),
-        shortcutDictionary: generalAppShortcuts.value
-      },
-      {
-        title: t('KeyboardShortcutPrompt.Sections.App.Situational'),
-        shortcutDictionary: situationalAppShortcuts.value
-      }
-    ]
-  }
+  [
+    {
+      title: t('KeyboardShortcutPrompt.Sections.Video.Playback'),
+      shortcutDictionary: playbackPlayerShortcuts.value
+    },
+    {
+      title: t('KeyboardShortcutPrompt.Sections.Video.General'),
+      shortcutDictionary: generalPlayerShortcuts.value
+    },
+  ],
+  [
+    {
+      title: t('KeyboardShortcutPrompt.Sections.App.General'),
+      shortcutDictionary: generalAppShortcuts.value
+    },
+    {
+      title: t('KeyboardShortcutPrompt.Sections.App.Situational'),
+      shortcutDictionary: situationalAppShortcuts.value
+    }
+  ]
 ])
 
 const isMac = process.platform === 'darwin'
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/AutoplayToggle.js b/src/renderer/components/ft-shaka-video-player/player-components/AutoplayToggle.js
index 119d355d8ca50..d1d8f8636d9d0 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/AutoplayToggle.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/AutoplayToggle.js
@@ -14,8 +14,7 @@ export class AutoplayToggle extends shaka.ui.Element {
 
     /** @private */
     this.button_ = document.createElement('button')
-    this.button_.classList.add('autoplay-toggle')
-    this.button_.classList.add('shaka-tooltip')
+    this.button_.classList.add('autoplay-toggle', 'shaka-tooltip')
 
     /** @private */
     this.icon_ = document.createElement('i')
@@ -25,8 +24,7 @@ export class AutoplayToggle extends shaka.ui.Element {
     this.button_.appendChild(this.icon_)
 
     const label = document.createElement('label')
-    label.classList.add('shaka-overflow-button-label')
-    label.classList.add('shaka-overflow-menu-only')
+    label.classList.add('shaka-overflow-button-label', 'shaka-overflow-menu-only')
 
     /** @private */
     this.nameSpan_ = document.createElement('span')
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
index 008c515b37468..4bdbe976f8501 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
@@ -16,8 +16,7 @@ export class FullWindowButton extends shaka.ui.Element {
 
     /** @private */
     this.button_ = document.createElement('button')
-    this.button_.classList.add('full-window-button')
-    this.button_.classList.add('shaka-tooltip')
+    this.button_.classList.add('full-window-button', 'shaka-tooltip')
 
     /** @private */
     this.icon_ = document.createElement('i')
@@ -27,8 +26,7 @@ export class FullWindowButton extends shaka.ui.Element {
     this.button_.appendChild(this.icon_)
 
     const label = document.createElement('label')
-    label.classList.add('shaka-overflow-button-label')
-    label.classList.add('shaka-overflow-menu-only')
+    label.classList.add('shaka-overflow-button-label', 'shaka-overflow-menu-only')
 
     /** @private */
     this.nameSpan_ = document.createElement('span')
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
index a11e5a19ed35c..7dfc07f585820 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
@@ -11,8 +11,7 @@ export class LegacyQualitySelection extends shaka.ui.SettingsMenu {
   constructor(activeLegacyFormat, legacyFormats, events, parent, controls) {
     super(parent, controls, 'settings')
 
-    this.button.classList.add('legacy-quality-button')
-    this.button.classList.add('shaka-tooltip-status')
+    this.button.classList.add('legacy-quality-button', 'shaka-tooltip-status')
     this.menu.classList.add('legacy-qualities')
 
     /** @private */
@@ -86,8 +85,7 @@ export class LegacyQualitySelection extends shaka.ui.SettingsMenu {
     span.classList.add('shaka-chosen-item')
 
     const icon = document.createElement('i')
-    icon.classList.add('material-icons-round')
-    icon.classList.add('shaka-chosen-item')
+    icon.classList.add('material-icons-round', 'shaka-chosen-item')
     icon.textContent = 'done'
     icon.ariaHidden = 'true'
     button.appendChild(icon)
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
index 9398c1573b317..517a314df3089 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
@@ -15,8 +15,7 @@ export class ScreenshotButton extends shaka.ui.Element {
 
     /** @private */
     this.button_ = document.createElement('button')
-    this.button_.classList.add('screenshot-button')
-    this.button_.classList.add('shaka-tooltip')
+    this.button_.classList.add('screenshot-button', 'shaka-tooltip')
 
     const icon = document.createElement('i')
     icon.classList.add('material-icons-round')
@@ -25,8 +24,7 @@ export class ScreenshotButton extends shaka.ui.Element {
     this.button_.appendChild(icon)
 
     const label = document.createElement('label')
-    label.classList.add('shaka-overflow-button-label')
-    label.classList.add('shaka-overflow-menu-only')
+    label.classList.add('shaka-overflow-button-label', 'shaka-overflow-menu-only')
 
     /** @private */
     this.nameSpan_ = document.createElement('span')
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
index b7e1c0299e6f3..9e802e7de47df 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
@@ -16,8 +16,7 @@ export class TheatreModeButton extends shaka.ui.Element {
 
     /** @private */
     this.button_ = document.createElement('button')
-    this.button_.classList.add('theatre-button')
-    this.button_.classList.add('shaka-tooltip')
+    this.button_.classList.add('theatre-button', 'shaka-tooltip')
 
     /** @private */
     this.icon_ = document.createElement('i')
@@ -27,8 +26,7 @@ export class TheatreModeButton extends shaka.ui.Element {
     this.button_.appendChild(this.icon_)
 
     const label = document.createElement('label')
-    label.classList.add('shaka-overflow-button-label')
-    label.classList.add('shaka-overflow-menu-only')
+    label.classList.add('shaka-overflow-button-label', 'shaka-overflow-menu-only')
 
     /** @private */
     this.nameSpan_ = document.createElement('span')
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index 94734c5ee4686..19eb48cf76352 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -224,7 +224,7 @@ export default defineComponent({
     handleInvidiousInstanceInput: function (input) {
       let instance = input
       // If NOT something like https:// (1-2 slashes), remove trailing slash
-      if (!/^(https?):(\/){1,2}$/.test(input)) {
+      if (!/^https?:\/{1,2}$/.test(input)) {
         instance = input.replace(/\/$/, '')
       }
       this.setCurrentInvidiousInstanceBounce(instance)
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index b5893c09ebe82..55bfe6be97125 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -425,7 +425,7 @@ export default defineComponent({
 
     handlePlaylistExport: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
-      const title = this.selectedUserPlaylist.playlistName.replaceAll(' ', '_').replaceAll(/["%*/:<>?\\|]/g, '_')
+      const title = this.selectedUserPlaylist.playlistName.replaceAll(/[ "%*/:<>?\\|]/g, '_')
       const exportFileName = 'freetube-playlist-' + title + '-' + dateStr + '.db'
 
       const data = JSON.stringify(this.selectedUserPlaylist) + '\n'
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index 1abc3efbe31b8..dd1c85fecb1ac 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -594,7 +594,7 @@ export function youtubeImageUrlToInvidious(url, currentInstance = null) {
  * @returns {string}
  */
 export function invidiousImageUrlToInvidious(url, currentInstance = null) {
-  return url.replaceAll(/(\/ggpht\/)/g, `${currentInstance}/ggpht/`)
+  return url.replaceAll('/ggpht/', `${currentInstance}/ggpht/`)
 }
 
 /**