From aebfefb3a297ba69778bfcb8543f25b0a696254b Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Wed, 10 Jul 2024 20:54:09 -0400
Subject: [PATCH 01/17] ask user to confirm proxy connections

---
 public/scripts/openai.js | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 00d319121..614d5759b 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -53,6 +53,7 @@ import {
     getFileText,
     getImageSizeFromDataURL,
     getSortableDelay,
+    getStringHash,
     isDataURL,
     parseJsonFile,
     resetScrollHeight,
@@ -72,6 +73,7 @@ import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashCommandArgument.js';
 import { renderTemplateAsync } from './templates.js';
 import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
+import { Popup } from './popup.js';
 
 export {
     openai_messages_count,
@@ -388,7 +390,7 @@ let openai_settings;
 
 let promptManager = null;
 
-function validateReverseProxy() {
+async function validateReverseProxy() {
     if (!oai_settings.reverse_proxy) {
         return;
     }
@@ -402,6 +404,24 @@ function validateReverseProxy() {
         resultCheckStatus();
         throw err;
     }
+    const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
+    const skipConfirm = localStorage.getItem(rememberKey) === 'true';
+
+    const confirmation = skipConfirm || await Popup.show.confirm('Connecting To Proxy', `<span>Are you sure you want to connect to the following proxy URL?</span><var>${oai_settings.reverse_proxy}</var>`, {
+        customInputs: [{ id: 'proxy-remember', label: 'Don\'t ask again for this proxy URL' }],
+        onClose: popup => {
+            if (popup.result) {
+                const rememberValue = popup.inputResults.get('proxy-remember');
+                localStorage.setItem(rememberKey, String(rememberValue));
+            }
+        },
+    });
+    if (!confirmation) {
+        toastr.error('Update or remove your reverse proxy settings.');
+        setOnlineStatus('no_connection');
+        resultCheckStatus();
+        throw new Error('Proxy connection denied.');
+    }
 }
 
 /**
@@ -528,7 +548,7 @@ function setOpenAIMessages(chat) {
         switch (oai_settings.names_behavior) {
             case character_names_behavior.NONE:
                 if (selected_group || (chat[j].force_avatar && chat[j].name !== name1 && chat[j].extra?.type !== system_message_types.NARRATOR)) {
-                    content = `${chat[j].name}: ${content}`;
+                    // content = `${chat[j].name}: ${content}`;
                 }
                 break;
             case character_names_behavior.CONTENT:
@@ -1787,7 +1807,7 @@ async function sendOpenAIRequest(type, messages, signal) {
 
     // Proxy is only supported for Claude, OpenAI, Mistral, and Google MakerSuite
     if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE].includes(oai_settings.chat_completion_source)) {
-        validateReverseProxy();
+        await validateReverseProxy();
         generate_data['reverse_proxy'] = oai_settings.reverse_proxy;
         generate_data['proxy_password'] = oai_settings.proxy_password;
     }
@@ -3200,7 +3220,7 @@ async function getStatusOpen() {
     };
 
     if (oai_settings.reverse_proxy && (oai_settings.chat_completion_source === chat_completion_sources.OPENAI || oai_settings.chat_completion_source === chat_completion_sources.CLAUDE)) {
-        validateReverseProxy();
+        await validateReverseProxy();
     }
 
     if (oai_settings.chat_completion_source === chat_completion_sources.CUSTOM) {

From 47eb12750d42eee62fe074263c389ab6f96ec879 Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Wed, 10 Jul 2024 21:47:42 -0400
Subject: [PATCH 02/17] undo no chat names

---
 public/scripts/openai.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 614d5759b..c8021a712 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -548,7 +548,7 @@ function setOpenAIMessages(chat) {
         switch (oai_settings.names_behavior) {
             case character_names_behavior.NONE:
                 if (selected_group || (chat[j].force_avatar && chat[j].name !== name1 && chat[j].extra?.type !== system_message_types.NARRATOR)) {
-                    // content = `${chat[j].name}: ${content}`;
+                    content = `${chat[j].name}: ${content}`;
                 }
                 break;
             case character_names_behavior.CONTENT:

From a64a2dd83e7d73ebb97eb5b17908d81af533fe87 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 00:00:39 +0300
Subject: [PATCH 03/17] Export confirmation of sensitive preset fields

---
 public/scripts/openai.js | 29 ++++++++++++++++++++++++++---
 public/scripts/popup.js  |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index c8021a712..84c0ee02d 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -73,7 +73,7 @@ import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashCommandArgument.js';
 import { renderTemplateAsync } from './templates.js';
 import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
-import { Popup } from './popup.js';
+import { Popup, POPUP_RESULT, POPUP_TYPE, PopupUtils } from './popup.js';
 
 export {
     openai_messages_count,
@@ -3560,9 +3560,32 @@ async function onExportPresetClick() {
     }
 
     const preset = structuredClone(openai_settings[openai_setting_names[oai_settings.preset_settings_openai]]);
+    const sensitiveFields = [
+        'reverse_proxy',
+        'proxy_password',
+        'custom_url',
+        'custom_include_body',
+        'custom_exclude_body',
+        'custom_include_headers',
+    ];
 
-    delete preset.reverse_proxy;
-    delete preset.proxy_password;
+    const fieldValues = sensitiveFields.filter(field => preset[field]).map(field => `<b>${field}</b>: <code>${preset[field]}</code>`);
+    const shouldConfirm = fieldValues.length > 0;
+    const textHeader = 'Your preset contains proxy and/or custom endpoint settings.';
+    const textMessage = `<div>Do you want to remove these fields before exporting?</div>${DOMPurify.sanitize(fieldValues.join('<br>'))}`;
+    const cancelButton = { text: 'Cancel', result: POPUP_RESULT.CANCELLED, appendAtEnd: true, action: () => popup.complete(POPUP_RESULT.CANCELLED) };
+    const popupOptions = { customButtons: [cancelButton] };
+    const popup = new Popup(PopupUtils.BuildTextWithHeader(textHeader, textMessage), POPUP_TYPE.CONFIRM, '', popupOptions);
+    const popupResult = shouldConfirm && await popup.show();
+
+    if (popupResult === POPUP_RESULT.CANCELLED) {
+        console.log('Export cancelled by user');
+        return;
+    }
+
+    if (!shouldConfirm || popupResult === POPUP_RESULT.AFFIRMATIVE) {
+        sensitiveFields.forEach(field => delete preset[field]);
+    }
 
     const presetJsonString = JSON.stringify(preset, null, 4);
     const presetFileName = `${oai_settings.preset_settings_openai}.json`;
diff --git a/public/scripts/popup.js b/public/scripts/popup.js
index 944af3ae7..8def3d352 100644
--- a/public/scripts/popup.js
+++ b/public/scripts/popup.js
@@ -560,7 +560,7 @@ export class Popup {
     };
 }
 
-class PopupUtils {
+export class PopupUtils {
     /**
      * Builds popup content with header and text below
      *

From 3809d3d4ac5050d80802adb74b78515f8209b1a9 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 00:15:42 +0300
Subject: [PATCH 04/17] Add import confirmation

---
 public/scripts/openai.js | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 84c0ee02d..391c0ee19 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -204,6 +204,15 @@ const custom_prompt_post_processing_types = {
     CLAUDE: 'claude',
 };
 
+const sensitiveFields = [
+    'reverse_proxy',
+    'proxy_password',
+    'custom_url',
+    'custom_include_body',
+    'custom_exclude_body',
+    'custom_include_headers',
+];
+
 function getPrefixMap() {
     return selected_group ? {
         assistant: '',
@@ -3515,6 +3524,27 @@ async function onPresetImportFileChange(e) {
         return;
     }
 
+    const fields = sensitiveFields.filter(field => presetBody[field]).map(field => `<b>${field}</b>`);
+    const shouldConfirm = fields.length > 0;
+
+    if (shouldConfirm) {
+        const textHeader = 'The imported preset contains proxy and/or custom endpoint settings.';
+        const textMessage = fields.join('<br>');
+        const cancelButton = { text: 'Cancel import', result: POPUP_RESULT.CANCELLED, appendAtEnd: true, action: () => popup.complete(POPUP_RESULT.CANCELLED) };
+        const popupOptions = { customButtons: [cancelButton], okButton: 'Remove them', cancelButton: 'Import as-is' };
+        const popup = new Popup(PopupUtils.BuildTextWithHeader(textHeader, textMessage), POPUP_TYPE.CONFIRM, '', popupOptions);
+        const popupResult = await popup.show();
+
+        if (popupResult === POPUP_RESULT.CANCELLED) {
+            console.log('Import cancelled by user');
+            return;
+        }
+
+        if (popupResult === POPUP_RESULT.AFFIRMATIVE) {
+            sensitiveFields.forEach(field => delete presetBody[field]);
+        }
+    }
+
     if (name in openai_setting_names) {
         const confirm = await callPopup('Preset name already exists. Overwrite?', 'confirm');
 
@@ -3560,19 +3590,11 @@ async function onExportPresetClick() {
     }
 
     const preset = structuredClone(openai_settings[openai_setting_names[oai_settings.preset_settings_openai]]);
-    const sensitiveFields = [
-        'reverse_proxy',
-        'proxy_password',
-        'custom_url',
-        'custom_include_body',
-        'custom_exclude_body',
-        'custom_include_headers',
-    ];
 
     const fieldValues = sensitiveFields.filter(field => preset[field]).map(field => `<b>${field}</b>: <code>${preset[field]}</code>`);
     const shouldConfirm = fieldValues.length > 0;
     const textHeader = 'Your preset contains proxy and/or custom endpoint settings.';
-    const textMessage = `<div>Do you want to remove these fields before exporting?</div>${DOMPurify.sanitize(fieldValues.join('<br>'))}`;
+    const textMessage = `<div>Do you want to remove these fields before exporting?</div><br>${DOMPurify.sanitize(fieldValues.join('<br>'))}`;
     const cancelButton = { text: 'Cancel', result: POPUP_RESULT.CANCELLED, appendAtEnd: true, action: () => popup.complete(POPUP_RESULT.CANCELLED) };
     const popupOptions = { customButtons: [cancelButton] };
     const popup = new Popup(PopupUtils.BuildTextWithHeader(textHeader, textMessage), POPUP_TYPE.CONFIRM, '', popupOptions);

From 63ddb81ef7773c4c6062ec0faa8d08182f5df564 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:01:15 +0300
Subject: [PATCH 05/17] Don't autofit immediately if a scrollbar is visible at
 max height

---
 public/scripts/RossAscends-mods.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index a42f876da..e248ca713 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -882,7 +882,8 @@ export function initRossMods() {
     });
 
     $(sendTextArea).on('input', () => {
-        if (sendTextArea.scrollHeight > sendTextArea.offsetHeight || sendTextArea.value === '') {
+        const scrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth && sendTextArea.offsetHeight >= window.innerHeight / 2;
+        if ((sendTextArea.scrollHeight > sendTextArea.offsetHeight && !scrollbarShown) || sendTextArea.value === '') {
             autoFitSendTextArea();
         } else {
             autoFitSendTextAreaDebounced();

From 63ecf3b398d41a2a03b0fd147cdada31c78501e0 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:11:06 +0300
Subject: [PATCH 06/17] Remember proxy without confirmation

---
 public/scripts/openai.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index ba5cbcee1..2886778e3 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -416,21 +416,16 @@ async function validateReverseProxy() {
     const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
     const skipConfirm = localStorage.getItem(rememberKey) === 'true';
 
-    const confirmation = skipConfirm || await Popup.show.confirm('Connecting To Proxy', `<span>Are you sure you want to connect to the following proxy URL?</span><var>${oai_settings.reverse_proxy}</var>`, {
-        customInputs: [{ id: 'proxy-remember', label: 'Don\'t ask again for this proxy URL' }],
-        onClose: popup => {
-            if (popup.result) {
-                const rememberValue = popup.inputResults.get('proxy-remember');
-                localStorage.setItem(rememberKey, String(rememberValue));
-            }
-        },
-    });
+    const confirmation = skipConfirm || await Popup.show.confirm('Connecting To Proxy', `<span>Are you sure you want to connect to the following proxy URL?</span><var>${DOMPurify.sanitize(oai_settings.reverse_proxy)}</var>`);
+
     if (!confirmation) {
         toastr.error('Update or remove your reverse proxy settings.');
         setOnlineStatus('no_connection');
         resultCheckStatus();
         throw new Error('Proxy connection denied.');
     }
+
+    localStorage.setItem(rememberKey, String(true));
 }
 
 /**

From 3a0b4ec41dcd48eea8db92b6ee28e4b3c9495e46 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:14:36 +0300
Subject: [PATCH 07/17] Update popup usage

---
 public/scripts/openai.js | 12 +++++-------
 public/scripts/popup.js  |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 2886778e3..e2402c095 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -73,7 +73,7 @@ import { SlashCommand } from './slash-commands/SlashCommand.js';
 import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashCommandArgument.js';
 import { renderTemplateAsync } from './templates.js';
 import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
-import { Popup, POPUP_RESULT, POPUP_TYPE, PopupUtils } from './popup.js';
+import { Popup, POPUP_RESULT } from './popup.js';
 
 export {
     openai_messages_count,
@@ -3525,10 +3525,9 @@ async function onPresetImportFileChange(e) {
     if (shouldConfirm) {
         const textHeader = 'The imported preset contains proxy and/or custom endpoint settings.';
         const textMessage = fields.join('<br>');
-        const cancelButton = { text: 'Cancel import', result: POPUP_RESULT.CANCELLED, appendAtEnd: true, action: () => popup.complete(POPUP_RESULT.CANCELLED) };
+        const cancelButton = { text: 'Cancel import', result: POPUP_RESULT.CANCELLED, appendAtEnd: true };
         const popupOptions = { customButtons: [cancelButton], okButton: 'Remove them', cancelButton: 'Import as-is' };
-        const popup = new Popup(PopupUtils.BuildTextWithHeader(textHeader, textMessage), POPUP_TYPE.CONFIRM, '', popupOptions);
-        const popupResult = await popup.show();
+        const popupResult = await Popup.show.confirm(textHeader, textMessage, popupOptions);
 
         if (popupResult === POPUP_RESULT.CANCELLED) {
             console.log('Import cancelled by user');
@@ -3590,10 +3589,9 @@ async function onExportPresetClick() {
     const shouldConfirm = fieldValues.length > 0;
     const textHeader = 'Your preset contains proxy and/or custom endpoint settings.';
     const textMessage = `<div>Do you want to remove these fields before exporting?</div><br>${DOMPurify.sanitize(fieldValues.join('<br>'))}`;
-    const cancelButton = { text: 'Cancel', result: POPUP_RESULT.CANCELLED, appendAtEnd: true, action: () => popup.complete(POPUP_RESULT.CANCELLED) };
+    const cancelButton = { text: 'Cancel', result: POPUP_RESULT.CANCELLED, appendAtEnd: true };
     const popupOptions = { customButtons: [cancelButton] };
-    const popup = new Popup(PopupUtils.BuildTextWithHeader(textHeader, textMessage), POPUP_TYPE.CONFIRM, '', popupOptions);
-    const popupResult = shouldConfirm && await popup.show();
+    const popupResult = await Popup.show.confirm(textHeader, textMessage, popupOptions);
 
     if (popupResult === POPUP_RESULT.CANCELLED) {
         console.log('Export cancelled by user');
diff --git a/public/scripts/popup.js b/public/scripts/popup.js
index c1cfc942a..4ece1b468 100644
--- a/public/scripts/popup.js
+++ b/public/scripts/popup.js
@@ -565,7 +565,7 @@ export class Popup {
     };
 }
 
-export class PopupUtils {
+class PopupUtils {
     /**
      * Builds popup content with header and text below
      *

From 0a0fc0141c5e7aa91b0c6386cdaf78efdb0fdd59 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:39:32 +0300
Subject: [PATCH 08/17] Limit edit textarea height to 75%

---
 public/script.js | 3 ++-
 public/style.css | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/script.js b/public/script.js
index 7666b500b..c9c3fc0c5 100644
--- a/public/script.js
+++ b/public/script.js
@@ -9242,7 +9242,8 @@ jQuery(async function () {
     const autoFitEditTextAreaDebounced = debounce(autoFitEditTextArea, debounce_timeout.short);
     document.addEventListener('input', e => {
         if (e.target instanceof HTMLTextAreaElement && e.target.classList.contains('edit_textarea')) {
-            const immediately = e.target.scrollHeight > e.target.offsetHeight || e.target.value === '';
+            const scrollbarShown = e.target.clientWidth < e.target.offsetWidth && e.target.offsetHeight >= window.innerHeight * 0.75;
+            const immediately = (e.target.scrollHeight > e.target.offsetHeight && !scrollbarShown) || e.target.value === '';
             immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
         }
     });
diff --git a/public/style.css b/public/style.css
index 6c71ee09e..95a61cdae 100644
--- a/public/style.css
+++ b/public/style.css
@@ -3910,6 +3910,8 @@ input[type="range"]::-webkit-slider-thumb {
     outline: none;
     background-color: var(--black50a);
     line-height: calc(var(--mainFontSize) + .25rem);
+    max-height: 75vh;
+    max-height: 75dvh;
 }
 
 #anchor_order {

From 5d7c204678e5abc1f718ce226656a94aff78316e Mon Sep 17 00:00:00 2001
From: Succubyss <87207237+Succubyss@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:08:36 -0500
Subject: [PATCH 09/17] sendTextArea: the same but prettier

and also no jQuery
---
 public/scripts/RossAscends-mods.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index e248ca713..7723c8512 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -881,13 +881,14 @@ export function initRossMods() {
         saveSettingsDebounced();
     });
 
-    $(sendTextArea).on('input', () => {
-        const scrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth && sendTextArea.offsetHeight >= window.innerHeight / 2;
-        if ((sendTextArea.scrollHeight > sendTextArea.offsetHeight && !scrollbarShown) || sendTextArea.value === '') {
-            autoFitSendTextArea();
-        } else {
-            autoFitSendTextAreaDebounced();
-        }
+    sendTextArea.addEventListener('input', () => {
+        const hasContent = sendTextArea.value !== '';
+        const fitsCurrentSize = sendTextArea.scrollHeight <= sendTextArea.offsetHeight;
+        const isScrollbarShown = sendTextArea.clientWidth < sendTextArea.offsetWidth;
+        const isHalfScreenHeight = sendTextArea.offsetHeight >= window.innerHeight / 2;
+        const needsDebounce = hasContent && (fitsCurrentSize || (isScrollbarShown && isHalfScreenHeight));
+        if (needsDebounce) autoFitSendTextAreaDebounced();
+        else autoFitSendTextArea();
         saveUserInputDebounced();
     });
 

From c684d23476f20130e8d2996cb13fd60d5afc1dc7 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 22:37:47 +0300
Subject: [PATCH 10/17] Make chat scrolling events passive

---
 public/script.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/script.js b/public/script.js
index c9c3fc0c5..1a89f67e4 100644
--- a/public/script.js
+++ b/public/script.js
@@ -9126,10 +9126,6 @@ jQuery(async function () {
         $('#groupCurrentMemberListToggle .inline-drawer-icon').trigger('click');
     }, 200);
 
-    $('#chat').on('wheel touchstart', () => {
-        scrollLock = true;
-    });
-
     $(document).on('click', '.api_loading', cancelStatusCheck);
 
     //////////INPUT BAR FOCUS-KEEPING LOGIC/////////////
@@ -9247,12 +9243,19 @@ jQuery(async function () {
             immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
         }
     });
-    document.getElementById('chat').addEventListener('scroll', function () {
+    const chatElement = document.getElementById('chat');
+    chatElement.addEventListener('wheel', function () {
+        scrollLock = true;
+    }, { passive: true });
+    chatElement.addEventListener('touchstart', function () {
+        scrollLock = true;
+    }, { passive: true });
+    chatElement.addEventListener('scroll', function () {
         if (is_use_scroll_holder) {
             this.scrollTop = scroll_holder;
             is_use_scroll_holder = false;
         }
-    });
+    }, { passive: true });
 
     $(document).on('click', '.mes', function () {
         //when a 'delete message' parent div is clicked

From 6c03a617888c876b46f83ad6dab7db3ac96baa4e Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:43:21 +0300
Subject: [PATCH 11/17] Exclude streaming and multiswipe from textgen presets

---
 public/scripts/preset-manager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 5d25140dc..547aa58e0 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -301,6 +301,9 @@ class PresetManager {
 
         const filteredKeys = [
             'preset',
+            'streaming',
+            'truncation_length',
+            'n',
             'streaming_url',
             'stopping_strings',
             'can_use_tokenization',

From 6167f50a89f733ce8fdb3e418536e58423501222 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:52:55 +0300
Subject: [PATCH 12/17] Remove dead property from default settings

---
 default/content/settings.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/default/content/settings.json b/default/content/settings.json
index f558c769f..97f2e5277 100644
--- a/default/content/settings.json
+++ b/default/content/settings.json
@@ -44,7 +44,6 @@
         "preset": "Default",
         "add_bos_token": true,
         "stopping_strings": [],
-        "truncation_length": 2048,
         "ban_eos_token": false,
         "skip_special_tokens": true,
         "streaming": false,

From 230e6cd1423aa392143286bc35f6e59f5627e054 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 12 Jul 2024 23:54:26 +0300
Subject: [PATCH 13/17] Update default textgen presets

---
 default/content/presets/textgen/Asterism.json |  66 ++++++++++-
 .../content/presets/textgen/Beam Search.json  |  68 ++++++++++-
 default/content/presets/textgen/Big O.json    |  66 ++++++++++-
 .../presets/textgen/Contrastive Search.json   |  66 ++++++++++-
 default/content/presets/textgen/Default.json  |  66 ++++++++++-
 .../presets/textgen/Deterministic.json        |  66 ++++++++++-
 .../presets/textgen/Divine Intellect.json     |  66 ++++++++++-
 .../presets/textgen/Kobold (Godlike).json     |  66 ++++++++++-
 .../textgen/Kobold (Liminal Drift).json       |  66 ++++++++++-
 .../presets/textgen/LLaMa-Precise.json        |  66 ++++++++++-
 .../presets/textgen/Midnight Enigma.json      |  66 ++++++++++-
 .../content/presets/textgen/Miro Bronze.json  |  63 +++++++++-
 .../content/presets/textgen/Miro Gold.json    |  63 +++++++++-
 .../content/presets/textgen/Miro Silver.json  |  63 +++++++++-
 default/content/presets/textgen/Mirostat.json |  66 ++++++++++-
 default/content/presets/textgen/Naive.json    |  66 ++++++++++-
 .../presets/textgen/NovelAI (Best Guess).json |  66 ++++++++++-
 .../presets/textgen/NovelAI (Decadence).json  |  68 ++++++++++-
 .../presets/textgen/NovelAI (Genesis).json    |  66 ++++++++++-
 .../presets/textgen/NovelAI (Lycaenidae).json |  66 ++++++++++-
 .../presets/textgen/NovelAI (Ouroboros).json  |  66 ++++++++++-
 .../textgen/NovelAI (Pleasing Results).json   |  66 ++++++++++-
 .../textgen/NovelAI (Sphinx Moth).json        |  66 ++++++++++-
 .../textgen/NovelAI (Storywriter).json        |  66 ++++++++++-
 .../content/presets/textgen/Shortwave.json    |  66 ++++++++++-
 default/content/presets/textgen/Simple-1.json |  66 ++++++++++-
 .../content/presets/textgen/Space Alien.json  |  66 ++++++++++-
 default/content/presets/textgen/StarChat.json |  66 ++++++++++-
 .../presets/textgen/TFS-with-Top-A.json       |  66 ++++++++++-
 default/content/presets/textgen/Titanic.json  |  66 ++++++++++-
 .../presets/textgen/Universal-Creative.json   |  43 ++++++-
 .../presets/textgen/Universal-Light.json      |  43 ++++++-
 .../textgen/Universal-Super-Creative.json     |  43 ++++++-
 default/content/presets/textgen/Yara.json     |  66 ++++++++++-
 .../textgen/simple-proxy-for-tavern.json      | 108 ++++++++++++++----
 35 files changed, 2182 insertions(+), 96 deletions(-)

diff --git a/default/content/presets/textgen/Asterism.json b/default/content/presets/textgen/Asterism.json
index 71b43e84a..afbaad2c4 100644
--- a/default/content/presets/textgen/Asterism.json
+++ b/default/content/presets/textgen/Asterism.json
@@ -1,23 +1,85 @@
 {
     "temp": 1.68,
+    "temperature_last": true,
     "top_p": 0.17,
     "top_k": 77,
-    "typical_p": 1,
     "top_a": 0.42,
     "tfs": 0.97,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.02,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Beam Search.json b/default/content/presets/textgen/Beam Search.json
index 2f341d6d2..b584ae0ae 100644
--- a/default/content/presets/textgen/Beam Search.json	
+++ b/default/content/presets/textgen/Beam Search.json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.92,
     "top_k": 150,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
-    "rep_pen": 4.5,
+    "typical_p": 1,
+    "min_p": 0,
+    "rep_pen": 3,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 2,
     "penalty_alpha": 0,
     "num_beams": 10,
     "length_penalty": 1.4,
     "min_length": 200,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": true,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Big O.json b/default/content/presets/textgen/Big O.json
index e565de6d3..4b5ca81a3 100644
--- a/default/content/presets/textgen/Big O.json	
+++ b/default/content/presets/textgen/Big O.json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.87,
+    "temperature_last": true,
     "top_p": 0.99,
     "top_k": 85,
-    "typical_p": 0.68,
     "top_a": 0,
     "tfs": 0.68,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 0.68,
+    "min_p": 0,
     "rep_pen": 1.01,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Contrastive Search.json b/default/content/presets/textgen/Contrastive Search.json
index 3537f1116..1dae94965 100644
--- a/default/content/presets/textgen/Contrastive Search.json	
+++ b/default/content/presets/textgen/Contrastive Search.json	
@@ -1,23 +1,85 @@
 {
     "temp": 1,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 4,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0.6,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": false,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Default.json b/default/content/presets/textgen/Default.json
index eb787104f..6f450cfeb 100644
--- a/default/content/presets/textgen/Default.json
+++ b/default/content/presets/textgen/Default.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.5,
     "top_k": 40,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.2,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Deterministic.json b/default/content/presets/textgen/Deterministic.json
index f05c3ea3c..06ae54675 100644
--- a/default/content/presets/textgen/Deterministic.json
+++ b/default/content/presets/textgen/Deterministic.json
@@ -1,23 +1,85 @@
 {
     "temp": 0,
+    "temperature_last": true,
     "top_p": 0,
     "top_k": 1,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.18,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": false,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Divine Intellect.json b/default/content/presets/textgen/Divine Intellect.json
index cae86324a..d9a4757d1 100644
--- a/default/content/presets/textgen/Divine Intellect.json	
+++ b/default/content/presets/textgen/Divine Intellect.json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.31,
+    "temperature_last": true,
     "top_p": 0.14,
     "top_k": 49,
-    "typical_p": 1,
     "top_a": 0.52,
     "tfs": 1,
     "epsilon_cutoff": 1.49,
     "eta_cutoff": 10.42,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.17,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Kobold (Godlike).json b/default/content/presets/textgen/Kobold (Godlike).json
index 5df9438b7..367e126ee 100644
--- a/default/content/presets/textgen/Kobold (Godlike).json	
+++ b/default/content/presets/textgen/Kobold (Godlike).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.5,
     "top_k": 0,
-    "typical_p": 0.19,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 0.19,
+    "min_p": 0,
     "rep_pen": 1.1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Kobold (Liminal Drift).json b/default/content/presets/textgen/Kobold (Liminal Drift).json
index c6c289ee9..9035bead0 100644
--- a/default/content/presets/textgen/Kobold (Liminal Drift).json	
+++ b/default/content/presets/textgen/Kobold (Liminal Drift).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.66,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 0.6,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 0.6,
+    "min_p": 0,
     "rep_pen": 1.1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/LLaMa-Precise.json b/default/content/presets/textgen/LLaMa-Precise.json
index 3dbb3b74e..84927b8d9 100644
--- a/default/content/presets/textgen/LLaMa-Precise.json
+++ b/default/content/presets/textgen/LLaMa-Precise.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.1,
     "top_k": 40,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.18,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 200,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Midnight Enigma.json b/default/content/presets/textgen/Midnight Enigma.json
index d55269ab9..d60d989fa 100644
--- a/default/content/presets/textgen/Midnight Enigma.json	
+++ b/default/content/presets/textgen/Midnight Enigma.json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.98,
+    "temperature_last": true,
     "top_p": 0.37,
     "top_k": 100,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.18,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Miro Bronze.json b/default/content/presets/textgen/Miro Bronze.json
index 96ce62afd..346e5c29f 100644
--- a/default/content/presets/textgen/Miro Bronze.json	
+++ b/default/content/presets/textgen/Miro Bronze.json	
@@ -1,24 +1,85 @@
 {
     "temp": 1.06,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 2,
     "mirostat_tau": 9.61,
     "mirostat_eta": 1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Miro Gold.json b/default/content/presets/textgen/Miro Gold.json
index 4a423d39e..2b2edf49a 100644
--- a/default/content/presets/textgen/Miro Gold.json	
+++ b/default/content/presets/textgen/Miro Gold.json	
@@ -1,24 +1,85 @@
 {
     "temp": 1.17,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 2,
     "mirostat_tau": 9.91,
     "mirostat_eta": 1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Miro Silver.json b/default/content/presets/textgen/Miro Silver.json
index d04526dc4..249168589 100644
--- a/default/content/presets/textgen/Miro Silver.json	
+++ b/default/content/presets/textgen/Miro Silver.json	
@@ -1,24 +1,85 @@
 {
     "temp": 1.17,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 2,
     "mirostat_tau": 9.62,
     "mirostat_eta": 1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Mirostat.json b/default/content/presets/textgen/Mirostat.json
index 198be9feb..481e7ea52 100644
--- a/default/content/presets/textgen/Mirostat.json
+++ b/default/content/presets/textgen/Mirostat.json
@@ -1,23 +1,85 @@
 {
     "temp": 1,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 2,
     "mirostat_tau": 8,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Naive.json b/default/content/presets/textgen/Naive.json
index 2cdeb9492..ac1349e5c 100644
--- a/default/content/presets/textgen/Naive.json
+++ b/default/content/presets/textgen/Naive.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.85,
     "top_k": 50,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Best Guess).json b/default/content/presets/textgen/NovelAI (Best Guess).json
index b116cf0e1..af8339889 100644
--- a/default/content/presets/textgen/NovelAI (Best Guess).json	
+++ b/default/content/presets/textgen/NovelAI (Best Guess).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.8,
+    "temperature_last": true,
     "top_p": 0.9,
     "top_k": 100,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Decadence).json b/default/content/presets/textgen/NovelAI (Decadence).json
index 7b692c671..e970dd1bc 100644
--- a/default/content/presets/textgen/NovelAI (Decadence).json	
+++ b/default/content/presets/textgen/NovelAI (Decadence).json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.99,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 100,
-    "typical_p": 0.97,
-    "rep_pen": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 0.97,
+    "min_p": 0,
+    "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Genesis).json b/default/content/presets/textgen/NovelAI (Genesis).json
index 8b2c85df7..26e96ae25 100644
--- a/default/content/presets/textgen/NovelAI (Genesis).json	
+++ b/default/content/presets/textgen/NovelAI (Genesis).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.63,
+    "temperature_last": true,
     "top_p": 0.98,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.05,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Lycaenidae).json b/default/content/presets/textgen/NovelAI (Lycaenidae).json
index d99611189..a9eacb542 100644
--- a/default/content/presets/textgen/NovelAI (Lycaenidae).json	
+++ b/default/content/presets/textgen/NovelAI (Lycaenidae).json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.99,
+    "temperature_last": true,
     "top_p": 0.85,
     "top_k": 12,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Ouroboros).json b/default/content/presets/textgen/NovelAI (Ouroboros).json
index 708bedf23..b68a5b568 100644
--- a/default/content/presets/textgen/NovelAI (Ouroboros).json	
+++ b/default/content/presets/textgen/NovelAI (Ouroboros).json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.07,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 100,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.05,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Pleasing Results).json b/default/content/presets/textgen/NovelAI (Pleasing Results).json
index ed4968b6f..ea5c45919 100644
--- a/default/content/presets/textgen/NovelAI (Pleasing Results).json	
+++ b/default/content/presets/textgen/NovelAI (Pleasing Results).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.44,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Sphinx Moth).json b/default/content/presets/textgen/NovelAI (Sphinx Moth).json
index 1390a76b1..11085fd68 100644
--- a/default/content/presets/textgen/NovelAI (Sphinx Moth).json	
+++ b/default/content/presets/textgen/NovelAI (Sphinx Moth).json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.99,
+    "temperature_last": true,
     "top_p": 0.18,
     "top_k": 30,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/NovelAI (Storywriter).json b/default/content/presets/textgen/NovelAI (Storywriter).json
index dfb5c1ff1..4bb308db2 100644
--- a/default/content/presets/textgen/NovelAI (Storywriter).json	
+++ b/default/content/presets/textgen/NovelAI (Storywriter).json	
@@ -1,23 +1,85 @@
 {
     "temp": 0.72,
+    "temperature_last": true,
     "top_p": 0.73,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Shortwave.json b/default/content/presets/textgen/Shortwave.json
index f9f039ba2..44608d172 100644
--- a/default/content/presets/textgen/Shortwave.json
+++ b/default/content/presets/textgen/Shortwave.json
@@ -1,23 +1,85 @@
 {
     "temp": 1.53,
+    "temperature_last": true,
     "top_p": 0.64,
     "top_k": 33,
-    "typical_p": 1,
     "top_a": 0.04,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.07,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Simple-1.json b/default/content/presets/textgen/Simple-1.json
index 0a1acea99..6662eaa6c 100644
--- a/default/content/presets/textgen/Simple-1.json
+++ b/default/content/presets/textgen/Simple-1.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 0.9,
     "top_k": 20,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Space Alien.json b/default/content/presets/textgen/Space Alien.json
index 95d98f368..e1d59426b 100644
--- a/default/content/presets/textgen/Space Alien.json	
+++ b/default/content/presets/textgen/Space Alien.json	
@@ -1,23 +1,85 @@
 {
     "temp": 1.31,
+    "temperature_last": true,
     "top_p": 0.29,
     "top_k": 72,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.09,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/StarChat.json b/default/content/presets/textgen/StarChat.json
index 3b497a633..aa572e206 100644
--- a/default/content/presets/textgen/StarChat.json
+++ b/default/content/presets/textgen/StarChat.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.02,
+    "temperature_last": true,
     "top_p": 0.95,
     "top_k": 50,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/TFS-with-Top-A.json b/default/content/presets/textgen/TFS-with-Top-A.json
index da0b4cd5b..ba6b4c606 100644
--- a/default/content/presets/textgen/TFS-with-Top-A.json
+++ b/default/content/presets/textgen/TFS-with-Top-A.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.7,
+    "temperature_last": true,
     "top_p": 1,
     "top_k": 0,
-    "typical_p": 1,
     "top_a": 0.2,
     "tfs": 0.95,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.15,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Titanic.json b/default/content/presets/textgen/Titanic.json
index 55bf196a5..d46f0cf71 100644
--- a/default/content/presets/textgen/Titanic.json
+++ b/default/content/presets/textgen/Titanic.json
@@ -1,23 +1,85 @@
 {
     "temp": 1.01,
+    "temperature_last": true,
     "top_p": 0.21,
     "top_k": 91,
-    "typical_p": 1,
     "top_a": 0.75,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 10.78,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.21,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1.07,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Universal-Creative.json b/default/content/presets/textgen/Universal-Creative.json
index 7784fe226..527550b9a 100644
--- a/default/content/presets/textgen/Universal-Creative.json
+++ b/default/content/presets/textgen/Universal-Creative.json
@@ -11,6 +11,8 @@
     "min_p": 0.1,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
@@ -19,24 +21,56 @@
     "encoder_rep_pen": 1,
     "freq_pen": 0,
     "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
     "add_bos_token": true,
-    "truncation_length": 2048,
     "ban_eos_token": false,
     "skip_special_tokens": true,
-    "streaming": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
     "mirostat_eta": 0.1,
     "guidance_scale": 1,
     "negative_prompt": "",
     "grammar_string": "",
+    "json_schema": {},
     "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
     "ignore_eos_token": false,
     "spaces_between_special_tokens": true,
-    "type": "ooba",
-    "legacy_api": false,
+    "speculative_ngram": false,
     "sampler_order": [
         5,
         6,
@@ -46,5 +80,6 @@
         3,
         4
     ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Universal-Light.json b/default/content/presets/textgen/Universal-Light.json
index d855094d1..8bc79a847 100644
--- a/default/content/presets/textgen/Universal-Light.json
+++ b/default/content/presets/textgen/Universal-Light.json
@@ -11,6 +11,8 @@
     "min_p": 0.1,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
@@ -19,24 +21,56 @@
     "encoder_rep_pen": 1,
     "freq_pen": 0,
     "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
     "add_bos_token": true,
-    "truncation_length": 2048,
     "ban_eos_token": false,
     "skip_special_tokens": true,
-    "streaming": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
     "mirostat_eta": 0.1,
     "guidance_scale": 1,
     "negative_prompt": "",
     "grammar_string": "",
+    "json_schema": {},
     "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
     "ignore_eos_token": false,
     "spaces_between_special_tokens": true,
-    "type": "ooba",
-    "legacy_api": false,
+    "speculative_ngram": false,
     "sampler_order": [
         5,
         6,
@@ -46,5 +80,6 @@
         3,
         4
     ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Universal-Super-Creative.json b/default/content/presets/textgen/Universal-Super-Creative.json
index 60df29700..dfd28d863 100644
--- a/default/content/presets/textgen/Universal-Super-Creative.json
+++ b/default/content/presets/textgen/Universal-Super-Creative.json
@@ -11,6 +11,8 @@
     "min_p": 0.1,
     "rep_pen": 1,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
@@ -19,24 +21,56 @@
     "encoder_rep_pen": 1,
     "freq_pen": 0,
     "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
     "add_bos_token": true,
-    "truncation_length": 2048,
     "ban_eos_token": false,
     "skip_special_tokens": true,
-    "streaming": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
     "mirostat_eta": 0.1,
     "guidance_scale": 1,
     "negative_prompt": "",
     "grammar_string": "",
+    "json_schema": {},
     "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
     "ignore_eos_token": false,
     "spaces_between_special_tokens": true,
-    "type": "ooba",
-    "legacy_api": false,
+    "speculative_ngram": false,
     "sampler_order": [
         5,
         6,
@@ -46,5 +80,6 @@
         3,
         4
     ],
+    "logit_bias": [],
     "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/Yara.json b/default/content/presets/textgen/Yara.json
index 6b5a28711..37601398c 100644
--- a/default/content/presets/textgen/Yara.json
+++ b/default/content/presets/textgen/Yara.json
@@ -1,23 +1,85 @@
 {
     "temp": 0.82,
+    "temperature_last": true,
     "top_p": 0.21,
     "top_k": 72,
-    "typical_p": 1,
     "top_a": 0,
     "tfs": 1,
     "epsilon_cutoff": 0,
     "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
     "rep_pen": 1.19,
     "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
     "no_repeat_ngram_size": 0,
     "penalty_alpha": 0,
     "num_beams": 1,
     "length_penalty": 1,
     "min_length": 0,
     "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
     "do_sample": true,
     "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
     "mirostat_mode": 0,
     "mirostat_tau": 5,
-    "mirostat_eta": 0.1
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        5,
+        6,
+        0,
+        1,
+        2,
+        3,
+        4
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
 }
diff --git a/default/content/presets/textgen/simple-proxy-for-tavern.json b/default/content/presets/textgen/simple-proxy-for-tavern.json
index b4b1c781f..17e077842 100644
--- a/default/content/presets/textgen/simple-proxy-for-tavern.json
+++ b/default/content/presets/textgen/simple-proxy-for-tavern.json
@@ -1,23 +1,85 @@
-{
-    "temp": 0.65,
-    "top_p": 0.47,
-    "top_k": 42,
-    "typical_p": 1,
-    "top_a": 0,
-    "tfs": 1,
-    "epsilon_cutoff": 0,
-    "eta_cutoff": 0,
-    "rep_pen": 1.18,
-    "rep_pen_range": 0,
-    "no_repeat_ngram_size": 0,
-    "penalty_alpha": 0,
-    "num_beams": 1,
-    "length_penalty": 1,
-    "min_length": 0,
-    "encoder_rep_pen": 1,
-    "do_sample": true,
-    "early_stopping": false,
-    "mirostat_mode": 0,
-    "mirostat_tau": 5,
-    "mirostat_eta": 0.1
-}
+{
+    "temp": 0.65,
+    "temperature_last": true,
+    "top_p": 0.47,
+    "top_k": 42,
+    "top_a": 0,
+    "tfs": 1,
+    "epsilon_cutoff": 0,
+    "eta_cutoff": 0,
+    "typical_p": 1,
+    "min_p": 0,
+    "rep_pen": 1.18,
+    "rep_pen_range": 0,
+    "rep_pen_decay": 0,
+    "rep_pen_slope": 1,
+    "no_repeat_ngram_size": 0,
+    "penalty_alpha": 0,
+    "num_beams": 1,
+    "length_penalty": 1,
+    "min_length": 0,
+    "encoder_rep_pen": 1,
+    "freq_pen": 0,
+    "presence_pen": 0,
+    "skew": 0,
+    "do_sample": true,
+    "early_stopping": false,
+    "dynatemp": false,
+    "min_temp": 0,
+    "max_temp": 2,
+    "dynatemp_exponent": 1,
+    "smoothing_factor": 0,
+    "smoothing_curve": 1,
+    "dry_allowed_length": 2,
+    "dry_multiplier": 0,
+    "dry_base": 1.75,
+    "dry_sequence_breakers": "[\"\\n\", \":\", \"\\\"\", \"*\"]",
+    "dry_penalty_last_n": 0,
+    "add_bos_token": true,
+    "ban_eos_token": false,
+    "skip_special_tokens": true,
+    "mirostat_mode": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "guidance_scale": 1,
+    "negative_prompt": "",
+    "grammar_string": "",
+    "json_schema": {},
+    "banned_tokens": "",
+    "sampler_priority": [
+        "temperature",
+        "dynamic_temperature",
+        "quadratic_sampling",
+        "top_k",
+        "top_p",
+        "typical_p",
+        "epsilon_cutoff",
+        "eta_cutoff",
+        "tfs",
+        "top_a",
+        "min_p",
+        "mirostat"
+    ],
+    "samplers": [
+        "top_k",
+        "tfs_z",
+        "typical_p",
+        "top_p",
+        "min_p",
+        "temperature"
+    ],
+    "ignore_eos_token": false,
+    "spaces_between_special_tokens": true,
+    "speculative_ngram": false,
+    "sampler_order": [
+        6,
+        0,
+        1,
+        3,
+        4,
+        2,
+        5
+    ],
+    "logit_bias": [],
+    "rep_pen_size": 0
+}

From 974f142f24724c76a649196301e0af8178856980 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 13 Jul 2024 00:16:31 +0300
Subject: [PATCH 14/17] Replace {{name}} macros in instruct suffixes

---
 public/scripts/instruct-mode.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/scripts/instruct-mode.js b/public/scripts/instruct-mode.js
index 862237cf6..497774315 100644
--- a/public/scripts/instruct-mode.js
+++ b/public/scripts/instruct-mode.js
@@ -333,6 +333,9 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
     if (power_user.instruct.macro) {
         prefix = substituteParams(prefix, name1, name2);
         prefix = prefix.replace(/{{name}}/gi, name || 'System');
+
+        suffix = substituteParams(suffix, name1, name2);
+        suffix = suffix.replace(/{{name}}/gi, name || 'System');
     }
 
     if (!suffix && power_user.instruct.wrap) {
@@ -398,6 +401,8 @@ export function formatInstructModeExamples(mesExamplesArray, name1, name2) {
 
         inputPrefix = inputPrefix.replace(/{{name}}/gi, name1);
         outputPrefix = outputPrefix.replace(/{{name}}/gi, name2);
+        inputSuffix = inputSuffix.replace(/{{name}}/gi, name1);
+        outputSuffix = outputSuffix.replace(/{{name}}/gi, name2);
 
         if (!inputSuffix && power_user.instruct.wrap) {
             inputSuffix = '\n';

From 63c5330920408268dbf27df8bf5c5bcff8117a97 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 13 Jul 2024 11:52:43 +0300
Subject: [PATCH 15/17] Fix variable shadowing

---
 public/script.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/script.js b/public/script.js
index 1a89f67e4..333ec43c7 100644
--- a/public/script.js
+++ b/public/script.js
@@ -9243,14 +9243,14 @@ jQuery(async function () {
             immediately ? autoFitEditTextArea(e.target) : autoFitEditTextAreaDebounced(e.target);
         }
     });
-    const chatElement = document.getElementById('chat');
-    chatElement.addEventListener('wheel', function () {
+    const chatElementScroll = document.getElementById('chat');
+    chatElementScroll.addEventListener('wheel', function () {
         scrollLock = true;
     }, { passive: true });
-    chatElement.addEventListener('touchstart', function () {
+    chatElementScroll.addEventListener('touchstart', function () {
         scrollLock = true;
     }, { passive: true });
-    chatElement.addEventListener('scroll', function () {
+    chatElementScroll.addEventListener('scroll', function () {
         if (is_use_scroll_holder) {
             this.scrollTop = scroll_holder;
             is_use_scroll_holder = false;
@@ -9806,7 +9806,7 @@ jQuery(async function () {
     });
 
     //confirms message deletion with the "ok" button
-    $('#dialogue_del_mes_ok').click(async function () {
+    $('#dialogue_del_mes_ok').on('click', async function () {
         $('#dialogue_del_mes').css('display', 'none');
         $('#send_form').css('display', css_send_form_display);
         $('.del_checkbox').each(function () {
@@ -9822,7 +9822,7 @@ jQuery(async function () {
             chat.length = this_del_mes;
             await saveChatConditional();
             chatElement.scrollTop(chatElement[0].scrollHeight);
-            eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
+            await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
             $('#chat .mes').removeClass('last_mes');
             $('#chat .mes').last().addClass('last_mes');
         } else {

From 31dbb5144eb8c6843a118db07c29f813ea4aaa82 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:12:50 +0300
Subject: [PATCH 16/17] Don't sanitize lt and gt from SD prompts

---
 public/scripts/extensions/stable-diffusion/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index bc7c3f2d3..a29a6e77f 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -2187,7 +2187,7 @@ function processReply(str) {
     str = str.replaceAll('“', '');
     str = str.replaceAll('.', ',');
     str = str.replaceAll('\n', ', ');
-    str = str.replace(/[^a-zA-Z0-9,:_(){}[\]\-']+/g, ' ');
+    str = str.replace(/[^a-zA-Z0-9,:_(){}<>[\]\-']+/g, ' ');
     str = str.replace(/\s+/g, ' '); // Collapse multiple whitespaces into one
     str = str.trim();
 

From 9f170979767282de625d32659dfbb6bf0ea01a49 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:20:13 +0300
Subject: [PATCH 17/17] Normalize SD prompt strings

---
 public/scripts/extensions/stable-diffusion/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index a29a6e77f..85967f7bd 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -2178,6 +2178,11 @@ function getQuietPrompt(mode, trigger) {
     return stringFormat(extension_settings.sd.prompts[mode], trigger);
 }
 
+/**
+ * Sanitizes generated prompt for image generation.
+ * @param {string} str String to process
+ * @returns {string} Processed reply
+ */
 function processReply(str) {
     if (!str) {
         return '';
@@ -2187,6 +2192,7 @@ function processReply(str) {
     str = str.replaceAll('“', '');
     str = str.replaceAll('.', ',');
     str = str.replaceAll('\n', ', ');
+    str = str.normalize('NFD');
     str = str.replace(/[^a-zA-Z0-9,:_(){}<>[\]\-']+/g, ' ');
     str = str.replace(/\s+/g, ' '); // Collapse multiple whitespaces into one
     str = str.trim();