diff --git a/core/upgrade/app_languages.php b/core/upgrade/app_languages.php
index 1905486acf..b2d150c1ab 100644
--- a/core/upgrade/app_languages.php
+++ b/core/upgrade/app_languages.php
@@ -925,55 +925,30 @@ $text['description-upgrade_source']['zh-cn'] = "从存储库更新FusionPBX源
 $text['description-upgrade_source']['ja-jp'] = "FusionPBXソースファイルをリポジトリから更新します。";
 $text['description-upgrade_source']['ko-kr'] = "저장소에서 Fusionpbx 소스 파일을 업데이트합니다.";
 
-// $text['description-update_apps']['en-us'] = "Updates optional app source files from the respository.";
-// $text['description-update_apps']['en-gb'] = "Updates optional app source files from the respository.";
-// $text['description-update_apps']['ar-eg'] = "يقوم بتحديث ملفات مصدر التطبيق الاختيارية من المستودع.";
-// $text['description-update_apps']['de-at'] = "Aktualisiert den Quellcode aus dem Repository"; //copied from de-de
-// $text['description-update_apps']['de-ch'] = "Aktualisiert den Quellcode aus dem Repository"; //copied from de-de
-// $text['description-update_apps']['de-de'] = "Aktualisiert den Quellcode aus dem Repository";
-// $text['description-update_apps']['el-gr'] = "Ενημερώνει τα προαιρετικά αρχεία προέλευσης εφαρμογών από το αποθετήριο.";
-// $text['description-update_apps']['es-cl'] = "Archivos de origen Actualizaciones del repositorio.";
-// $text['description-update_apps']['es-mx'] = "Archivos de origen Actualizaciones del repositorio."; //copied from es-cl
-// $text['description-update_apps']['fr-ca'] = "Mise à jour du code source de depuis le dépôt."; //copied from fr-fr
-// $text['description-update_apps']['fr-fr'] = "Mise à jour du code source de depuis le dépôt.";
-// $text['description-update_apps']['he-il'] = "מעדכן קבצי מקור אפליקציה אופציונליים מהמאגר.";
-// $text['description-update_apps']['it-it'] = "Aggiorna il files sorgente di dal repository.";
-// $text['description-update_apps']['nl-nl'] = "Werkt optionele app-bronbestanden bij vanuit de repository.";
-// $text['description-update_apps']['pl-pl'] = "Uaktualnia pliki źródłowe z przechowalni.";
-// $text['description-update_apps']['pt-br'] = "Atualiza o a partir dos arquivos de código fonte do repositório.";
-// $text['description-update_apps']['pt-pt'] = "Arquivos de origem Atualizações do repositório.";
-// $text['description-update_apps']['ro-ro'] = "Actualizează fișierele sursă opționale ale aplicației din depozit.";
-// $text['description-update_apps']['ru-ru'] = "Обновляет исходные файлы из репозитория.";
-// $text['description-update_apps']['sv-se'] = "Uppdaterar källfiler från respository.";
-// $text['description-update_apps']['uk-ua'] = "Оновлення вихідних файлів  з репозиторію Subversion .";
-// $text['description-update_apps']['zh-cn'] = "从存储库更新可选应用程序源文件。";
-// $text['description-update_apps']['ja-jp'] = "オプションのアプリのソース ファイルをリポジトリから更新します。";
-// $text['description-update_apps']['ko-kr'] = "리포지토리에서 선택적 앱 소스 파일을 업데이트합니다.";
-
-$text['description-all_applications']['en-us'] = "Update all source files";
-$text['description-all_applications']['en-gb'] = "Update all source files";
-$text['description-all_applications']['ar-eg'] = "جميع التطبيقات";
-$text['description-all_applications']['de-at'] = "Alle Anwendungen";
-$text['description-all_applications']['de-ch'] = "Alle Anwendungen";
-$text['description-all_applications']['de-de'] = "Alle Anwendungen";
-$text['description-all_applications']['el-gr'] = "Όλες οι Εφαρμογές";
-$text['description-all_applications']['es-cl'] = "Todas las aplicaciones";
-$text['description-all_applications']['es-mx'] = "Todas las aplicaciones";
-$text['description-all_applications']['fr-ca'] = "Toutes les candidatures";
-$text['description-all_applications']['fr-fr'] = "Toutes les candidatures";
-$text['description-all_applications']['he-il'] = "כל היישומים";
-$text['description-all_applications']['it-it'] = "Tutte le applicazioni";
-$text['description-all_applications']['nl-nl'] = "Alle toepassingen";
-$text['description-all_applications']['pl-pl'] = "Wszystkie aplikacje";
-$text['description-all_applications']['pt-br'] = "Todos os aplicativos";
-$text['description-all_applications']['pt-pt'] = "Todos os aplicativos";
-$text['description-all_applications']['ro-ro'] = "Toate aplicațiile";
-$text['description-all_applications']['ru-ru'] = "Все приложения";
-$text['description-all_applications']['sv-se'] = "Alla applikationer";
-$text['description-all_applications']['uk-ua'] = "Усі додатки";
-$text['description-all_applications']['zh-cn'] = "所有应用程序";
-$text['description-all_applications']['ja-jp'] = "すべてのアプリケーション";
-$text['description-all_applications']['ko-kr'] = "모든 애플리케이션";
+$text['description-update_all_source_files']['en-us'] = "Update all source files.";
+$text['description-update_all_source_files']['en-gb'] = "Update all source files.";
+$text['description-update_all_source_files']['ar-eg'] = "جميع التطبيقات";
+$text['description-update_all_source_files']['de-at'] = "Alle Anwendungen";
+$text['description-update_all_source_files']['de-ch'] = "Alle Anwendungen";
+$text['description-update_all_source_files']['de-de'] = "Alle Anwendungen";
+$text['description-update_all_source_files']['el-gr'] = "Όλες οι Εφαρμογές";
+$text['description-update_all_source_files']['es-cl'] = "Todas las aplicaciones";
+$text['description-update_all_source_files']['es-mx'] = "Todas las aplicaciones";
+$text['description-update_all_source_files']['fr-ca'] = "Toutes les candidatures";
+$text['description-update_all_source_files']['fr-fr'] = "Toutes les candidatures";
+$text['description-update_all_source_files']['he-il'] = "כל היישומים";
+$text['description-update_all_source_files']['it-it'] = "Tutte le applicazioni";
+$text['description-update_all_source_files']['nl-nl'] = "Alle toepassingen";
+$text['description-update_all_source_files']['pl-pl'] = "Wszystkie aplikacje";
+$text['description-update_all_source_files']['pt-br'] = "Todos os aplicativos";
+$text['description-update_all_source_files']['pt-pt'] = "Todos os aplicativos";
+$text['description-update_all_source_files']['ro-ro'] = "Toate aplicațiile";
+$text['description-update_all_source_files']['ru-ru'] = "Все приложения";
+$text['description-update_all_source_files']['sv-se'] = "Alla applikationer";
+$text['description-update_all_source_files']['uk-ua'] = "Усі додатки";
+$text['description-update_all_source_files']['zh-cn'] = "所有应用程序";
+$text['description-update_all_source_files']['ja-jp'] = "すべてのアプリケーション";
+$text['description-update_all_source_files']['ko-kr'] = "모든 애플리케이션";
 
 $text['description-upgrade_schema']['en-us'] = "Checks to ensure table and field integrity in the database.";
 $text['description-upgrade_schema']['en-gb'] = "Checks to ensure table and field integrity in the database.";
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index e7549b7b18..a83dbb2349 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2023
+	Portions created by the Initial Developer are Copyright (C) 2008-2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -192,10 +192,10 @@
 		echo "	</td>\n";
 		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
 		echo "		<div style='float: left; clear: both;'>\n";
