diff --git a/public/index.html b/public/index.html
index ca23fccaf..80f89c133 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2802,23 +2802,24 @@
                             <div>
                                 <h4 data-i18n="Google Model">Google Model</h4>
                                 <select id="model_google_select">
-                                    <optgroup label="Latest">
-                                        <!-- Doesn't work without "latest". Maybe my key is scuffed? -->
-                                        <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash</option>
-                                        <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
-                                        <!-- Points to 1.0, no default 1.5 endpoint -->
-                                        <option value="gemini-pro">Gemini Pro</option>
-                                        <option value="gemini-pro-vision">Gemini Pro Vision</option>
-                                        <option value="gemini-ultra">Gemini Ultra</option>
-                                        <option value="text-bison-001">Bison Text</option>
-                                        <option value="chat-bison-001">Bison Chat</option>
+                                    <optgroup label="Primary">
+                                        <option value="gemini-1.5-pro">Gemini 1.5 Pro</option>
+                                        <option value="gemini-1.5-flash">Gemini 1.5 Flash</option>
+                                        <option value="gemini-1.0-pro">Gemini 1.0 Pro</option>
+                                        <option value="gemini-pro">Gemini Pro (1.0)</option>
+                                        <option value="gemini-pro-vision">Gemini Pro Vision (1.0)</option>
+                                        <option value="text-bison-001">PaLM 2 (Legacy)</option>
+                                        <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
                                     </optgroup>
-                                    <optgroup label="Sub-versions">
+                                    <optgroup label="Subversions">
                                         <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
-                                        <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
-                                        <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro</option>
-                                        <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision</option>
-                                        <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
+                                        <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
+                                        <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>
+                                        <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>
+                                        <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>
+                                        <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest]</option>
+                                        <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001]</option>
+                                        <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision [latest]</option>
                                     </optgroup>
                                 </select>
                             </div>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index fc70d2967..163a39802 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -127,6 +127,7 @@ const max_128k = 128 * 1000;
 const max_200k = 200 * 1000;
 const max_256k = 256 * 1000;
 const max_1mil = 1000 * 1000;
+const max_2mil = 2000 * 1000;
 const scale_max = 8191;
 const claude_max = 9000; // We have a proper tokenizer, so theoretically could be larger (up to 9k)
 const claude_100k_max = 99000;
@@ -260,7 +261,7 @@ const default_settings = {
     personality_format: default_personality_format,
     openai_model: 'gpt-4-turbo',
     claude_model: 'claude-3-5-sonnet-20240620',
-    google_model: 'gemini-pro',
+    google_model: 'gemini-1.5-pro',
     ai21_model: 'j2-ultra',
     mistralai_model: 'mistral-large-latest',
     cohere_model: 'command-r-plus',
@@ -4056,17 +4057,21 @@ async function onModelChange() {
 
     if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
         if (oai_settings.max_context_unlocked) {
+            $('#openai_max_context').attr('max', max_2mil);
+        } else if (value.includes('gemini-1.5-pro')) {
+            $('#openai_max_context').attr('max', max_2mil);
+        } else if (value.includes('gemini-1.5-flash')) {
             $('#openai_max_context').attr('max', max_1mil);
-        } else if (value === 'gemini-1.5-pro-latest' || value.includes('gemini-1.5-flash')) {
-            $('#openai_max_context').attr('max', max_1mil);
-        } else if (value === 'gemini-ultra' || value === 'gemini-1.0-pro-latest' || value === 'gemini-pro' || value === 'gemini-1.0-ultra-latest') {
-            $('#openai_max_context').attr('max', max_32k);
-        } else if (value === 'gemini-1.0-pro-vision-latest' || value === 'gemini-pro-vision') {
+        } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {
             $('#openai_max_context').attr('max', max_16k);
-        } else {
+        } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') {
+            $('#openai_max_context').attr('max', max_32k);
+        } else if (value === 'text-bison-001') {
             $('#openai_max_context').attr('max', max_8k);
+        } else {
+            $('#openai_max_context').attr('max', max_4k);
         }
-        let makersuite_max_temp = (value.includes('vision') || value.includes('ultra')) ? 1.0 : 2.0;
+        let makersuite_max_temp = value.includes('vision') ? 1.0 : 2.0;
         oai_settings.temp_openai = Math.min(makersuite_max_temp, oai_settings.temp_openai);
         $('#temp_openai').attr('max', makersuite_max_temp).val(oai_settings.temp_openai).trigger('input');
         oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);