diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index 08b7899f7..16303834c 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -34,93 +34,160 @@
 			id: 'general',
 			title: 'General',
 			keywords: [
-				'general',
-				'theme',
-				'language',
-				'notifications',
-				'system',
-				'systemprompt',
-				'prompt',
-				'advanced',
-				'settings',
-				'defaultsettings',
+				'advancedparams',
+				'advancedparameters',
+				'advanced params',
+				'advanced parameters',
 				'configuration',
-				'systemsettings',
-				'notificationsettings',
-				'systempromptconfig',
-				'languageoptions',
 				'defaultparameters',
-				'systemparameters'
+				'default parameters',
+				'defaultsettings',
+				'default settings',
+				'general',
+				'keepalive',
+				'keep alive',
+				'languages',
+				'notifications',
+				'requestmode',
+				'request mode',
+				'systemparameters',
+				'system parameters',
+				'systemprompt',
+				'system prompt',
+				'systemsettings',
+				'system settings',
+				'theme',
+				'translate',
+				'webuisettings',
+				'webui settings'
 			]
 		},
 		{
 			id: 'interface',
 			title: 'Interface',
 			keywords: [
-				'defaultmodel',
-				'selectmodel',
-				'ui',
-				'userinterface',
-				'display',
-				'layout',
-				'design',
-				'landingpage',
-				'landingpagemode',
-				'default',
-				'chat',
-				'chatbubble',
-				'chatui',
-				'username',
-				'showusername',
-				'displayusername',
-				'widescreen',
-				'widescreenmode',
-				'fullscreen',
-				'expandmode',
+				'allow user location',
+				'allow voice interruption in call',
+				'allowuserlocation',
+				'allowvoiceinterruptionincall',
+				'always collapse codeblocks',
+				'always collapse code blocks',
+				'always expand details',
+				'always on web search',
+				'always play notification sound',
+				'alwayscollapsecodeblocks',
+				'alwaysexpanddetails',
+				'alwaysonwebsearch',
+				'alwaysplaynotificationsound',
+				'android',
+				'auto chat tags',
+				'auto copy response to clipboard',
+				'auto title',
+				'autochattags',
+				'autocopyresponsetoclipboard',
+				'autotitle',
+				'beta',
+				'call',
+				'chat background image',
+				'chat bubble ui',
+				'chat direction',
+				'chat tags autogen',
+				'chat tags autogeneration',
+				'chat ui',
+				'chatbackgroundimage',
+				'chatbubbleui',
 				'chatdirection',
+				'chat tags autogeneration',
+				'chattagsautogeneration',
+				'chatui',
+				'copy formatted text',
+				'copyformattedtext',
+				'default model',
+				'defaultmodel',
+				'design',
+				'detect artifacts automatically',
+				'detectartifactsautomatically',
+				'display emoji in call',
+				'display username',
+				'displayemojiincall',
+				'displayusername',
+				'enter key behavior',
+				'enterkeybehavior',
+				'expand mode',
+				'expandmode',
+				'file',
+				'followup autogeneration',
+				'followupautogeneration',
+				'fullscreen',
+				'fullwidthmode',
+				'full width mode',
+				'haptic feedback',
+				'hapticfeedback',
+				'high contrast mode',
+				'highcontrastmode',
+				'iframe sandbox allow forms',
+				'iframe sandbox allow same origin',
+				'iframesandboxallowforms',
+				'iframesandboxallowsameorigin',
+				'imagecompression',
+				'image compression',
+				'imagemaxcompressionsize',
+				'image max compression size',
+				'interface customization',
+				'interface options',
+				'interfacecustomization',
+				'interfaceoptions',
+				'landing page mode',
+				'landingpagemode',
+				'layout',
+				'left to right',
+				'left-to-right',
 				'lefttoright',
 				'ltr',
+				'paste large text as file',
+				'pastelargetextasfile',
+				'reset background',
+				'resetbackground',
+				'response auto copy',
+				'responseautocopy',
+				'rich text input for chat',
+				'richtextinputforchat',
+				'right to left',
+				'right-to-left',
 				'righttoleft',
 				'rtl',
-				'notifications',
-				'toast',
-				'toastnotifications',
-				'largechunks',
-				'streamlargechunks',
-				'scroll',
-				'scrollonbranchchange',
+				'scroll behavior',
+				'scroll on branch change',
 				'scrollbehavior',
-				'richtext',
-				'richtextinput',
-				'background',
-				'chatbackground',
-				'chatbackgroundimage',
-				'backgroundimage',
-				'uploadbackground',
-				'resetbackground',
-				'titleautogen',
+				'scrollonbranchchange',
+				'select model',
+				'selectmodel',
+				'settings',
+				'show username',
+				'showusername',
+				'stream large chunks',
+				'streamlargechunks',
+				'stylized pdf export',
+				'stylizedpdfexport',
+				'title autogeneration',
 				'titleautogeneration',
-				'autotitle',
-				'chattags',
-				'autochattags',
-				'responseautocopy',
-				'clipboard',
-				'location',
-				'userlocation',
+				'toast notifications for new updates',
+				'toastnotificationsfornewupdates',
+				'upload background',
+				'uploadbackground',
+				'user interface',
+				'user location access',
+				'userinterface',
 				'userlocationaccess',
-				'haptic',
-				'hapticfeedback',
 				'vibration',
-				'voice',
+				'voice control',
 				'voicecontrol',
-				'voiceinterruption',
-				'call',
-				'emojis',
-				'displayemoji',
-				'save',
-				'interfaceoptions',
-				'interfacecustomization',
-				'alwaysonwebsearch'
+				'widescreen mode',
+				'widescreenmode',
+				'whatsnew',
+				'whats new',
+				'websearchinchat',
+				'web search in chat'
 			]
 		},
 		...($user?.role === 'admin' ||
@@ -129,7 +196,15 @@
 					{
 						id: 'connections',
 						title: 'Connections',
-						keywords: []
+						keywords: [
+							'addconnection',
+							'add connection',
+							'manageconnections',
+							'manage connections',
+							'manage direct connections',
+							'managedirectconnections',
+							'settings'
+						]
 					}
 				]
 			: []),
