diff --git a/dist/better-xcloud.lite.user.js b/dist/better-xcloud.lite.user.js
index 8603c60..ed0ebfc 100755
--- a/dist/better-xcloud.lite.user.js
+++ b/dist/better-xcloud.lite.user.js
@@ -269,14 +269,7 @@ var SUPPORTED_LANGUAGES = {
  "zh-CN": "中文(简体)",
  "zh-TW": "中文(繁體)"
 }, Texts = {
- "background-opacity": "Background opacity",
- notifications: "Notifications",
- invites: "Invites",
  achievements: "Achievements",
- chat: "Chat",
- "friends-followers": "Friends and followers",
- byog: "Stream your own game",
- "disable-features": "Disable features",
  activate: "Activate",
  activated: "Activated",
  active: "Active",
@@ -292,6 +285,7 @@ var SUPPORTED_LANGUAGES = {
  auto: "Auto",
  "back-to-home": "Back to home",
  "back-to-home-confirm": "Do you want to go back to the home page (without disconnecting)?",
+ "background-opacity": "Background opacity",
  battery: "Battery",
  "battery-saving": "Battery saving",
  "better-xcloud": "Better xCloud",
@@ -310,6 +304,7 @@ var SUPPORTED_LANGUAGES = {
  cancel: "Cancel",
  "cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
  center: "Center",
+ chat: "Chat",
  "clarity-boost": "Clarity boost",
  "clarity-boost-warning": "These settings don't work when the Clarity Boost mode is ON",
  clear: "Clear",
@@ -334,6 +329,8 @@ var SUPPORTED_LANGUAGES = {
  contrast: "Contrast",
  controller: "Controller",
  "controller-friendly-ui": "Controller-friendly UI",
+ "controller-mapping": "Controller mapping",
+ "controller-mapping-in-game": "In-game controller mapping",
  "controller-shortcuts": "Controller shortcuts",
  "controller-shortcuts-connect-note": "Connect a controller to use this feature",
  "controller-shortcuts-in-game": "In-game controller shortcuts",
@@ -353,6 +350,7 @@ var SUPPORTED_LANGUAGES = {
  "device-vibration-not-using-gamepad": "On when not using gamepad",
  disable: "Disable",
  "disable-byog-feature": 'Disable "Stream your own game" feature',
+ "disable-features": "Disable features",
  "disable-home-context-menu": "Disable context menu in Home page",
  "disable-post-stream-feedback-dialog": "Disable post-stream feedback dialog",
  "disable-social-features": "Disable social features",
@@ -377,6 +375,7 @@ var SUPPORTED_LANGUAGES = {
  "force-native-mkb-games": "Force native Mouse & Keyboard for these games",
  "fortnite-allow-stw-mode": 'Allows playing "Save the World" mode on mobile',
  "fortnite-force-console-version": "Fortnite: force console version",
+ "friends-followers": "Friends and followers",
  "game-bar": "Game Bar",
  "getting-consoles-list": "Getting the list of consoles...",
  guide: "Guide",
@@ -398,6 +397,7 @@ var SUPPORTED_LANGUAGES = {
  import: "Import",
  increase: "Increase",
  "install-android": "Better xCloud app for Android",
+ invites: "Invites",
  japan: "Japan",
  jitter: "Jitter",
  "keyboard-key": "Keyboard key",
@@ -415,6 +415,7 @@ var SUPPORTED_LANGUAGES = {
  "lowest-quality": "Lowest quality",
  manage: "Manage",
  "map-mouse-to": "Map mouse to",
+ mapping: "Mapping",
  "may-not-work-properly": "May not work properly!",
  menu: "Menu",
  microphone: "Microphone",
@@ -453,6 +454,7 @@ var SUPPORTED_LANGUAGES = {
  "no-consoles-found": "No consoles found",
  "no-controllers-connected": "No controllers connected",
  normal: "Normal",
+ notifications: "Notifications",
  off: "Off",
  official: "Official",
  on: "On",
@@ -578,6 +580,7 @@ var SUPPORTED_LANGUAGES = {
  stream: "Stream",
  "stream-settings": "Stream settings",
  "stream-stats": "Stream stats",
+ "stream-your-own-game": "Stream your own game",
  stretch: "Stretch",
  "suggest-settings": "Suggest settings",
  "suggest-settings-link": "Suggest recommended settings for this device",
@@ -1720,7 +1723,7 @@ class GlobalSettingsStorage extends BaseSettingsStore {
    multipleOptions: {
     chat: t("chat"),
     friends: t("friends-followers"),
-    byog: t("byog"),
+    byog: t("stream-your-own-game"),
     "notifications-invites": t("notifications") + ": " + t("invites"),
     "notifications-achievements": t("notifications") + ": " + t("achievements")
    }
diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js
index 61c8a01..b4bf109 100755
--- a/dist/better-xcloud.user.js
+++ b/dist/better-xcloud.user.js
@@ -298,14 +298,7 @@ var SUPPORTED_LANGUAGES = {
  "zh-CN": "中文(简体)",
  "zh-TW": "中文(繁體)"
 }, Texts = {
- "background-opacity": "Background opacity",
- notifications: "Notifications",
- invites: "Invites",
  achievements: "Achievements",
- chat: "Chat",
- "friends-followers": "Friends and followers",
- byog: "Stream your own game",
- "disable-features": "Disable features",
  activate: "Activate",
  activated: "Activated",
  active: "Active",
@@ -321,6 +314,7 @@ var SUPPORTED_LANGUAGES = {
  auto: "Auto",
  "back-to-home": "Back to home",
  "back-to-home-confirm": "Do you want to go back to the home page (without disconnecting)?",
+ "background-opacity": "Background opacity",
  battery: "Battery",
  "battery-saving": "Battery saving",
  "better-xcloud": "Better xCloud",
@@ -339,6 +333,7 @@ var SUPPORTED_LANGUAGES = {
  cancel: "Cancel",
  "cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
  center: "Center",
+ chat: "Chat",
  "clarity-boost": "Clarity boost",
  "clarity-boost-warning": "These settings don't work when the Clarity Boost mode is ON",
  clear: "Clear",
@@ -363,6 +358,8 @@ var SUPPORTED_LANGUAGES = {
  contrast: "Contrast",
  controller: "Controller",
  "controller-friendly-ui": "Controller-friendly UI",
+ "controller-mapping": "Controller mapping",
+ "controller-mapping-in-game": "In-game controller mapping",
  "controller-shortcuts": "Controller shortcuts",
  "controller-shortcuts-connect-note": "Connect a controller to use this feature",
  "controller-shortcuts-in-game": "In-game controller shortcuts",
@@ -382,6 +379,7 @@ var SUPPORTED_LANGUAGES = {
  "device-vibration-not-using-gamepad": "On when not using gamepad",
  disable: "Disable",
  "disable-byog-feature": 'Disable "Stream your own game" feature',
+ "disable-features": "Disable features",
  "disable-home-context-menu": "Disable context menu in Home page",
  "disable-post-stream-feedback-dialog": "Disable post-stream feedback dialog",
  "disable-social-features": "Disable social features",
@@ -406,6 +404,7 @@ var SUPPORTED_LANGUAGES = {
  "force-native-mkb-games": "Force native Mouse & Keyboard for these games",
  "fortnite-allow-stw-mode": 'Allows playing "Save the World" mode on mobile',
  "fortnite-force-console-version": "Fortnite: force console version",
+ "friends-followers": "Friends and followers",
  "game-bar": "Game Bar",
  "getting-consoles-list": "Getting the list of consoles...",
  guide: "Guide",
@@ -427,6 +426,7 @@ var SUPPORTED_LANGUAGES = {
  import: "Import",
  increase: "Increase",
  "install-android": "Better xCloud app for Android",
+ invites: "Invites",
  japan: "Japan",
  jitter: "Jitter",
  "keyboard-key": "Keyboard key",
@@ -444,6 +444,7 @@ var SUPPORTED_LANGUAGES = {
  "lowest-quality": "Lowest quality",
  manage: "Manage",
  "map-mouse-to": "Map mouse to",
+ mapping: "Mapping",
  "may-not-work-properly": "May not work properly!",
  menu: "Menu",
  microphone: "Microphone",
@@ -482,6 +483,7 @@ var SUPPORTED_LANGUAGES = {
  "no-consoles-found": "No consoles found",
  "no-controllers-connected": "No controllers connected",
  normal: "Normal",
+ notifications: "Notifications",
  off: "Off",
  official: "Official",
  on: "On",
@@ -607,6 +609,7 @@ var SUPPORTED_LANGUAGES = {
  stream: "Stream",
  "stream-settings": "Stream settings",
  "stream-stats": "Stream stats",
+ "stream-your-own-game": "Stream your own game",
  stretch: "Stretch",
  "suggest-settings": "Suggest settings",
  "suggest-settings-link": "Suggest recommended settings for this device",
@@ -1796,7 +1799,7 @@ class GlobalSettingsStorage extends BaseSettingsStore {
    multipleOptions: {
     chat: t("chat"),
     friends: t("friends-followers"),
-    byog: t("byog"),
+    byog: t("stream-your-own-game"),
     "notifications-invites": t("notifications") + ": " + t("invites"),
     "notifications-achievements": t("notifications") + ": " + t("achievements")
    }
diff --git a/src/utils/settings-storages/global-settings-storage.ts b/src/utils/settings-storages/global-settings-storage.ts
index e634ce7..22ffe40 100755
--- a/src/utils/settings-storages/global-settings-storage.ts
+++ b/src/utils/settings-storages/global-settings-storage.ts
@@ -602,7 +602,7 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
             multipleOptions: {
                 [BlockFeature.CHAT]: t('chat'),
                 [BlockFeature.FRIENDS]: t('friends-followers'),
-                [BlockFeature.BYOG]: t('byog'),
+                [BlockFeature.BYOG]: t('stream-your-own-game'),
                 [BlockFeature.NOTIFICATIONS_INVITES]: t('notifications') + ': ' + t('invites'),
                 [BlockFeature.NOTIFICATIONS_ACHIEVEMENTS]: t('notifications') + ': ' + t('achievements'),
             },
diff --git a/src/utils/translation.ts b/src/utils/translation.ts
index 6ff90da..5060067 100755
--- a/src/utils/translation.ts
+++ b/src/utils/translation.ts
@@ -27,14 +27,7 @@ export const SUPPORTED_LANGUAGES = {
 };
 
 const Texts = {
-    "background-opacity": "Background opacity",
-    "notifications": "Notifications",
-    "invites": "Invites",
     "achievements": "Achievements",
-    "chat": "Chat",
-    "friends-followers": "Friends and followers",
-    "byog": "Stream your own game",
-    "disable-features": "Disable features",
     "activate": "Activate",
     "activated": "Activated",
     "active": "Active",
@@ -50,6 +43,7 @@ const Texts = {
     "auto": "Auto",
     "back-to-home": "Back to home",
     "back-to-home-confirm": "Do you want to go back to the home page (without disconnecting)?",
+    "background-opacity": "Background opacity",
     "battery": "Battery",
     "battery-saving": "Battery saving",
     "better-xcloud": "Better xCloud",
@@ -68,6 +62,7 @@ const Texts = {
     "cancel": "Cancel",
     "cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
     "center": "Center",
+    "chat": "Chat",
     "clarity-boost": "Clarity boost",
     "clarity-boost-warning": "These settings don't work when the Clarity Boost mode is ON",
     "clear": "Clear",
@@ -92,6 +87,8 @@ const Texts = {
     "contrast": "Contrast",
     "controller": "Controller",
     "controller-friendly-ui": "Controller-friendly UI",
+    "controller-mapping": "Controller mapping",
+    "controller-mapping-in-game": "In-game controller mapping",
     "controller-shortcuts": "Controller shortcuts",
     "controller-shortcuts-connect-note": "Connect a controller to use this feature",
     "controller-shortcuts-in-game": "In-game controller shortcuts",
@@ -111,6 +108,7 @@ const Texts = {
     "device-vibration-not-using-gamepad": "On when not using gamepad",
     "disable": "Disable",
     "disable-byog-feature": "Disable \"Stream your own game\" feature",
+    "disable-features": "Disable features",
     "disable-home-context-menu": "Disable context menu in Home page",
     "disable-post-stream-feedback-dialog": "Disable post-stream feedback dialog",
     "disable-social-features": "Disable social features",
@@ -135,6 +133,7 @@ const Texts = {
     "force-native-mkb-games": "Force native Mouse & Keyboard for these games",
     "fortnite-allow-stw-mode": "Allows playing \"Save the World\" mode on mobile",
     "fortnite-force-console-version": "Fortnite: force console version",
+    "friends-followers": "Friends and followers",
     "game-bar": "Game Bar",
     "getting-consoles-list": "Getting the list of consoles...",
     "guide": "Guide",
@@ -156,6 +155,7 @@ const Texts = {
     "import": "Import",
     "increase": "Increase",
     "install-android": "Better xCloud app for Android",
+    "invites": "Invites",
     "japan": "Japan",
     "jitter": "Jitter",
     "keyboard-key": "Keyboard key",
@@ -173,6 +173,7 @@ const Texts = {
     "lowest-quality": "Lowest quality",
     "manage": "Manage",
     "map-mouse-to": "Map mouse to",
+    "mapping": "Mapping",
     "may-not-work-properly": "May not work properly!",
     "menu": "Menu",
     "microphone": "Microphone",
@@ -211,6 +212,7 @@ const Texts = {
     "no-consoles-found": "No consoles found",
     "no-controllers-connected": "No controllers connected",
     "normal": "Normal",
+    "notifications": "Notifications",
     "off": "Off",
     "official": "Official",
     "on": "On",
@@ -336,6 +338,7 @@ const Texts = {
     "stream": "Stream",
     "stream-settings": "Stream settings",
     "stream-stats": "Stream stats",
+    "stream-your-own-game": "Stream your own game",
     "stretch": "Stretch",
     "suggest-settings": "Suggest settings",
     "suggest-settings-link": "Suggest recommended settings for this device",