diff --git a/assets/lang/en_US.json b/assets/lang/en-US.json
similarity index 100%
rename from assets/lang/en_US.json
rename to assets/lang/en-US.json
diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json
index 31e09b1..7745641 100644
--- a/assets/lang/fr-FR.json
+++ b/assets/lang/fr-FR.json
@@ -1,6 +1,6 @@
 {
     "loading_screen_start": "Démarrage d'ArmCord…",
-    "loading_screen_update": "Une nouvelle version de ArmCord est disponible. Veuillez mettre à jour la dernière version.",
+    "loading_screen_update": "Une nouvelle version d'ArmCord est disponible. Veuillez mettre à jour vers la dernière version.",
     "setup_question1": "Sélectionnez le type de configuration que vous souhaitez effectuer :",
     "setup_question1_answer1": "Configuration express",
     "setup_question1_answer2": "Configuration complète",
@@ -10,23 +10,23 @@
     "no": "Non",
     "next": "Suivant",
     "setup_question4": "Sélectionnez le mod client que vous souhaitez installer :",
-    "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs mods clients en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre documentation.",
+    "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs clients mods en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre Discord.",
     "loading_screen_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et réessayer.",
-    "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer ArmCord Setup.",
+    "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer l'installateur ArmCord.",
     "settings-tray": "Minimize to tray",
     "settings-channel": "Discord channel:",
     "settings-mod": "Client mod:",
     "settings-save": "Save settings",
     "settings-updater": "Check for updates",
-    "settings-theme": "ArmCord Theme:",
+    "settings-theme": "Thème ArmCord :",
     "settings-theme-tabs": "Tabs (experimental)",
     "settings-theme-default": "Default",
     "settings-theme-glasstron": "Glasstron (experimental)",
     "settings-theme-native": "Native",
     "settings-patches": "Automatic Patches",
-    "settings-invitewebsocket": "discord.gg support",
-    "settings-prfmMode": "Performance mode:",
+    "settings-invitewebsocket": "Lien discord.gg",
+    "settings-prfmMode": "Mode performance :",
     "settings-prfmMode-performance": "Performance",
-    "settings-prfmMode-battery": "Battery",
-    "settings-none": "None"
+    "settings-prfmMode-battery": "Batterie",
+    "settings-none": "Aucun"
 }
diff --git a/src/ipc.ts b/src/ipc.ts
index 92079ec..830a2f1 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -1,7 +1,7 @@
 //ipc stuff
 import {app, ipcMain, shell, desktopCapturer} from "electron";
 import {createTabsGuest, mainWindow} from "./window";
