diff --git a/public/index.html b/public/index.html
index 184901e53..d33c18dbb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -650,36 +650,36 @@
                                             </div>
                                         </div>
                                         <div class="range-block m-t-1">
-                                            <div class="range-block-title openai_restorable" data-i18n="Scenario Format Template">
-                                                <span>Scenario format template</span>
+                                            <div class="range-block-title openai_restorable">
+                                                <span data-i18n="Scenario Format Template">Scenario format template</span>
                                                 <div id="scenario_format_restore" title="Restore default format" class="right_menu_button">
                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
                                             </div>
                                             <div class="toggle-description justifyLeft" data-i18n="Use scenario to mark a place where the content is inserted.">
-                                                Use <code>{{scenario}}</code> to mark a place where the content is inserted.
+                                                <span data-i18n="scenario_format_template_part_1">Use</span> <code>{{scenario}}</code> <span data-i18n="scenario_format_template_part_2">to mark a place where the content is inserted.</span>
                                             </div>
                                             <div class="wide100p">
                                                 <textarea id="scenario_format_textarea" class="text_pole textarea_compact autoSetHeight" rows="3" placeholder="&mdash;"></textarea>
                                             </div>
                                         </div>
                                         <div class="range-block m-t-1">
-                                            <div class="range-block-title openai_restorable" data-i18n="Personality Format Template">
-                                                <span>Personality format template</span>
+                                            <div class="range-block-title openai_restorable">
+                                                <span data-i18n="Personality Format Template">Personality format template</span>
                                                 <div id="personality_format_restore" title="Restore default format" class="right_menu_button">
                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
                                             </div>
                                             <div class="toggle-description justifyLeft" data-i18n="Use personality to mark a place where the content is inserted.">
-                                                Use <code>{{personality}}</code> to mark a place where the content is inserted.
+                                                <span data-i18n="scenario_format_template_part_1">Use</span> <code>{{personality}}</code> <span data-i18n="scenario_format_template_part_2">to mark a place where the content is inserted.</span>
                                             </div>
                                             <div class="wide100p">
                                                 <textarea id="personality_format_textarea" class="text_pole textarea_compact autoSetHeight" rows="3" placeholder="&mdash;"></textarea>
                                             </div>
                                         </div>
                                         <div class="range-block m-t-1">
-                                            <div class="range-block-title openai_restorable" data-i18n="Group Nudge Prompt Template">
-                                                <span>Group Nudge prompt template</span>
+                                            <div class="range-block-title openai_restorable">
+                                                <span data-i18n="Group Nudge Prompt Template">Group Nudge prompt template</span>
                                                 <div id="group_nudge_prompt_restore" title="Restore default format" class="right_menu_button">
                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
@@ -694,8 +694,8 @@
                                             </div>
                                         </div>
                                         <div class="range-block m-t-1">
-                                            <div class="range-block-title openai_restorable" data-i18n="New Chat">
-                                                <span>New Chat</span>
+                                            <div class="range-block-title openai_restorable">
+                                                <span data-i18n="New Chat">New Chat</span>
                                                 <div id="newchat_prompt_restore" title="Restore new chat prompt" class="right_menu_button">
                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
@@ -742,14 +742,14 @@
                                             </div>
                                         </div>
                                         <div class="range-block m-t-1">
-                                            <div class="range-block-title openai_restorable" data-i18n="Continue nudge">
-                                                <span>Continue nudge</span>
+                                            <div class="range-block-title openai_restorable">
+                                                <span data-i18n="Continue nudge">Continue nudge</span>
                                                 <div id="continue_nudge_prompt_restore" title="Restore new chat prompt" class="right_menu_button">
                                                     <div class="fa-solid fa-clock-rotate-left"></div>
                                                 </div>
                                             </div>
                                             <div class="toggle-description justifyLeft">
-                                                <span data-i18n="Set at the beginning of the chat history to indicate that a new chat is about to start.">
+                                                <span data-i18n="Set at the end of the chat history when the continue button is pressed.">
                                                     Set at the end of the chat history when the continue button is pressed.
                                                 </span>
                                             </div>
@@ -1690,7 +1690,7 @@
                                         <div class="inline-drawer-toggle inline-drawer-header">
                                             <div class="flex-container alignItemsCenter flexNoGap">
                                                 <b data-i18n="Continue Postfix">Continue Postfix</b>
-                                                <span title="The next chunk of the continued message will be appended using this as a separator." class="note-link-span fa-solid fa-circle-question"></span>
+                                                <span data-i18n="[title]The next chunk of the continued message will be appended using this as a separator." title="The next chunk of the continued message will be appended using this as a separator." class="note-link-span fa-solid fa-circle-question"></span>
                                                 <small class="flexBasis100p">(<span id="continue_postfix_display"></span>)</small>
                                             </div>
                                             <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
@@ -5377,9 +5377,9 @@
         <div class="onboarding">
             <h3 data-i18n="Welcome to SillyTavern!">Welcome to SillyTavern!</h3>
             <ul class="justifyLeft margin-bot-10px">
-                <li>Read the <a href="https://docs.sillytavern.app/" data-i18n="Official Documentation" target="_blank">Official Documentation</a>.</li>
-                <li>Type <code>/help</code> in chat for commands and macros.</li>
-                <li>Join the <a href="https://discord.gg/sillytavern" data-i18n="Discord server" target="_blank">Discord server</a> for info and announcements.</li>
+                <li><span data-i18n="welcome_message_part_1">Read the</span> <a href="https://docs.sillytavern.app/" data-i18n="Official Documentation" target="_blank" data-i18n="welcome_message_part_2">Official Documentation</a><span data-i18n="welcome_message_part_3">.</span></li>
+                <li><span data-i18n="welcome_message_part_4">Type</span> <code>/help</code> <span data-i18n="welcome_message_part_5">in chat for commands and macros.</span></li>
+                <li><span data-i18n="welcome_message_part_6">Join the</span> <a href="https://discord.gg/sillytavern" data-i18n="Discord server" target="_blank">Discord server</a> <span data-i18n="welcome_message_part_7">for info and announcements.</span></li>
             </ul>
             <b data-i18n="SillyTavern is aimed at advanced users.">
                 SillyTavern is aimed at advanced users.
@@ -5400,7 +5400,7 @@
                 <span data-i18n="Before you get started, you must select a persona name.">
                     Before you get started, you must select a persona name.
                 </span>
-                This can be changed at any time via the <code><i class="fa-solid fa-face-smile"></i></code> icon.
+                <span data-i18n="welcome_message_part_8">This can be changed at any time via the</span> <code><i class="fa-solid fa-face-smile"></i></code> <span data-i18n="welcome_message_part_9">icon.</span>
             </div>
             <h4 data-i18n="Persona Name:">Persona Name:</h4>
         </div>