diff --git a/src-python/config.py b/src-python/config.py
index 94881d75..548f0705 100644
--- a/src-python/config.py
+++ b/src-python/config.py
@@ -956,7 +956,7 @@ class Config:
         self._SELECTED_YOUR_LANGUAGES = {}
         for tab_no in self.SELECTABLE_TAB_NO_LIST:
             self._SELECTED_YOUR_LANGUAGES[tab_no] = {
-                "primary": {
+                "1": {
                     "language": "Japanese",
                     "country": "Japan",
                     "enable": True,
@@ -965,17 +965,17 @@ class Config:
         self._SELECTED_TARGET_LANGUAGES = {}
         for tab_no in self.SELECTABLE_TAB_NO_LIST:
             self._SELECTED_TARGET_LANGUAGES[tab_no] = {
-                "primary": {
+                "1": {
                     "language": "English",
                     "country": "United States",
                     "enable": True,
                 },
-                "secondary": {
+                "2": {
                     "language": "English",
                     "country": "United States",
                     "enable": False,
                 },
-                "tertiary": {
+                "3": {
                     "language": "English",
                     "country": "United States",
                     "enable": False,
diff --git a/src-python/model.py b/src-python/model.py
index 35ac9cce..e85c3a8c 100644
--- a/src-python/model.py
+++ b/src-python/model.py
@@ -209,7 +209,7 @@ class Model:
 
     def getInputTranslate(self, message):
         translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO]
-        source_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
+        source_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
         target_languages=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
 
         translations = []
@@ -233,9 +233,9 @@ class Model:
 
     def getOutputTranslate(self, message):
         translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO]
-        source_language=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
-        target_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
-        target_country=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"]
+        source_language=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
+        target_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
+        target_country=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"]
 
         translation, success_flag = self.getTranslate(
             translator_name,
@@ -436,8 +436,8 @@ class Model:
             try:
                 res = self.mic_transcriber.transcribeAudioQueue(
                     self.mic_audio_queue,
-                    config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"],
-                    config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"],
+                    config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"],
+                    config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"],
                     config.MIC_AVG_LOGPROB,
                     config.MIC_NO_SPEECH_PROB
                 )
@@ -600,8 +600,8 @@ class Model:
             try:
                 res = self.speaker_transcriber.transcribeAudioQueue(
                     speaker_audio_queue,
-                    config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"],
-                    config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"],
+                    config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"],
+                    config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"],
                     config.SPEAKER_AVG_LOGPROB,
                     config.SPEAKER_NO_SPEECH_PROB
                 )
@@ -685,8 +685,8 @@ class Model:
             self.speaker_energy_recorder = None
 
     def createOverlayImageSmallLog(self, message, translation):
-        your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
-        target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
+        your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
+        target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
         return self.overlay_image.createOverlayImageSmallLog(message, your_language, translation, target_language)
 
     def createOverlayImageSystemMessage(self, message):
@@ -738,8 +738,8 @@ class Model:
 
 
     def createOverlayImageLargeLog(self, message_type:str, message:str, translation:str):
-        your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
-        target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"]
+        your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
+        target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
         return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language)
 
     def clearOverlayImageLargeLog(self):
diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py
index 4cbbae7c..976e1fad 100644
--- a/src-python/webui_controller.py
+++ b/src-python/webui_controller.py
@@ -222,7 +222,7 @@ class Controller:
                     )
 
                 if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
-                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese":
+                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
                         transliteration = model.convertMessageToTransliteration(translation[0])
 
             if config.ENABLE_TRANSCRIPTION_SEND is True:
@@ -287,7 +287,7 @@ class Controller:
                     )
 
                 if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
-                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese":
+                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
                         transliteration = model.convertMessageToTransliteration(message)
 
             if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
@@ -354,7 +354,7 @@ class Controller:
                     )
 
                 if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
-                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese":
+                    if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
                         transliteration = model.convertMessageToTransliteration(translation[0])
 
             # send OSC message
@@ -1337,13 +1337,13 @@ class Controller:
 
     def swapYourLanguageAndTargetLanguage(self, *args, **kwargs) -> dict:
         your_languages = config.SELECTED_YOUR_LANGUAGES
-        your_language_primary = your_languages[config.SELECTED_TAB_NO]["primary"]
+        your_language_temp = your_languages[config.SELECTED_TAB_NO]["1"]
 
         target_languages = config.SELECTED_TARGET_LANGUAGES
-        target_language_primary = target_languages[config.SELECTED_TAB_NO]["primary"]
+        target_language_temp = target_languages[config.SELECTED_TAB_NO]["1"]
 
-        your_languages[config.SELECTED_TAB_NO]["primary"] = target_language_primary
-        target_languages[config.SELECTED_TAB_NO]["primary"] = your_language_primary
+        your_languages[config.SELECTED_TAB_NO]["1"] = target_language_temp
+        target_languages[config.SELECTED_TAB_NO]["1"] = your_language_temp
 
         self.setSelectedYourLanguages(your_languages)
         self.setSelectedTargetLanguages(target_languages)
diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py
index cc8c9b30..ff4ccc71 100644
--- a/src-python/webui_mainloop.py
+++ b/src-python/webui_mainloop.py
@@ -413,19 +413,19 @@ if __name__ == "__main__":
                     case "/set/data/selected_your_languages":
                         data = {
                             "1":{
-                                "primary":{
+                                "1":{
                                 "language": "English",
                                 "country": "Hong Kong"
                                 },
                             },
                             "2":{
-                                "primary":{
+                                "1":{
                                     "language":"Japanese",
                                     "country":"Japan"
                                 },
                             },
                             "3":{
-                                "primary":{
+                                "1":{
                                     "language":"Japanese",
                                     "country":"Japan"
                                 },
@@ -434,7 +434,7 @@ if __name__ == "__main__":
                     case "/set/data/selected_target_languages":
                         data ={
                             "1":{
-                                "primary": {
+                                "1": {
                                     "language": "Japanese",
                                     "country": "Japan",
                                     "enabled": True,
@@ -451,7 +451,7 @@ if __name__ == "__main__":
                                 }
                             },
                             "2":{
-                                "primary":{
+                                "1":{
                                     "language":"English",
                                     "country":"United States",
                                     "enabled": True,
@@ -468,7 +468,7 @@ if __name__ == "__main__":
                                 },
                             },
                             "3":{
-                                "primary":{
+                                "1":{
                                     "language":"English",
                                     "country":"United States",
                                     "enabled": True,
diff --git a/src-ui/logics/main/useLanguageSettings.js b/src-ui/logics/main/useLanguageSettings.js
index 067fdcf4..9a516a9c 100644
--- a/src-ui/logics/main/useLanguageSettings.js
+++ b/src-ui/logics/main/useLanguageSettings.js
@@ -61,9 +61,10 @@ export const useLanguageSettings = () => {
         const send_obj = {
             ...currentSelectedYourLanguages.data,
             [currentSelectedPresetTabNumber.data]: {
-                primary: {
+                1: {
                     language: selected_language_data.language,
                     country: selected_language_data.country,
+                    enable: selected_language_data.enable,
                 }
             }
         };
@@ -80,8 +81,9 @@ export const useLanguageSettings = () => {
         pendingSelectedTargetLanguages();
         let send_obj = currentSelectedTargetLanguages.data;
 
-        send_obj[currentSelectedPresetTabNumber.data].primary.language = selected_language_data.language,
-        send_obj[currentSelectedPresetTabNumber.data].primary.country = selected_language_data.country,
+        send_obj[currentSelectedPresetTabNumber.data][1].language = selected_language_data.language,
+        send_obj[currentSelectedPresetTabNumber.data][1].country = selected_language_data.country,
+        send_obj[currentSelectedPresetTabNumber.data][1].enable = selected_language_data.enable,
 
         asyncStdoutToPython("/set/data/selected_target_languages", send_obj);
     };