-import {setConfigBulk, getVersion, getConfig, setLang} from "./utils";
+import {setConfigBulk, getVersion, getConfig, setLang, getLang} from "./utils";
 import {customTitlebar, tabs} from "./main";
 import {createSettingsWindow} from "./settings/main";
 export function registerIpc() {
@@ -14,6 +14,9 @@ export function registerIpc() {
     ipcMain.on("setLang", (event, lang: string) => {
         setLang(lang);
     });
+    ipcMain.on("getLang", (event, object: string) => {
+        getLang(object);
+    });
     ipcMain.on("open-external-link", (event, href: string) => {
         shell.openExternal(href);
     });
diff --git a/src/settings/main.ts b/src/settings/main.ts
index 53a46d4..4167f62 100644
--- a/src/settings/main.ts
+++ b/src/settings/main.ts
@@ -1,5 +1,5 @@
 import {BrowserWindow, shell, ipcMain} from "electron";
-import {getConfig, setConfigBulk, Settings} from "../utils";
+import {getConfig, setConfigBulk, Settings, getLang} from "../utils";
 import path from "path";
 var settingsWindow: BrowserWindow;
 var instance: number = 0;
@@ -31,6 +31,9 @@ export function createSettingsWindow() {
         ipcMain.handle("getSetting", (event, toGet: string) => {
             return getConfig(toGet);
         });
+        ipcMain.handle("getLang", (event, toGet: string) => {
+            return getLang(toGet);
+        });
         settingsWindow.webContents.setWindowOpenHandler(({url}) => {
             shell.openExternal(url);
             return {action: "deny"};
@@ -38,6 +41,7 @@ export function createSettingsWindow() {
         settingsWindow.loadURL(`file://${__dirname}/settings.html`);
         settingsWindow.on("close", (event: Event) => {
             ipcMain.removeHandler("getSetting");
+            ipcMain.removeHandler("getLang");
             ipcMain.removeAllListeners("saveSettings");
             instance = 0;
         });
diff --git a/src/settings/preload.ts b/src/settings/preload.ts
index 0c90a53..38c986d 100644
--- a/src/settings/preload.ts
+++ b/src/settings/preload.ts
@@ -2,6 +2,10 @@ import {contextBridge, ipcRenderer} from "electron";
 console.log("ArmCord Settings");
 contextBridge.exposeInMainWorld("settings", {
     save: (...args: any) => ipcRenderer.send("saveSettings", ...args),
+    getLang: (toGet: string) =>
+        ipcRenderer.invoke("getLang", toGet).then((result) => {
+            return result;
+        }),
     get: (toGet: string) =>
         ipcRenderer.invoke("getSetting", toGet).then((result) => {
             return result;
diff --git a/src/settings/settings.html b/src/settings/settings.html
index c57151c..e352741 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -14,7 +14,7 @@
                 <option value="default">Default</option>
                 <option value="native">Native</option>
             </select>
-            <p class="header">ArmCord theme:</p>
+            <p class="header" id="settings-theme">ArmCord theme:</p>
         </div>
         <br />
         <div class="switch">
@@ -24,19 +24,19 @@
         </div>
         <br />
         <div class="switch">
-            <label class="header">Minimize to tray</label>
+            <label class="header" id="settings-tray">Minimize to tray</label>
             <input class="tgl tgl-light left" id="tray" type="checkbox" />
             <label class="tgl-btn left" for="tray"></label>
         </div>
         <br />
         <div class="switch">
-            <label class="header">Automatic Patches</label>
+            <label class="header" id="settings-patches">Automatic Patches</label>
             <input class="tgl tgl-light left" id="patches" type="checkbox" />
             <label class="tgl-btn left" for="patches"></label>
         </div>
         <br />
         <div class="switch">
-            <label class="header">Invite Websocket</label>
+            <label class="header" id="settings-invitewebsocket">Invite Websocket</label>
             <input class="tgl tgl-light left" id="websocket" type="checkbox" />
             <label class="tgl-btn left" for="websocket"></label>
         </div>
@@ -47,7 +47,7 @@
                 <option value="ptb">PTB</option>
                 <option value="foss">Fosscord</option>
             </select>
-            <p class="header">Discord channel:</p>
+            <p class="header" id="settings-channel">Discord channel:</p>
         </div>
         <div class="switch">
             <select name="mod" id="mod" class="left">
@@ -56,7 +56,7 @@
                 <option value="flicker">Flicker</option>
                 <option value="none">None</option>
             </select>
-            <p class="header">Client mod:</p>
+            <p class="header" id="settings-mod">Client mod:</p>
         </div>
         <div class="switch">
             <select name="prfmMode" id="prfmMode" class="left">
@@ -64,11 +64,33 @@
                 <option value="battery">Battery</option>
                 <option value="none">None</option>
             </select>
-            <p class="header">Performance mode:</p>
+            <p class="header" id="settings-prfmMode">Performance mode:</p>
         </div>
-        <button id="save" class="center">Save settings</button>
+        <button id="settings-save" class="center">Save settings</button>
     </body>
-
+    <script>
+        async function loadLang() {
+            document.getElementById("settings-save").innerHTML = await settings.getLang("settings-save");
+            document.getElementById("settings-mod").innerHTML = await settings.getLang("settings-mod");
+            document.getElementById("settings-channel").innerHTML = await settings.getLang("settings-channel");
+            document.getElementById("settings-invitewebsocket").innerHTML = await settings.getLang(
+                "settings-invitewebsocket"
+            );
+            document.getElementById("settings-patches").innerHTML = await settings.getLang("settings-patches");
+            document.getElementById("settings-tray").innerHTML = await settings.getLang("settings-tray");
+            document.getElementById("settings-theme").innerHTML = await settings.getLang("settings-theme");
+            //select stuff
+            document.getElementById("mod").options[3].text = await settings.getLang("settings-none");
+            document.getElementById("prfmMode").options[2].text = await settings.getLang("settings-none");
+            document.getElementById("prfmMode").options[1].text = await settings.getLang("settings-prfmMode-battery");
+            document.getElementById("prfmMode").options[0].text = await settings.getLang(
+                "settings-prfmMode-performance"
+            );
+            document.getElementById("theme").options[1].text = await settings.getLang("settings-theme-native");
+            document.getElementById("theme").options[0].text = await settings.getLang("settings-theme-default");
+        }
+        loadLang();
+    </script>
     <script>
         async function loadSettings() {
             document.getElementById("csp").checked = await settings.get("armcordCSP");
@@ -78,10 +100,10 @@
             document.getElementById("mod").value = await settings.get("mods");
             document.getElementById("channel").value = await settings.get("channel");
             document.getElementById("theme").value = await settings.get("windowStyle");
-            document.getElementById("performanceMode").value = await settings.get("performanceMode");
+            document.getElementById("prfmMode").value = await settings.get("performanceMode");
         }
         loadSettings();
-        document.getElementById("save").addEventListener("click", function () {
+        document.getElementById("settings-save").addEventListener("click", function () {
             //function saveSettings(windowStyle: string, channelSetting: string, armcordCSPSetting: boolean, minimizeToTray: boolean, automaticPatches: boolean,modsSetting: string, blurType: string)
             settings.save({
                 windowStyle: document.getElementById("theme").value,
diff --git a/src/utils.ts b/src/utils.ts
index 9e51f49..04fe9e2 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -117,7 +117,27 @@ export async function setLang(language: string) {
     let toSave = JSON.stringify(parsed);
     fs.writeFileSync(langConfigFile, toSave, "utf-8");
 }
-
+var language: string;
+export async function getLang(object: string) {
+    if (language == undefined) {
+        const userDataPath = app.getPath("userData");
+        const storagePath = path.join(userDataPath, "/storage/");
+        const langConfigFile = storagePath + "lang.json";
+        let rawdata = fs.readFileSync(langConfigFile, "utf-8");
+        let parsed = JSON.parse(rawdata);
+        language = parsed["lang"];
+    }
+    if (language.length == 2) {
+        language = language + "-" + language.toUpperCase();
+    }
+    var langPath = path.join(__dirname, "../", "/assets/lang/" + language + ".json");
+    if (!fs.existsSync(langPath)) {
+        langPath = path.join(__dirname, "../", "/assets/lang/en-US.json");
+    }
+    let rawdata = fs.readFileSync(langPath, "utf-8");
+    let parsed = JSON.parse(rawdata);
+    return parsed[object];
+}
 //ArmCord Settings/Storage manager
 
 export interface Settings {