-		echo "			<input type='checkbox' id='view_optional' onclick=\"event.stopPropagation(); document.getElementById('do_source').checked = !document.getElementById('do_source').checked; (!document.getElementById('do_source').checked ? $('.do_optional_app').prop('checked', false) : null); if (!$(this).prop('checked')) { $('.do_optional_app').prop('checked', false); } else { $('#tr_applications').slideDown('fast'); $('.do_optional_app').prop('checked', true); }\">\n";
+		echo "			<input type='checkbox' id='view_source_code_options' onclick=\"event.stopPropagation(); if (!$(this).prop('checked')) { $('#do_source').prop('checked', false); $('.do_optional_app').prop('checked', false); } else { $('#tr_applications').slideDown('fast'); $('#do_source').prop('checked', true); $('.do_optional_app').prop('checked', true); }\">\n";
 		echo "		</div>\n";
 		echo "		<div style='overflow: hidden;'>\n";
-		echo "			<span onclick=\"event.stopPropagation(); $('#tr_applications').slideToggle('fast');\">&nbsp;&nbsp;".$text['description-all_applications']." (".$repos_count.")</span>\n";
+		echo "			<span onclick=\"event.stopPropagation(); $('#tr_applications').slideToggle('fast');\">&nbsp;&nbsp;".$text['description-update_all_source_files']." (".$repos_count.")</span>\n";
 		echo "		</div>\n";
 		echo "	</td>\n";
 		echo "</tr>\n";
@@ -204,16 +204,13 @@
 		echo "<div id='tr_applications' style='display: none;'>\n";
 
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr onclick=\"if (document.getElementById('do_source')) { document.getElementById('do_source').checked = !document.getElementById('do_source').checked; }\">\n";
+		echo "<tr onclick=\"if (document.getElementById('do_source')) { document.getElementById('do_source').checked = !document.getElementById('do_source').checked; if (document.getElementById('do_source').checked == false) { document.getElementById('view_source_code_options').checked = false; } }\">\n";
 		echo "	<td width='30%' class='vncell' style='vertical-align: middle;'>\n";