@@ -140,7 +215,15 @@
 					{
 						id: 'tools',
 						title: 'Tools',
-						keywords: []
+						keywords: [
+							'addconnection',
+							'add connection',
+							'managetools',
+							'manage tools',
+							'manage tool servers',
+							'managetoolservers',
+							'settings'
+						]
 					}
 				]
 			: []),
@@ -149,159 +232,233 @@
 			id: 'personalization',
 			title: 'Personalization',
 			keywords: [
-				'personalization',
-				'memory',
-				'personalize',
-				'preferences',
-				'profile',
-				'personalsettings',
+				'account preferences',
+				'account settings',
+				'accountpreferences',
+				'accountsettings',
+				'custom settings',
 				'customsettings',
-				'userpreferences',
-				'accountpreferences'
+				'experimental',
+				'memories',
+				'memory',
+				'personalization',
+				'personalize',
+				'personal settings',
+				'personalsettings',
+				'profile',
+				'user preferences',
+				'userpreferences'
 			]
 		},
 		{
 			id: 'audio',
 			title: 'Audio',
 			keywords: [
-				'audio',
-				'sound',
-				'soundsettings',
-				'audiocontrol',
-				'volume',
-				'speech',
-				'speechrecognition',
-				'stt',
-				'speechtotext',
-				'tts',
-				'texttospeech',
-				'playback',
-				'playbackspeed',
-				'voiceplayback',
-				'speechplayback',
-				'audiooutput',
-				'speechengine',
-				'voicecontrol',
-				'audioplayback',
-				'transcription',
-				'autotranscribe',
-				'autosend',
-				'speechsettings',
-				'audiovoice',
-				'voiceoptions',
-				'setvoice',
-				'nonlocalvoices',
-				'savesettings',
+				'audio config',
+				'audio control',
+				'audio features',
+				'audio input',
+				'audio output',
+				'audio playback',
+				'audio voice',
 				'audioconfig',
-				'speechconfig',
-				'voicerecognition',
-				'speechsynthesis',
-				'speechmode',
-				'voicespeed',
-				'speechrate',
-				'speechspeed',
-				'audioinput',
+				'audiocontrol',
 				'audiofeatures',
-				'voicemodes'
+				'audioinput',
+				'audiooutput',
+				'audioplayback',
+				'audiovoice',
+				'auto playback response',
+				'autoplaybackresponse',
+				'auto transcribe',
+				'autotranscribe',
+				'instant auto send after voice transcription',
+				'instantautosendaftervoicetranscription',
+				'language',
+				'non local voices',
+				'nonlocalvoices',
+				'save settings',
+				'savesettings',
+				'set voice',
+				'setvoice',
+				'sound settings',
+				'soundsettings',
+				'speech config',
+				'speech mode',
+				'speech playback speed',
+				'speech rate',
+				'speech recognition',
+				'speech settings',
+				'speech speed',
+				'speech synthesis',
+				'speech to text engine',
+				'speechconfig',
+				'speechmode',
+				'speechplaybackspeed',
+				'speechrate',
+				'speechrecognition',
+				'speechsettings',
+				'speechspeed',
+				'speechsynthesis',
+				'speechtotextengine',
+				'speedch playback rate',
+				'speedchplaybackrate',
+				'stt settings',
+				'sttsettings',
+				'text to speech engine',
+				'text to speech',
+				'textospeechengine',
+				'texttospeech',
+				'texttospeechvoice',
+				'text to speech voice',
+				'voice control',
+				'voice modes',
+				'voice options',
+				'voice playback',
+				'voice recognition',
+				'voice speed',
+				'voicecontrol',
+				'voicemodes',
+				'voiceoptions',
+				'voiceplayback',
+				'voicerecognition',
+				'voicespeed',
+				'volume'
 			]
 		},
 		{
 			id: 'chats',
 			title: 'Chats',
 			keywords: [
-				'chat',
-				'messages',
-				'conversations',
-				'chatsettings',
-				'history',
+				'archive all chats',
+				'archive chats',
+				'archiveallchats',
+				'archivechats',
+				'archived chats',
+				'archivedchats',
+				'chat activity',
+				'chat history',
+				'chat settings',
+				'chatactivity',
 				'chathistory',
-				'messagehistory',
-				'messagearchive',
-				'convo',
-				'chats',
+				'chatsettings',
+				'conversation activity',
+				'conversation history',
+				'conversationactivity',
 				'conversationhistory',
-				'exportmessages',
-				'chatactivity'
+				'conversations',
+				'convos',
+				'delete all chats',
+				'delete chats',
+				'deleteallchats',
+				'deletechats',
+				'export chats',
+				'exportchats',
+				'import chats',
+				'importchats',
+				'message activity',
+				'message archive',
+				'message history',
+				'messagearchive',
+				'messagehistory'
 			]
 		},
 		{
 			id: 'account',
 			title: 'Account',
 			keywords: [
-				'account',
-				'profile',
-				'security',
-				'privacy',
-				'settings',
+				'account preferences',
+				'account settings',
+				'accountpreferences',
+				'accountsettings',
+				'api keys',
+				'apikeys',
+				'change password',
+				'changepassword',
+				'jwt token',
+				'jwttoken',
 				'login',
+				'new password',
+				'newpassword',
+				'notification webhook url',
+				'notificationwebhookurl',
+				'personal settings',
+				'personalsettings',
+				'privacy settings',
+				'privacysettings',
+				'profileavatar',
+				'profile avatar',
+				'profile details',
+				'profile image',
+				'profile picture',
+				'profiledetails',
+				'profileimage',
+				'profilepicture',
+				'security settings',
+				'securitysettings',
+				'update account',
+				'update password',
+				'updateaccount',
+				'updatepassword',
+				'user account',
+				'user data',
+				'user preferences',
+				'user profile',
 				'useraccount',
 				'userdata',
-				'api',
-				'apikey',
+				'username',
+				'userpreferences',
 				'userprofile',
-				'profiledetails',
-				'accountsettings',
-				'accountpreferences',
-				'securitysettings',
-				'privacysettings'
-			]
-		},
-		{
-			id: 'admin',
-			title: 'Admin',
-			keywords: [
-				'admin',
-				'administrator',
-				'adminsettings',
-				'adminpanel',
-				'systemadmin',
-				'administratoraccess',
-				'systemcontrol',
-				'manage',
-				'management',
-				'admincontrols',
-				'adminfeatures',
-				'usercontrol',
-				'arenamodel',
-				'evaluations',
-				'websearch',
-				'database',
-				'pipelines',
-				'images',
-				'audio',
-				'documents',
-				'rag',
-				'models',
-				'ollama',
-				'openai',
-				'users'
+				'webhook url',
+				'webhookurl'
 			]
 		},
 		{
 			id: 'about',
 			title: 'About',
 			keywords: [
-				'about',
-				'info',
-				'information',
-				'version',
-				'documentation',
-				'help',
-				'support',
-				'details',
-				'aboutus',
-				'softwareinfo',
-				'timothyjaeryangbaek',
-				'openwebui',
-				'release',
-				'updates',
-				'updateinfo',
-				'versioninfo',
+				'about app',
+				'about me',
+				'about open webui',
+				'about page',
+				'about us',
 				'aboutapp',
-				'terms',
-				'termsandconditions',
+				'aboutme',
+				'aboutopenwebui',
+				'aboutpage',
+				'aboutus',
+				'check for updates',
+				'checkforupdates',
 				'contact',
-				'aboutpage'
+				'copyright',
+				'details',
+				'discord',
+				'documentation',
+				'github',
+				'help',
+				'information',
+				'license',
+				'redistributions',
+				'release',
+				'see whats new',
+				'seewhatsnew',
+				'settings',
+				'software info',
+				'softwareinfo',
+				'support',
+				'terms and conditions',
+				'terms of use',
+				'termsandconditions',
+				'termsofuse',
+				'timothy jae ryang baek',
+				'timothy j baek',
+				'timothyjaeryangbaek',
+				'timothyjbaek',
+				'twitter',
+				'update info',
+				'updateinfo',
+				'version info',
+				'versioninfo'
 			]
 		}
 	];
