diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml
index 81b886b6..e6fdc0f5 100644
--- a/app/assets/lang/en_US.toml
+++ b/app/assets/lang/en_US.toml
@@ -35,7 +35,7 @@ loginButtonText = "LOGIN"
 loginNeedAccountLink = "https://minecraft.net/store/minecraft-java-edition/"
 loginNeedAccountText = "Need an Account?"
 loginPasswordDisclaimer1 = "Your password is sent directly to mojang and never stored."
-loginPasswordDisclaimer2 = "<%= lang('app.title') %> is not affiliated with Mojang AB."
+loginPasswordDisclaimer2 = "{appName} is not affiliated with Mojang AB."
 
 [ejs.loginOptions]
 loginOptionsTitle = "Login Options"
@@ -104,8 +104,6 @@ javaReqDesc = "Requires Java 8 x64."
 javaPathDesc = "The path should end with <strong>{pathSuffix}</strong>."
 jvmOptsTitle = "Additional JVM Options"
 jvmOptsDesc = "Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included."
-jvmOptsLink = "https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html"
-jvmOptsLinkText = "Available Options for Java 8."
 launcherTabHeaderText = "Launcher Settings"
 launcherTabHeaderDesc = "Options related to the launcher itself."
 allowPrereleaseTitle = "Allow Pre-Release Updates."
@@ -116,7 +114,7 @@ chooseFolder = "Choose Folder"
 dataDirectoryDesc = "All game files and local Java installations will be stored in the data directory.<br>Screenshots and world saves are stored in the instance folder for the corresponding server configuration."
 aboutTabHeaderText = "About"
 aboutTabHeaderDesc = "View information and release notes for the current version."
-aboutTitle = "<%= lang('app.title') %>"
+aboutTitle = "{appName}"
 aboutCurrentVersionCheck = "Stable Release"
 versionCheck = "&#10003;"
 stableRelease = "Stable Release"
diff --git a/app/login.ejs b/app/login.ejs
index 0d5b3e0d..d059abed 100644
--- a/app/login.ejs
+++ b/app/login.ejs
@@ -57,7 +57,7 @@
                     <a href="<%- lang('login.loginNeedAccountLink') %>"><%- lang('login.loginNeedAccountText') %></a>
                 </span>
                 <p class="loginDisclaimerText"><%- lang('login.loginPasswordDisclaimer1') %></p>
-                <p class="loginDisclaimerText"><%- lang('login.loginPasswordDisclaimer2') %></p>
+                <p class="loginDisclaimerText"><%- lang('login.loginPasswordDisclaimer2', { appName: lang('app.title') }) %></p>
             </div>
         </form>
     </div>
diff --git a/app/settings.ejs b/app/settings.ejs
index 0be2cca1..f0d52dbb 100644
--- a/app/settings.ejs
+++ b/app/settings.ejs
@@ -266,7 +266,7 @@
                     </div>
                     <input id="settingsJVMOptsVal" cValue="JVMOptions" serverDependent type="text">
                 </div>
-                <div id="settingsJVMOptsDesc"><%- lang('settings.jvmOptsDesc') %><br><a href="<%- lang('settings.jvmOptsLink') %>" id="settingsJvmOptsLink"><%- lang('settings.jvmOptsLinkText') %></a></div>
+                <div id="settingsJVMOptsDesc"><%- lang('settings.jvmOptsDesc') %><br><a href="#" id="settingsJvmOptsLink"><!-- Available Options --></a></div>
             </div>
         </div>
         <div id="settingsTabLauncher" class="settingsTab" style="display: none;">
@@ -315,7 +315,7 @@
                 <div id="settingsAboutCurrentContent">
                     <div id="settingsAboutCurrentHeadline">
                         <img id="settingsAboutLogo" src="./assets/images/SealCircle.png">
-                        <span id="settingsAboutTitle"><%- lang('settings.aboutTitle') %></span>
+                        <span id="settingsAboutTitle"><%- lang('settings.aboutTitle', { appName: lang('app.title') }) %></span>
                     </div>
                     <div id="settingsAboutCurrentVersion">
                         <div id="settingsAboutCurrentVersionCheck"><%- lang('settings.versionCheck') %></div>
diff --git a/index.js b/index.js
index f35d1cc0..ae0408ae 100644
--- a/index.js
+++ b/index.js
@@ -4,7 +4,6 @@ remoteMain.initialize()
 // Requirements
 const { app, BrowserWindow, ipcMain, Menu, shell } = require('electron')
 const autoUpdater                       = require('electron-updater').autoUpdater
-const ejs                               = require('ejs')
 const ejse                              = require('ejs-electron')
 const fs                                = require('fs')
 const isDev                             = require('./app/assets/js/isdev')
@@ -243,8 +242,7 @@ function createWindow() {
 
     const data = {
         bkid: Math.floor((Math.random() * fs.readdirSync(path.join(__dirname, 'app', 'assets', 'images', 'backgrounds')).length)),
-        lang: (str) => ejs.render(LangLoader.queryEJS(str), data),
-        evalEjs: (str) => ejs.render(str, data)
+        lang: (str, placeHolders) => LangLoader.queryEJS(str, placeHolders)
     }
     Object.entries(data).forEach(([key, val]) => ejse.data(key, val))
 
diff --git a/package-lock.json b/package-lock.json
index 943dd42d..b844230a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "helios-core": "~2.0.5",
         "helios-distribution-types": "^1.2.0",
         "jquery": "^3.7.0",
+        "lodash.merge": "^4.6.2",
         "semver": "^7.5.4",
         "toml": "^3.0.0"
       },
@@ -2708,8 +2709,7 @@
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "node_modules/logform": {
       "version": "2.5.1",