-		echo "		".$text['message-upgrade_manually']."\n";
+		echo "		".(isset($_SESSION['theme']['title']['text'])  ?$_SESSION['theme']['title']['text'] : 'FusionPBX')."\n";
 		echo "	</td>\n";
-		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: ".($pull_method == 'http' ? "pointer;'" : "help;' title=\"".$text['message-upgrade_manually'].": ".$repo_info['url']."\"").">\n";
-		echo "		<div style='float: left; clear: both;'>\n";
-		echo "			<input type='checkbox' name='action[upgrade_source]' id='do_source' value='1' onclick=\"event.stopPropagation();\">\n";
-		echo "		</div>\n";
-		echo "		<div style='overflow: hidden;'>\n";
-		echo "			 &nbsp;&nbsp;".$text['description-upgrade_source']."<br />\n";
+		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
+		echo "		<input type='checkbox' name='action[upgrade_source]' id='do_source' value='1' onclick=\"event.stopPropagation(); if (this.checked == false) { document.getElementById('view_source_code_options').checked = false; }\">\n";
+		echo "		&nbsp;".$text['description-upgrade_source']."<br />\n";
 		//show current git version info
 		chdir($_SERVER["PROJECT_ROOT"]);
 		exec("git rev-parse --abbrev-ref HEAD 2>&1", $git_current_branch, $branch_return_value);
@@ -222,12 +219,11 @@
 		$git_current_commit = $git_current_commit[0];
 
 		if (!is_numeric($git_current_branch)) {
-			echo "<span style='font-weight: 600;'>".software::version()."</span>\n";
+			echo "	<span style='font-weight: 600;'>".software::version()."</span>\n";
 		}
 		if ($branch_return_value == 0 && $commit_return_value == 0) {
-			echo "<a href='https://github.com/fusionpbx/fusionpbx/compare/".$git_current_commit."...".$git_current_branch."' target='_blank' title='".$git_current_commit."' onclick=\"event.stopPropagation();\"><i>".$git_current_branch."</i></a>";
+			echo "	<a href='https://github.com/fusionpbx/fusionpbx/compare/".$git_current_commit."...".$git_current_branch."' target='_blank' title='".$git_current_commit."' onclick=\"event.stopPropagation();\"><i>".$git_current_branch."</i></a>";
 		}
-		echo "		</div>\n";
 		echo "	</td>\n";
 		echo "</tr>\n";
 		echo "</table>\n";
@@ -237,16 +233,16 @@
 			$pull_method = substr($repo_info['url'], 0, 4) == 'http' ? 'http' : 'ssh';
 			if (!$repo_info) { continue; }
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-			echo "<tr onclick=\"if (document.getElementById('do_".$app['app']."')) { document.getElementById('do_".$app['app']."').checked = !document.getElementById('do_".$app['app']."').checked; }\">\n";
+			echo "<tr onclick=\"if (document.getElementById('do_".$app['app']."')) { document.getElementById('do_".$app['app']."').checked = !document.getElementById('do_".$app['app']."').checked; if (document.getElementById('do_".$app['app']."').checked == false) { document.getElementById('view_source_code_options').checked = false; } }\">\n";
 			echo "	<td width='30%' class='vncell' style='vertical-align: middle;'>\n";
 			echo "		".$app['name']."\n";
 			echo "	</td>\n";
 			echo "	<td width='70%' class='vtable' style='height: 50px; cursor: ".($pull_method == 'http' ? "pointer;'" : "help;' title=\"".$text['message-upgrade_manually'].": ".$repo_info['url']."\"").">\n";
 			if ($pull_method == 'http') {
-				echo "	<input type='checkbox' name='action[optional_apps][]' class='do_optional_app' id='do_".$app['app']."' value='".$app['app']."' onclick=\"event.stopPropagation();\"> &nbsp;".$app['description']."<br />\n";
+				echo "	<input type='checkbox' name='action[optional_apps][]' class='do_optional_app' id='do_".$app['app']."' value='".$app['app']."' onclick=\"event.stopPropagation(); if (this.checked == false) { document.getElementById('view_source_code_options').checked = false; }\"> &nbsp;".$app['description']."<br />\n";
 			}
 			else {
-				echo "	<i class='fas fa-ban mr-3' style='opacity: 0.4;'></i> &nbsp;".$app['description']."<br>\n";
+				echo "	<i class='fas fa-ban mr-3' style='opacity: 0.3; margin: 0 1px;'></i> ".$app['description']."<br>\n";
 			}
 			echo "		<span style='font-weight: 600;'>".$app['version']."</span>&nbsp;&nbsp;<i><a href='".str_replace(['git@','.com:'],['https://','.com/'], $repo_info['url'])."/compare/".$repo_info['commit']."...".$repo_info['branch']." 'target='_blank' title='".$repo_info['commit']."'>".$repo_info['branch']."</i></a>\n";
 			echo "	</td>\n";