@@ -405,7 +562,7 @@
 		<div class="flex flex-col md:flex-row w-full px-4 pt-1 pb-4 md:space-x-4">
 			<div
 				id="settings-tabs-container"
-				class="tabs flex flex-row overflow-x-auto gap-2.5 md:gap-1 md:flex-col flex-1 md:flex-none md:w-40 dark:text-gray-200 text-sm font-medium text-left mb-1 md:mb-0 -translate-y-1"
+				class="tabs flex flex-row overflow-x-auto gap-2.5 md:gap-1 md:flex-col flex-1 md:flex-none md:w-40 md:min-h-[32rem] md:max-h-[32rem] dark:text-gray-200 text-sm font-medium text-left mb-1 md:mb-0 -translate-y-1"
 			>
 				<div class="hidden md:flex w-full rounded-xl -mb-1 px-0.5 gap-2" id="settings-search">
 					<div class="self-center rounded-l-xl bg-transparent">
@@ -647,35 +804,6 @@
 								</div>
 								<div class=" self-center">{$i18n.t('About')}</div>
 							</button>
-						{:else if tabId === 'admin'}
-							{#if $user?.role === 'admin'}
-								<button
-									class="px-0.5 py-1 min-w-fit rounded-lg flex-1 md:flex-none flex text-left transition {selectedTab ===
-									'admin'
-										? ''
-										: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
-									on:click={async () => {
-										await goto('/admin/settings');
-										show = false;
-									}}
-								>
-									<div class=" self-center mr-2">
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											viewBox="0 0 24 24"
-											fill="currentColor"
-											class="size-4"
-										>
-											<path
-												fill-rule="evenodd"
-												d="M4.5 3.75a3 3 0 0 0-3 3v10.5a3 3 0 0 0 3 3h15a3 3 0 0 0 3-3V6.75a3 3 0 0 0-3-3h-15Zm4.125 3a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5Zm-3.873 8.703a4.126 4.126 0 0 1 7.746 0 .75.75 0 0 1-.351.92 7.47 7.47 0 0 1-3.522.877 7.47 7.47 0 0 1-3.522-.877.75.75 0 0 1-.351-.92ZM15 8.25a.75.75 0 0 0 0 1.5h3.75a.75.75 0 0 0 0-1.5H15ZM14.25 12a.75.75 0 0 1 .75-.75h3.75a.75.75 0 0 1 0 1.5H15a.75.75 0 0 1-.75-.75Zm.75 2.25a.75.75 0 0 0 0 1.5h3.75a.75.75 0 0 0 0-1.5H15Z"
-												clip-rule="evenodd"
-											/>
-										</svg>
-									</div>
-									<div class=" self-center">{$i18n.t('Admin Settings')}</div>
-								</button>
-							{/if}
 						{/if}
 					{/each}
 				{:else}
@@ -683,6 +811,32 @@
 						{$i18n.t('No results found')}
 					</div>
 				{/if}
+
+				{#if $user?.role === 'admin'}
+					<button
+						class="px-0.5 py-1 min-w-fit rounded-lg flex-1 md:flex-none flex text-left transition text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white mt-auto"
+						on:click={async () => {
+							await goto('/admin/settings');
+							show = false;
+						}}
+					>
+						<div class=" self-center mr-2">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								viewBox="0 0 24 24"
+								fill="currentColor"
+								class="size-4"
+							>
+								<path
+									fill-rule="evenodd"
+									d="M4.5 3.75a3 3 0 0 0-3 3v10.5a3 3 0 0 0 3 3h15a3 3 0 0 0 3-3V6.75a3 3 0 0 0-3-3h-15Zm4.125 3a2.25 2.25 0 1 0 0 4.5 2.25 2.25 0 0 0 0-4.5Zm-3.873 8.703a4.126 4.126 0 0 1 7.746 0 .75.75 0 0 1-.351.92 7.47 7.47 0 0 1-3.522.877 7.47 7.47 0 0 1-3.522-.877.75.75 0 0 1-.351-.92ZM15 8.25a.75.75 0 0 0 0 1.5h3.75a.75.75 0 0 0 0-1.5H15ZM14.25 12a.75.75 0 0 1 .75-.75h3.75a.75.75 0 0 1 0 1.5H15a.75.75 0 0 1-.75-.75Zm.75 2.25a.75.75 0 0 0 0 1.5h3.75a.75.75 0 0 0 0-1.5H15Z"
+									clip-rule="evenodd"
+								/>
+							</svg>
+						</div>
+						<div class=" self-center">{$i18n.t('Admin Settings')}</div>
+					</button>
+				{/if}
 			</div>
 			<div class="flex-1 md:min-h-[32rem] max-h-[32rem]">
 				{#if selectedTab === 'general'}
@@ -763,6 +917,7 @@
 	}
 
 	input[type='number'] {
+		appearance: textfield;
 		-moz-appearance: textfield; /* Firefox */
 	}
 </style>