diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php
index 43ad0a448a..e400eaa42b 100644
--- a/app/access_controls/app_defaults.php
+++ b/app/access_controls/app_defaults.php
@@ -74,7 +74,7 @@
 						$array['access_controls'][0]['access_control_name'] = $access_control_name;
 						$array['access_controls'][0]['access_control_default'] = $access_control_default;
 
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('access_control_add', 'temp');
 
 						$database->app_name = 'access_controls';
@@ -106,7 +106,7 @@
 								$array['access_control_nodes'][0]['node_cidr'] = $node_cidr;
 								$array['access_control_nodes'][0]['node_description'] = $node_description;
 
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('access_control_node_add', 'temp');
 
 								$database->app_name = 'access_controls';
diff --git a/app/access_controls/resources/classes/access_controls.php b/app/access_controls/resources/classes/access_controls.php
index ca3b3fda18..4d8efd2add 100644
--- a/app/access_controls/resources/classes/access_controls.php
+++ b/app/access_controls/resources/classes/access_controls.php
@@ -69,7 +69,7 @@ if (!class_exists('access_controls')) {
 					if (is_array($array) && @sizeof($array) != 0) {
 
 						//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('access_control_node_delete', 'temp');
 
 						//execute delete
@@ -236,7 +236,7 @@ if (!class_exists('access_controls')) {
 					if (is_array($array) && @sizeof($array) != 0) {
 
 						//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('access_control_node_add', 'temp');
 
 						//save the array
diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index 9502b0cfe1..93ea0eb073 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -65,7 +65,7 @@
 		//update the status
 			if (permission_exists("user_setting_edit")) {
 				//add the user_edit permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("user_edit", "temp");
 
 				//update the database user_status
@@ -153,7 +153,7 @@
 					}
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('extension_edit', 'temp');
 
 				//execute update
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 2d03266db5..669a1f6c57 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -166,7 +166,7 @@
 								$array['dialplans'][$index]['dialplan_enabled'] = 'true';
 							}
 
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('dialplan_edit', 'temp');
 
 							$database->save($array);
diff --git a/app/call_block/resources/classes/call_block.php b/app/call_block/resources/classes/call_block.php
index b3f5b9fec8..1d1fc8ef2b 100644
--- a/app/call_block/resources/classes/call_block.php
+++ b/app/call_block/resources/classes/call_block.php
@@ -435,7 +435,7 @@ if (!class_exists('call_block')) {
 									unset($rows, $parameters);
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_edit', 'temp');
 
 								//save the array
diff --git a/app/call_block/resources/dashboard/config.php b/app/call_block/resources/dashboard/config.php
index d220ccc517..96bd82114e 100644
--- a/app/call_block/resources/dashboard/config.php
+++ b/app/call_block/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'e75f04ff-6d1b-4b39-af0f-e1d1860327c
 $array['dashboard'][$x]['dashboard_name'] = 'Call Block';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-ban';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#EA4C46';
 $array['dashboard'][$x]['dashboard_url'] = '/app/call_block/call_block.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -17,9 +18,9 @@ $array['dashboard'][$x]['dashboard_heading_text_color'] = '';
 $array['dashboard'][$x]['dashboard_heading_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_heading_background_color'] = '';
 $array['dashboard'][$x]['dashboard_heading_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#EA4C46';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
@@ -44,3 +45,4 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user';
 $y++;
 
 ?>
+
diff --git a/app/call_centers/app_defaults.php b/app/call_centers/app_defaults.php
index 7cd7080c2b..6265e9e756 100644
--- a/app/call_centers/app_defaults.php
+++ b/app/call_centers/app_defaults.php
@@ -58,7 +58,7 @@ if ($domains_processed == 1) {
 			}
 
 			if (!empty($array)) {
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('call_center_tier_edit', 'temp');
 
 				$database->app_name = 'call_centers';
@@ -168,7 +168,7 @@ if ($domains_processed == 1) {
 		//save the array to the database
 		if (!empty($array)) {
 			//add the dialplan permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("dialplan_add", "temp");
 				$p->add("dialplan_edit", "temp");
 
diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php
index a8785bf991..4491f93de5 100644
--- a/app/call_centers/call_center_agent_status.php
+++ b/app/call_centers/call_center_agent_status.php
@@ -172,7 +172,7 @@
 								$array['users'][0]['user_status'] = $row['agent_status'];
 								$array['users'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('user_edit', 'temp');
 
 								$database = new database;
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 42489006f9..3db04a2404 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -178,7 +178,7 @@
 				$array['call_center_tiers'][0]['call_center_tier_uuid'] = $call_center_tier_uuid;
 				$array['call_center_tiers'][0]['domain_uuid'] = $domain_uuid;
 
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('call_center_tier_delete', 'temp');
 
 				$database = new database;
@@ -434,7 +434,7 @@
 			$array['dialplans'][0]["app_uuid"] = "95788e50-9500-079e-2807-fd530b0ea370";
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/call_centers/resources/classes/call_center.php b/app/call_centers/resources/classes/call_center.php
index 3985c9ce59..f84b6e1014 100644
--- a/app/call_centers/resources/classes/call_center.php
+++ b/app/call_centers/resources/classes/call_center.php
@@ -78,7 +78,7 @@
 							$array['dialplan_details'][0]['domain_uuid'] = $this->domain_uuid;
 
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('dialplan_delete', 'temp');
 							$p->add('dialplan_detail_delete', 'temp');
 
@@ -216,7 +216,7 @@
 					$array["dialplans"][0] = $dialplan;
 
 				//add temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("dialplan_add", 'temp');
 					$p->add("dialplan_detail_add", 'temp');
 					$p->add("dialplan_edit", 'temp');
@@ -242,7 +242,7 @@
 					$array['call_center_queues'][0]['dialplan_uuid'] = $this->dialplan_uuid;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('call_center_queue_edit', 'temp');
 
 				//execute update
@@ -349,7 +349,7 @@
 										}
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('call_center_tier_delete', 'temp');
 										$p->add('dialplan_delete', 'temp');
 										$p->add('dialplan_detail_delete', 'temp');
@@ -446,7 +446,7 @@
 										}
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('call_center_tier_delete', 'temp');
 
 									//execute delete
@@ -578,7 +578,7 @@
 								if (is_array($array) && @sizeof($array) != 0) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('call_center_tier_add', 'temp');
 										$p->add('dialplan_add', 'temp');
 
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 061da31a33..daebd6e94f 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -237,7 +237,7 @@
 			$array["call_flows"][$i]["call_flow_description"] = $call_flow_description;
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php
index 1113548e7b..c9a54f66e2 100644
--- a/app/call_flows/resources/classes/call_flows.php
+++ b/app/call_flows/resources/classes/call_flows.php
@@ -121,7 +121,7 @@ if (!class_exists('call_flows')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_delete', 'temp');
 									$p->add('dialplan_detail_delete', 'temp');
 
@@ -223,7 +223,7 @@ if (!class_exists('call_flows')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_edit', 'temp');
 
 								//save the array
@@ -374,7 +374,7 @@ if (!class_exists('call_flows')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_add', 'temp');
 
 								//save the array
diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index e95fa55f1e..cdb478d034 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -209,6 +209,9 @@
 	}
 	require_once "resources/header.php";
 
+//set the back button
+	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF'];
+
 //show the content
 	if ($is_included) {
 		echo "<div class='action_bar sub'>\n";
diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php
index bdaffc3a75..a1b2bc6e72 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -248,7 +248,7 @@
 			}
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("extension_edit", "temp");
 
 		//save the data
@@ -533,13 +533,16 @@
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
+//save the back button location using referer
+	$back_destination = "window.location.href='" . ($_SESSION['call_forward_back'] ?? "/app/call_forward/call_forward.php") . "'";
+
 //show the content
 	echo "<form method='post' name='frm' id='frm'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-call_forward']."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','onclick'=>'history.back();']);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','onclick'=>$back_destination]);
 	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
diff --git a/app/call_forward/resources/classes/call_forward.php b/app/call_forward/resources/classes/call_forward.php
index 746286dced..8b7ef70ebd 100644
--- a/app/call_forward/resources/classes/call_forward.php
+++ b/app/call_forward/resources/classes/call_forward.php
@@ -89,7 +89,7 @@
 			}
 
 			//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('extension_add', 'temp');
 
 			//execute update
@@ -214,7 +214,7 @@
 				if (is_array($array) && @sizeof($array) != 0) {
 
 					//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('extension_edit', 'temp');
 
 					//save the array
diff --git a/app/call_forward/resources/classes/do_not_disturb.php b/app/call_forward/resources/classes/do_not_disturb.php
index 9d75dc1b48..b597437c6f 100644
--- a/app/call_forward/resources/classes/do_not_disturb.php
+++ b/app/call_forward/resources/classes/do_not_disturb.php
@@ -95,7 +95,7 @@
 				$array['extensions'][0]['do_not_disturb'] = $this->enabled;
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('extension_edit', 'temp');
 
 			//execute update
@@ -226,7 +226,7 @@
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('extension_edit', 'temp');
 
 								//save the array
diff --git a/app/call_forward/resources/classes/follow_me.php b/app/call_forward/resources/classes/follow_me.php
index 4a0c848c55..97a66625cb 100644
--- a/app/call_forward/resources/classes/follow_me.php
+++ b/app/call_forward/resources/classes/follow_me.php
@@ -91,7 +91,7 @@
 				$array['follow_me'][0]['follow_me_enabled'] = $this->follow_me_enabled;
 				$array['follow_me'][0]['follow_me_ignore_busy'] = $this->follow_me_ignore_busy;
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('follow_me_add', 'temp');
 			//execute insert
 				$database = new database;
@@ -115,7 +115,7 @@
 				$array['follow_me'][0]['follow_me_enabled'] = $this->follow_me_enabled;
 				$array['follow_me'][0]['follow_me_ignore_busy'] = $this->follow_me_ignore_busy;
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('follow_me_add', 'temp');
 			//execute update
 				$database = new database;
@@ -135,7 +135,7 @@
 			//delete related follow me destinations
 				$array['follow_me_destinations'][0]['follow_me_uuid'] = $this->follow_me_uuid;
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('follow_me_destination_delete', 'temp');
 				//execute delete
 					$database = new database;
@@ -210,7 +210,7 @@
 				}
 				if (is_array($array) && @sizeof($array) != 0) {
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('follow_me_destination_add', 'temp');
 					//execute insert
 						$database = new database;
@@ -234,7 +234,7 @@
 				$extension_uuid = $result[0]['extension_uuid'];
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("follow_me_edit", 'temp');
 				$p->add("extension_edit", 'temp');
 
@@ -389,7 +389,7 @@
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('extension_edit', 'temp');
 									$p->add('follow_me_edit', 'temp');
 
diff --git a/app/call_forward/resources/dashboard/config.php b/app/call_forward/resources/dashboard/config.php
index 29f7122a91..edc3f0c0a7 100644
--- a/app/call_forward/resources/dashboard/config.php
+++ b/app/call_forward/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'ba60799a-1c40-44a8-80ef-c2be4f4692f
 $array['dashboard'][$x]['dashboard_name'] = 'Call Forward';
 $array['dashboard'][$x]['dashboard_path'] = 'call_forward/call_forward';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-forward';
+$array['dashboard'][$x]['dashboard_icon_color'] = '';
 $array['dashboard'][$x]['dashboard_url'] = '/app/call_forward/call_forward.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/call_recordings/resources/classes/call_recordings.php b/app/call_recordings/resources/classes/call_recordings.php
index 0029970748..614a51c577 100644
--- a/app/call_recordings/resources/classes/call_recordings.php
+++ b/app/call_recordings/resources/classes/call_recordings.php
@@ -110,7 +110,7 @@ if (!class_exists('call_recordings')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//add temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('xml_cdr_edit', 'temp');
 
 								//remove record_path, record_name and record_length
@@ -200,7 +200,7 @@ if (!class_exists('call_recordings')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//add temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('xml_cdr_edit', 'temp');
 
 								//remove record_path, record_name and record_length
diff --git a/app/calls_active/app_languages.php b/app/calls_active/app_languages.php
index f87811d1fc..83d93f15a6 100644
--- a/app/calls_active/app_languages.php
+++ b/app/calls_active/app_languages.php
@@ -468,8 +468,8 @@ $text['label-domain']['zh-cn'] = "领域";
 $text['label-domain']['ja-jp'] = "ドメイン";
 $text['label-domain']['ko-kr'] = "도메인";
 
-$text['label-destination']['en-us'] = "Dest";
-$text['label-destination']['en-gb'] = "Dest";
+$text['label-destination']['en-us'] = "Destination";
+$text['label-destination']['en-gb'] = "Destination";
 $text['label-destination']['ar-eg'] = "الوجهة";
 $text['label-destination']['de-at'] = "Ziel";
 $text['label-destination']['de-ch'] = "Ziel";
@@ -546,8 +546,8 @@ $text['label-codec']['zh-cn'] = "读/写编解码器";
 $text['label-codec']['ja-jp'] = "読み取り/書き込みコーデック";
 $text['label-codec']['ko-kr'] = "읽기/쓰기 코덱";
 
-$text['label-cid-number']['en-us'] = "CID Number";
-$text['label-cid-number']['en-gb'] = "CID Number";
+$text['label-cid-number']['en-us'] = "Caller Number";
+$text['label-cid-number']['en-gb'] = "Caller Number";
 $text['label-cid-number']['ar-eg'] = "رقم CID";
 $text['label-cid-number']['de-at'] = "Anrufer Nummer";
 $text['label-cid-number']['de-ch'] = "Anrufer Nummer";
@@ -572,8 +572,8 @@ $text['label-cid-number']['zh-cn'] = "来电号码";
 $text['label-cid-number']['ja-jp'] = "CID番号";
 $text['label-cid-number']['ko-kr'] = "CID 번호";
 
-$text['label-cid-name']['en-us'] = "CID Name";
-$text['label-cid-name']['en-gb'] = "CID Name";
+$text['label-cid-name']['en-us'] = "Caller Name";
+$text['label-cid-name']['en-gb'] = "Caller Name";
 $text['label-cid-name']['ar-eg'] = "اسم CID";
 $text['label-cid-name']['de-at'] = "Anrufer Name";
 $text['label-cid-name']['de-ch'] = "Anrufer Name";
@@ -650,6 +650,33 @@ $text['label-eavesdrop']['zh-cn'] = "窃听";
 $text['label-eavesdrop']['ja-jp'] = "盗聴";
 $text['label-eavesdrop']['ko-kr'] = "엿듣다";
 
+$text['label-duration']['en-us'] = "Duration";
+$text['label-duration']['en-gb'] = "Duration";
+$text['label-duration']['ar-eg'] = "المدة";
+$text['label-duration']['de-at'] = "Dauer";
+$text['label-duration']['de-ch'] = "Dauer";
+$text['label-duration']['de-de'] = "Dauer";
+$text['label-duration']['el-gr'] = "Διάρκεια";
+$text['label-duration']['es-cl'] = "Duración";
+$text['label-duration']['es-mx'] = "Duración";
+$text['label-duration']['fr-ca'] = "Durée";
+$text['label-duration']['fr-fr'] = "Durée";
+$text['label-duration']['he-il'] = "משך השיחה";
+$text['label-duration']['it-it'] = "Durata";
+$text['label-duration']['ka-ge'] = "ხანგრძლივობა";
+$text['label-duration']['nl-nl'] = "Duur";
+$text['label-duration']['pl-pl'] = "Czas trwania";
+$text['label-duration']['pt-br'] = "Duração";
+$text['label-duration']['pt-pt'] = "Duração";
+$text['label-duration']['ro-ro'] = "Durată";
+$text['label-duration']['ru-ru'] = "Продолжительность";
+$text['label-duration']['sv-se'] = "Samtalstid";
+$text['label-duration']['uk-ua'] = "Тривалість";
+$text['label-duration']['tr-tr'] = "Süre";
+$text['label-duration']['zh-cn'] = "期间";
+$text['label-duration']['ja-jp'] = "間隔";
+$text['label-duration']['ko-kr'] = "지속";
+
 $text['description-2']['en-us'] = "Use this to view all extensions and monitor and interact with active calls.";
 $text['description-2']['en-gb'] = "Use this to view all extensions and monitor and interact with active calls.";
 $text['description-2']['ar-eg'] = "استخدم هذا لعرض جميع الملحقات ومراقبة المكالمات النشطة والتفاعل معها.";
diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php
index ffa00988c4..567951aa52 100644
--- a/app/calls_active/calls_active_inc.php
+++ b/app/calls_active/calls_active_inc.php
@@ -88,10 +88,8 @@
 	}
 	$num_rows = @sizeof($rows);
 
-
 //if the connnection is available then run it and return the results
 	if (!$event_socket) {
-
 		$msg = "<div align='center'>".$text['confirm-socket']."<br /></div>";
 		echo "<div align='center'>\n";
 		echo "<table width='40%'>\n";
@@ -103,172 +101,203 @@
 		echo "</tr>\n";
 		echo "</table>\n";
 		echo "</div>\n";
-
+		return;
 	}
-	else {
 
-		//create token
-			$object = new token;
-			$token = $object->create('/app/calls_active/calls_active_inc.php');
+//create token
+	$object = new token;
+	$token = $object->create('/app/calls_active/calls_active_inc.php');
 
-		//show content
-			echo "<div class='action_bar' id='action_bar'>\n";
-			echo "	<div class='heading'><b>".$text['title']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
-			echo "	<div class='actions'>\n";
-			echo "		<span id='refresh_state'>".button::create(['type'=>'button','title'=>$text['label-refresh_pause'],'icon'=>'sync-alt fa-spin','onclick'=>'refresh_stop()'])."</span>";
-			if (permission_exists('call_active_eavesdrop') && !empty($_SESSION['user']['extensions'])) {
-				if (sizeof($_SESSION['user']['extensions']) > 1) {
-					echo "	<input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $_SESSION['user']['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
-					echo "	<i class='fas fa-headphones' style='margin-left: 15px; cursor: help;' title='".$text['description-eavesdrop_destination']."' align='absmiddle'></i>\n";
-					echo "	<select class='formfld' style='margin-right: 5px;' align='absmiddle' onchange=\"document.getElementById('eavesdrop_dest').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();'>\n";
-					if (is_array($_SESSION['user']['extensions'])) {
-						foreach ($_SESSION['user']['extensions'] as $user_extension) {
-							echo "	<option value='".escape($user_extension)."' ".(($_REQUEST['eavesdrop_dest'] == $user_extension) ? "selected" : null).">".escape($user_extension)."</option>\n";
-						}
+//add the style
+	echo "<style>\n";
+	echo "	/* Small screens: Hide columns with class 'hide-small' */\n";
+	echo "	@media (max-width: 600px) {\n";
+	echo "		.hide-small {\n";
+	echo "			display: none;\n";
+	echo "		}\n";
+	echo "	}\n";
+	echo "\n";
+	echo "	/* Medium screens: Hide columns with class 'hide-medium' */\n";
+	echo	"@media (max-width: 1023px) and (min-width: 601px) {\n";
+	echo "		.hide-medium {\n";
+	echo "			display: none;\n";
+	echo "		}\n";
+	echo "	}\n";
+	echo "\n";
+	echo "</style>\n";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
+	echo "	<div class='actions'>\n";
+	echo "		<span id='refresh_state'>".button::create(['type'=>'button','title'=>$text['label-refresh_pause'],'icon'=>'sync-alt fa-spin','onclick'=>'refresh_stop()'])."</span>";
+	if (permission_exists('call_active_eavesdrop') && !empty($_SESSION['user']['extensions'])) {
+		if (sizeof($_SESSION['user']['extensions']) > 1) {
+			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $_SESSION['user']['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
+			echo "	<i class='fas fa-headphones' style='margin-left: 15px; cursor: help;' title='".$text['description-eavesdrop_destination']."' align='absmiddle'></i>\n";
+			echo "	<select class='formfld' style='margin-right: 5px;' align='absmiddle' onchange=\"document.getElementById('eavesdrop_dest').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();'>\n";
+			if (is_array($_SESSION['user']['extensions'])) {
+				foreach ($_SESSION['user']['extensions'] as $user_extension) {
+					echo "	<option value='".escape($user_extension)."' ".(($_REQUEST['eavesdrop_dest'] == $user_extension) ? "selected" : null).">".escape($user_extension)."</option>\n";
+				}
+			}
+			echo "	</select>\n";
+		}
+		else if (sizeof($_SESSION['user']['extensions']) == 1) {
+			echo "	<input type='hidden' id='eavesdrop_dest' value=\"".escape($_SESSION['user']['extension'][0]['destination'])."\">\n";
+		}
+	}
+	if (permission_exists('call_active_hangup') && $rows) {
+		echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','id'=>'btn_delete','onclick'=>"refresh_stop(); modal_open('modal-hangup','btn_hangup');"]);
+	}
+	if (permission_exists('call_active_all')) {
+		if ($show == "all") {
+			echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+		}
+		else {
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+		}
+	}
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	if (permission_exists('call_active_hangup') && $rows) {
+		echo modal::create(['id'=>'modal-hangup','type'=>'general','message'=>$text['confirm-hangups'],'actions'=>button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'check','id'=>'btn_hangup','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('hangup'); list_form_submit('form_list');"])]);
+	}
+
+	echo $text['description']."\n";
+	echo "<br /><br />\n";
+
+//show the results
+	echo "<div id='cmd_reponse'></div>\n";
+
+	echo "<form id='form_list' method='post' action='calls_exec.php'>\n";
+	echo "<input type='hidden' id='action' name='action' value=''>\n";
+
+	echo "<div class='card'>\n";
+	echo "	<table class='list'>\n";
+	echo "	<tr class='list-header'>\n";
+	if (permission_exists('call_active_hangup')) {
+		echo "		<th class='checkbox'>\n";
+		echo "			<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='if (this.checked) { refresh_stop(); } else { refresh_start(); } list_all_toggle();' ".(empty($rows) ? "style='visibility: hidden;'" : null).">\n";
+		echo "		</th>\n";
+	}
+	echo "		<th class='hide-small'>".$text['label-profile']."</th>\n";
+	//echo"		<th>".$text['label-created']."</th>\n";
+	echo "		<th>".$text['label-duration']."</th>\n";
+	if ($show == 'all') {
+		echo "		<th>".$text['label-domain']."</th>\n";
+	}
+	//echo "		<th>".$text['label-number']."</th>\n";
+	echo "		<th class='hide-small'>".$text['label-cid-name']."</th>\n";
+	echo "		<th>".$text['label-cid-number']."</th>\n";
+	echo "		<th>".$text['label-destination']."</th>\n";
+	echo "		<th class='hide-small hide-medium'>".$text['label-app']."</th>\n";
+	echo "		<th class='hide-small hide-medium'>".$text['label-codec']."</th>\n";
+	echo "		<th class='hide-small hide-medium'>".$text['label-secure']."</th>\n";
+	if (permission_exists('call_active_eavesdrop') || permission_exists('call_active_hangup')) {
+		echo "		<th>&nbsp;</th>\n";
+	}
+	echo "	</tr>\n";
+
+	if (is_array($rows)) {
+		$x = 0;
+		foreach ($rows as $row) {
+
+			//set the php variables
+				foreach ($row as $key => $value) {
+					$$key = $value;
+				}
+
+			//get the sip profile
+				$name_array = explode("/", $name);
+				$sip_profile = $name_array[1];
+				$sip_uri = $name_array[2];
+
+			//get the number
+				//$temp_array = explode("@", $sip_uri);
+				//$tmp_number = $temp_array[0];
+				//$tmp_number = str_replace("sip:", "", $tmp_number);
+
+			//remove the '+' because it breaks the call recording
+				$cid_num = str_replace("+", "", $cid_num);
+
+			//replace gateway uuid with name
+				if (is_array($_SESSION['gateways']) && sizeof($_SESSION['gateways']) > 0) {
+					foreach ($_SESSION['gateways'] as $gateway_uuid => $gateway_name) {
+						$application_data = str_replace($gateway_uuid, $gateway_name, $application_data);
 					}
-					echo "	</select>\n";
 				}
-				else if (sizeof($_SESSION['user']['extensions']) == 1) {
-					echo "	<input type='hidden' id='eavesdrop_dest' value=\"".escape($_SESSION['user']['extension'][0]['destination'])."\">\n";
+
+			//convert $created to a UNIX timestamp
+				$created_timestamp = strtotime($created);
+
+			//get the current timestamp
+				$now = time();
+
+			//calculate elapsed seconds
+				$elapsed_seconds = $now - $created_timestamp;
+
+			//convert seconds to hours, minutes, and seconds
+				$hours = floor($elapsed_seconds / 3600);
+				$minutes = floor(($elapsed_seconds % 3600) / 60);
+				$seconds = $elapsed_seconds % 60;
+
+			//format the elapsed time as HH:MM:SS
+				$elapsed_time = sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds);
+
+			//reduce too long app data
+				if(strlen($application_data) > 80) {
+					$application_data = substr($application_data, 0, 80) . '...';
 				}
-			}
-			if (permission_exists('call_active_hangup') && $rows) {
-				echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','id'=>'btn_delete','onclick'=>"refresh_stop(); modal_open('modal-hangup','btn_hangup');"]);
-			}
-			if (permission_exists('call_active_all')) {
-				if ($show == "all") {
-					echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+
+			//send the html
+				echo "	<tr class='list-row'>\n";
+				if (permission_exists('call_active_hangup')) {
+					echo "		<td class='checkbox'>\n";
+					echo "			<input type='checkbox' name='calls[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (this.checked) { refresh_stop(); } else { document.getElementById('checkbox_all').checked = false; }\">\n";
+					echo "			<input type='hidden' name='calls[$x][uuid]' value='".escape($uuid)."' />\n";
+					echo "		</td>\n";
 				}
-				else {
-					echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+				echo "		<td class='hide-small'>".escape($sip_profile)."&nbsp;</td>\n";
+				//echo "		<td>".escape($created)."&nbsp;</td>\n";
+				echo "		<td>".escape($elapsed_time)."</td>\n";
+				if ($show == 'all') {
+					echo "		<td>".escape($domain_name)."&nbsp;</td>\n";
 				}
-			}
-			echo "	</div>\n";
-			echo "	<div style='clear: both;'></div>\n";
-			echo "</div>\n";
-
-			if (permission_exists('call_active_hangup') && $rows) {
-				echo modal::create(['id'=>'modal-hangup','type'=>'general','message'=>$text['confirm-hangups'],'actions'=>button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'check','id'=>'btn_hangup','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('hangup'); list_form_submit('form_list');"])]);
-			}
-
-			echo $text['description']."\n";
-			echo "<br /><br />\n";
-
-		//show the results
-			echo "<div id='cmd_reponse'></div>\n";
-
-			echo "<form id='form_list' method='post' action='calls_exec.php'>\n";
-			echo "<input type='hidden' id='action' name='action' value=''>\n";
-
-			echo "<div class='card'>\n";
-			echo "<table class='list'>\n";
-			echo "<tr class='list-header'>\n";
-			if (permission_exists('call_active_hangup')) {
-				echo "	<th class='checkbox'>\n";
-				echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='if (this.checked) { refresh_stop(); } else { refresh_start(); } list_all_toggle();' ".(empty($rows) ? "style='visibility: hidden;'" : null).">\n";
-				echo "	</th>\n";
-			}
-			echo "	<th>".$text['label-profile']."</th>\n";
-			echo "	<th>".$text['label-created']."</th>\n";
-			if ($show == 'all') {
-				echo "	<th>".$text['label-domain']."</th>\n";
-			}
-			echo "	<th>".$text['label-number']."</th>\n";
-			echo "	<th>".$text['label-cid-name']."</th>\n";
-			echo "	<th>".$text['label-cid-number']."</th>\n";
-			echo "	<th>".$text['label-destination']."</th>\n";
-			echo "	<th>".$text['label-app']."</th>\n";
-			echo "	<th>".$text['label-codec']."</th>\n";
-			echo "	<th>".$text['label-secure']."</th>\n";
-			if (permission_exists('call_active_eavesdrop') || permission_exists('call_active_hangup')) {
-				echo "	<th>&nbsp;</th>\n";
-			}
-			echo "</tr>\n";
-
-			if (is_array($rows)) {
-				$x = 0;
-				foreach ($rows as $row) {
-
-					//set the php variables
-						foreach ($row as $key => $value) {
-							$$key = $value;
-						}
-
-					//get the sip profile
-						$name_array = explode("/", $name);
-						$sip_profile = $name_array[1];
-						$sip_uri = $name_array[2];
-
-					//get the number
-						$temp_array = explode("@", $sip_uri);
-						$tmp_number = $temp_array[0];
-						$tmp_number = str_replace("sip:", "", $tmp_number);
-
-					//remove the '+' because it breaks the call recording
-						$cid_num = str_replace("+", "", $cid_num);
-
-					//replace gateway uuid with name
-						if (is_array($_SESSION['gateways']) && sizeof($_SESSION['gateways']) > 0) {
-							foreach ($_SESSION['gateways'] as $gateway_uuid => $gateway_name) {
-								$application_data = str_replace($gateway_uuid, $gateway_name, $application_data);
-							}
-						}
-
-					// reduce too long app data
-						if(strlen($application_data) > 512) {
-							$application_data = substr($application_data, 0, 512) . '...';
-						}
-
-					//send the html
-						echo "<tr class='list-row'>\n";
-						if (permission_exists('call_active_hangup')) {
-							echo "	<td class='checkbox'>\n";
-							echo "		<input type='checkbox' name='calls[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (this.checked) { refresh_stop(); } else { document.getElementById('checkbox_all').checked = false; }\">\n";
-							echo "		<input type='hidden' name='calls[$x][uuid]' value='".escape($uuid)."' />\n";
-							echo "	</td>\n";
-						}
-						echo "	<td>".escape($sip_profile)."&nbsp;</td>\n";
-						echo "	<td>".escape($created)."&nbsp;</td>\n";
-						if ($show == 'all') {
-							echo "	<td>".escape($domain_name)."&nbsp;</td>\n";
-						}
-						echo "	<td>".escape($tmp_number)."&nbsp;</td>\n";
-						echo "	<td>".escape($cid_name)."&nbsp;</td>\n";
-						echo "	<td>".escape($cid_num)."&nbsp;</td>\n";
-						echo "	<td>".escape($dest)."&nbsp;</td>\n";
-						echo "	<td>".(!empty($application) ? escape($application).":".escape($application_data) : null)."&nbsp;</td>\n";
-						echo "	<td>".escape($read_codec).":".escape($read_rate)." / ".escape($write_codec).":".escape($write_rate)."&nbsp;</td>\n";
-						echo "	<td>".escape($secure)."&nbsp;</td>\n";
-						if (permission_exists('call_active_eavesdrop') || permission_exists('call_active_hangup')) {
-							echo "	<td class='button right' style='padding-right: 0;'>\n";
-							//eavesdrop
-							if (permission_exists('call_active_eavesdrop') && $callstate == 'ACTIVE' && !empty($_SESSION['user']['extensions']) && !in_array($cid_num, $_SESSION['user']['extensions'])) {
-								echo button::create(['type'=>'button','label'=>$text['label-eavesdrop'],'icon'=>'headphones','collapse'=>'hide-lg-dn','onclick'=>"if (confirm('".$text['confirm-eavesdrop']."')) { eavesdrop_call('".escape($cid_num)."','".escape($uuid)."'); } else { this.blur(); return false; }",'onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
-							}
-							//hangup
-							if (permission_exists('call_active_hangup')) {
-								echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','collapse'=>'hide-lg-dn','onclick'=>"if (confirm('".$text['confirm-hangup']."')) { list_self_check('checkbox_".$x."'); list_action_set('hangup'); list_form_submit('form_list'); } else { this.blur(); return false; }",'onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
-							}
-							echo "</td>\n";
-						}
-						echo "</tr>\n";
-
-					//unset the domain name
-						unset($domain_name);
-
-					//increment counter
-						$x++;
+				//echo "		<td>".escape($tmp_number)."&nbsp;</td>\n";
+				echo "		<td class='hide-small'>".escape($cid_name)."&nbsp;</td>\n";
+				echo "		<td>".escape($cid_num)."&nbsp;</td>\n";
+				echo "		<td>".escape($dest)."&nbsp;</td>\n";
+				echo "		<td class='hide-small hide-medium' style='max-width: 200px; word-wrap: break-word;'>".(!empty($application) ? escape($application).":".escape($application_data) : null)."&nbsp;</td>\n";
+				echo "		<td class='hide-small hide-medium'>".escape($read_codec).":".escape($read_rate)." / ".escape($write_codec).":".escape($write_rate)."&nbsp;</td>\n";
+				echo "		<td class='hide-small hide-medium'>".escape($secure)."&nbsp;</td>\n";
+				if (permission_exists('call_active_eavesdrop') || permission_exists('call_active_hangup')) {
+					echo "		<td class='button right' style='padding-right: 0;'>\n";
+					//eavesdrop
+					if (permission_exists('call_active_eavesdrop') && $callstate == 'ACTIVE' && !empty($_SESSION['user']['extensions']) && !in_array($cid_num, $_SESSION['user']['extensions'])) {
+						echo button::create(['type'=>'button','label'=>$text['label-eavesdrop'],'icon'=>'headphones','collapse'=>'hide-lg-dn','onclick'=>"if (confirm('".$text['confirm-eavesdrop']."')) { eavesdrop_call('".escape($cid_num)."','".escape($uuid)."'); } else { this.blur(); return false; }",'onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+					}
+					//hangup
+					if (permission_exists('call_active_hangup')) {
+						echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','collapse'=>'hide-lg-dn','onclick'=>"if (confirm('".$text['confirm-hangup']."')) { list_self_check('checkbox_".$x."'); list_action_set('hangup'); list_form_submit('form_list'); } else { this.blur(); return false; }",'onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
+					}
+					echo "	</td>\n";
 				}
-				unset($rows);
-			}
+				echo "	</tr>\n";
 
-			echo "</table>\n";
-			echo "</div>\n";
-
-			echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
-
-			echo "</form>\n";
+			//unset the domain name
+				unset($domain_name);
 
+			//increment counter
+				$x++;
+		}
 	}
 
+	echo "	</table>\n";
+	echo "</div>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "</form>\n";
+
 ?>
diff --git a/app/cisco/app_config.php b/app/cisco/app_config.php
index 34017ad789..442aa4ca55 100644
--- a/app/cisco/app_config.php
+++ b/app/cisco/app_config.php
@@ -176,5 +176,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "SPA PC VLAN ID. Options 0 to 4094.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "78637de4-ec12-4d41-8c65-39afe50d2b02";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "spa_router_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: 0:Bridge, 1:NAT.";
+		$y++;
 
 ?>
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index ecc7ce743f..953765ceee 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -164,7 +164,7 @@
 			$array['dialplans'][0]["app_uuid"] = "b81412e8-7253-91f4-e48e-42fc2c9a38d9";
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index 03576d2231..65ef0b89b5 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -188,7 +188,7 @@
 				$array['conference_room_users'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 
 			//un-assigne the users from the conference room
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('conference_room_user_delete', 'temp');
 
 				$database->app_name = 'conference_centers';
@@ -358,7 +358,7 @@
 							$array['conference_room_users'][0]['conference_room_uuid'] = $conference_room_uuid;
 							$array['conference_room_users'][0]['user_uuid'] = $_SESSION["user_uuid"];
 
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('conference_room_user_add', 'temp');
 
 							$database->app_name = 'conference_centers';
@@ -440,7 +440,7 @@
 					$array['conference_room_users'][0]['conference_room_uuid'] = $conference_room_uuid;
 					$array['conference_room_users'][0]['user_uuid'] = $user_uuid;
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('conference_room_user_add', 'temp');
 
 					$database->app_name = 'conference_centers';
diff --git a/app/conference_centers/resources/classes/conference_centers.php b/app/conference_centers/resources/classes/conference_centers.php
index f65bfcb291..b9fea85e4f 100644
--- a/app/conference_centers/resources/classes/conference_centers.php
+++ b/app/conference_centers/resources/classes/conference_centers.php
@@ -349,7 +349,7 @@ if (!class_exists('conference_centers')) {
 							if (!empty($array)) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_detail_delete', 'temp');
 									$p->add('dialplan_delete', 'temp');
 
@@ -425,7 +425,7 @@ if (!class_exists('conference_centers')) {
 							if (!empty($array)) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_room_user_delete', 'temp');
 									$p->add('conference_room_delete', 'temp');
 
@@ -489,7 +489,7 @@ if (!class_exists('conference_centers')) {
 							if (!empty($array)) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_session_detail_delete', 'temp');
 									$p->add('conference_user_delete', 'temp');
 
@@ -578,7 +578,7 @@ if (!class_exists('conference_centers')) {
 							if (!empty($array)) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add("dialplan_edit", "temp");
 
 								//save the array
diff --git a/app/conference_centers/resources/dashboard/config.php b/app/conference_centers/resources/dashboard/config.php
index f9fd79b610..273b533abc 100644
--- a/app/conference_centers/resources/dashboard/config.php
+++ b/app/conference_centers/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'd1b26c96-6cfd-45ea-824f-0b5e16a9aab
 $array['dashboard'][$x]['dashboard_name'] = 'Conference Centers';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-hotel';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#5D5CE3';
 $array['dashboard'][$x]['dashboard_url'] = '/app/conference_centers/conference_rooms.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#5d5ce3';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/conference_controls/app_defaults.php b/app/conference_controls/app_defaults.php
index 6c0f1c0a0d..edefd36e7b 100644
--- a/app/conference_controls/app_defaults.php
+++ b/app/conference_controls/app_defaults.php
@@ -65,7 +65,7 @@
 						$array['conference_controls'][0]['control_name'] = $control_name;
 						$array['conference_controls'][0]['control_enabled'] = 'true';
 
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('conference_control_add', 'temp');
 
 						$database->app_name = 'conference_controls';
@@ -96,7 +96,7 @@
 								}
 								$array['conference_control_details'][0]['control_enabled'] = $control_enabled;
 
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('conference_control_detail_add', 'temp');
 
 								$database->app_name = 'conference_controls';
diff --git a/app/conference_controls/resources/classes/conference_controls.php b/app/conference_controls/resources/classes/conference_controls.php
index 478781b0c9..13120b560a 100644
--- a/app/conference_controls/resources/classes/conference_controls.php
+++ b/app/conference_controls/resources/classes/conference_controls.php
@@ -103,7 +103,7 @@ if (!class_exists('conference_controls')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_control_detail_delete', 'temp');
 
 								//execute delete
diff --git a/app/conference_profiles/app_defaults.php b/app/conference_profiles/app_defaults.php
index 2ed206bdab..3ddccfc0ab 100644
--- a/app/conference_profiles/app_defaults.php
+++ b/app/conference_profiles/app_defaults.php
@@ -65,7 +65,7 @@
 						$array['conference_profiles'][0]['profile_name'] = $profile_name;
 						$array['conference_profiles'][0]['profile_enabled'] = 'true';
 
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('conference_profile_add', 'temp');
 
 						$database->app_name = 'conference_profiles';
@@ -91,7 +91,7 @@
 								$array['conference_profile_params'][0]['profile_param_value'] = $profile_param_value;
 								$array['conference_profile_params'][0]['profile_param_enabled'] = $profile_param_enabled;
 
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('conference_profile_param_add', 'temp');
 
 								$database->app_name = 'conference_profiles';
diff --git a/app/conference_profiles/resources/classes/conference_profiles.php b/app/conference_profiles/resources/classes/conference_profiles.php
index 831dcaa0e7..d92a0c01e3 100644
--- a/app/conference_profiles/resources/classes/conference_profiles.php
+++ b/app/conference_profiles/resources/classes/conference_profiles.php
@@ -103,7 +103,7 @@ if (!class_exists('conference_profiles')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_profile_param_delete', 'temp');
 
 								//execute delete
@@ -410,7 +410,7 @@ if (!class_exists('conference_profiles')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_profile_param_add', 'temp');
 
 								//save the array
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 1b89a57793..92fd9888e3 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -91,7 +91,7 @@
 		$user_uuid = $_REQUEST["user_uuid"];
 		$conference_uuid = $_REQUEST["id"];
 
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('conference_user_delete', 'temp');
 
 		$array['conference_users'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
@@ -124,7 +124,7 @@
 			$array['conference_users'][0]['conference_uuid'] = $conference_uuid;
 			$array['conference_users'][0]['user_uuid'] = $user_uuid;
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('conference_user_add', 'temp');
 
 			$database = new database;
@@ -239,7 +239,7 @@
 					$array['dialplans'][0]['dialplan_enabled'] = $conference_enabled;
 					$array['dialplans'][0]['dialplan_description'] = $conference_description;
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_add', 'temp');
 					$p->add('dialplan_edit', 'temp');
 
diff --git a/app/conferences/resources/classes/conferences.php b/app/conferences/resources/classes/conferences.php
index 7589eb9bd4..c9a14f8140 100644
--- a/app/conferences/resources/classes/conferences.php
+++ b/app/conferences/resources/classes/conferences.php
@@ -108,7 +108,7 @@ if (!class_exists('conferences')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_user_delete', 'temp');
 									$p->add('dialplan_detail_delete', 'temp');
 									$p->add('dialplan_delete', 'temp');
@@ -203,7 +203,7 @@ if (!class_exists('conferences')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_edit', 'temp');
 
 								//save the array
@@ -341,7 +341,7 @@ if (!class_exists('conferences')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('conference_user_add', 'temp');
 									$p->add('dialplan_add', 'temp');
 
diff --git a/app/conferences/resources/dashboard/config.php b/app/conferences/resources/dashboard/config.php
index cb9d3cbaf7..d9cd3e9a37 100644
--- a/app/conferences/resources/dashboard/config.php
+++ b/app/conferences/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'c3c37d29-b654-4024-8ee4-d752b3e4db4
 $array['dashboard'][$x]['dashboard_name'] = 'Conferences';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-comments';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/conferences/conferences.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292FF';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index 3e9b0f81f2..6f47d1103a 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -167,6 +167,10 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "destination_local";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_email";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 
 	//default settings
 		$y = 0;
@@ -397,6 +401,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_email";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select whether to send email notifications of incoming SMS/MMS messages";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_date";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
diff --git a/app/destinations/app_defaults.php b/app/destinations/app_defaults.php
index 7c12382a94..411bbd5760 100644
--- a/app/destinations/app_defaults.php
+++ b/app/destinations/app_defaults.php
@@ -83,7 +83,7 @@ if ($domains_processed == 1) {
 					//save to the data
 					if (!empty($array)) {
 						//add temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('destination_edit', 'temp');
 		
 						//create the database object and save the data
@@ -109,7 +109,7 @@ if ($domains_processed == 1) {
 
 			if (!empty($array)) {
 				//add temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('destination_edit', 'temp');
 
 				//create the database object and save the data
diff --git a/app/destinations/app_languages.php b/app/destinations/app_languages.php
index 56cd95c73e..b7c72ecba5 100644
--- a/app/destinations/app_languages.php
+++ b/app/destinations/app_languages.php
@@ -1162,6 +1162,33 @@ $text['label-destination_conditions']['zh-cn'] = "状况";
 $text['label-destination_conditions']['ja-jp'] = "条件";
 $text['label-destination_conditions']['ko-kr'] = "정황";
 
+$text['label-destination_email']['en-us'] = "Email Notifications";
+$text['label-destination_email']['en-gb'] = "Email Notifications";
+$text['label-destination_email']['ar-eg'] = "إشعارات البريد الإلكتروني";
+$text['label-destination_email']['de-at'] = "E-Mail-Benachrichtigungen";
+$text['label-destination_email']['de-ch'] = "E-Mail-Benachrichtigungen";
+$text['label-destination_email']['de-de'] = "E-Mail-Benachrichtigungen";
+$text['label-destination_email']['el-gr'] = "Ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου";
+$text['label-destination_email']['es-cl'] = "Notificaciones por correo electrónico";
+$text['label-destination_email']['es-mx'] = "Notificaciones por correo electrónico";
+$text['label-destination_email']['fr-ca'] = "Notifications par courriel";
+$text['label-destination_email']['fr-fr'] = "Notifications par e-mail";
+$text['label-destination_email']['he-il'] = "התראות דוא\"ל";
+$text['label-destination_email']['it-it'] = "Notifiche via email";
+$text['label-destination_email']['ka-ge'] = "ელ.ფოსტით შეტყობინებები";
+$text['label-destination_email']['nl-nl'] = "E-mailmeldingen";
+$text['label-destination_email']['pl-pl'] = "Powiadomienia e-mail";
+$text['label-destination_email']['pt-br'] = "Notificações por e-mail";
+$text['label-destination_email']['pt-pt'] = "Notificações por e-mail";
+$text['label-destination_email']['ro-ro'] = "Notificări prin e-mail";
+$text['label-destination_email']['ru-ru'] = "Уведомления по электронной почте";
+$text['label-destination_email']['sv-se'] = "E-postmeddelanden";
+$text['label-destination_email']['uk-ua'] = "Повідомлення електронною поштою";
+$text['label-destination_email']['tr-tr'] = "E-posta Bildirimleri";
+$text['label-destination_email']['zh-cn'] = "邮件通知";
+$text['label-destination_email']['ja-jp'] = "メール通知";
+$text['label-destination_email']['ko-kr'] = "이메일 알림";
+
 $text['option-caller_id_number']['en-us'] = "Caller ID Number";
 $text['option-caller_id_number']['en-gb'] = "Caller ID Number";
 $text['option-caller_id_number']['ar-eg'] = "رقم المتصل";
@@ -2352,6 +2379,33 @@ $text['description-usage']['zh-cn'] = "设置目的地的使用方式。";
 $text['description-usage']['ja-jp'] = "宛先の使用方法を設定します。";
 $text['description-usage']['ko-kr'] = "대상이 사용되는 방식을 설정합니다.";
 
+$text['description-destination_email']['en-us'] = "Choose whether to send SMS and MMS messages to User's email";
+$text['description-destination_email']['en-gb'] = "Choose whether to send SMS and MMS messages to User's email";
+$text['description-destination_email']['ar-eg'] = "اختر ما إذا كنت ترغب في إرسال رسائل SMS و MMS إلى بريد المستخدم الإلكتروني";
+$text['description-destination_email']['de-at'] = "Wählen Sie, ob SMS- und MMS-Nachrichten an die E-Mail des Benutzers gesendet werden sollen";
+$text['description-destination_email']['de-ch'] = "Wählen Sie, ob SMS- und MMS-Nachrichten an die E-Mail des Benutzers gesendet werden sollen";
+$text['description-destination_email']['de-de'] = "Wählen Sie, ob SMS- und MMS-Nachrichten an die E-Mail des Benutzers gesendet werden sollen";
+$text['description-destination_email']['el-gr'] = "Επιλέξτε αν θέλετε να στείλετε μηνύματα SMS και MMS στο email του χρήστη";
+$text['description-destination_email']['es-cl'] = "Elija si desea enviar mensajes SMS y MMS al correo electrónico del usuario";
+$text['description-destination_email']['es-mx'] = "Elija si desea enviar mensajes SMS y MMS al correo electrónico del usuario";
+$text['description-destination_email']['fr-ca'] = "Choisissez si vous souhaitez envoyer des messages SMS et MMS à l'email de l'utilisateur";
+$text['description-destination_email']['fr-fr'] = "Choisissez si vous souhaitez envoyer des messages SMS et MMS à l'email de l'utilisateur";
+$text['description-destination_email']['he-il'] = "בחר אם לשלוח הודעות SMS ו-MMS לדוא\"ל של המשתמש";
+$text['description-destination_email']['it-it'] = "Scegli se inviare messaggi SMS e MMS all'email dell'utente";
+$text['description-destination_email']['ka-ge'] = "აირჩიეთ, გსურთ თუ არა SMS და MMS შეტყობინებების გაგზავნა მომხმარებლის ელ.ფოსტაზე";
+$text['description-destination_email']['nl-nl'] = "Kies of je SMS- en MMS-berichten naar de e-mail van de gebruiker wilt sturen";
+$text['description-destination_email']['pl-pl'] = "Wybierz, czy chcesz wysłać wiadomości SMS i MMS na adres e-mail użytkownika";
+$text['description-destination_email']['pt-br'] = "Escolha se deseja enviar mensagens SMS e MMS para o e-mail do usuário";
+$text['description-destination_email']['pt-pt'] = "Escolha se deseja enviar mensagens SMS e MMS para o e-mail do usuário";
+$text['description-destination_email']['ro-ro'] = "Alegeți dacă doriți să trimiteți mesaje SMS și MMS la adresa de e-mail a utilizatorului";
+$text['description-destination_email']['ru-ru'] = "Выберите, хотите ли вы отправлять SMS и MMS сообщения на электронную почту пользователя";
+$text['description-destination_email']['sv-se'] = "Välj om du vill skicka SMS- och MMS-meddelanden till användarens e-post";
+$text['description-destination_email']['uk-ua'] = "Виберіть, чи хочете ви надсилати SMS і MMS повідомлення на електронну пошту користувача";
+$text['description-destination_email']['tr-tr'] = "Kullanıcının e-posta adresine SMS ve MMS mesajları gönderilip gönderilmeyeceğini seçin";
+$text['description-destination_email']['zh-cn'] = "选择是否将SMS和MMS消息发送到用户的电子邮件";
+$text['description-destination_email']['ja-jp'] = "ユーザーのメールにSMSおよびMMSメッセージを送信するかどうかを選択してください";
+$text['description-destination_email']['ko-kr'] = "사용자 이메일로 SMS 및 MMS 메시지를 보낼지 선택하세요";
+
 $text['billing-warning']['en-us'] = "If you are using fusionpbx billing application, make sure to add accountcode and carrier variables.";
 $text['billing-warning']['en-gb'] = "If you are using fusionpbx billing application, make sure to add accountcode and carrier variables.";
 $text['billing-warning']['ar-eg'] = "إذا كنت تستخدم تطبيق فواتير الدمج، تأكد من إضافة رمز الحساب والمتغيرات الناقلة.";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 5d594364cc..ba185c3c75 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -130,6 +130,7 @@
 			$destination_type_text = $_POST["destination_type_text"] ?? null;
 			$destination_type_emergency = $_POST["destination_type_emergency"] ?? null;
 			$destination_carrier = $_POST["destination_carrier"] ?? null;
+			$destination_email = $_POST["destination_email"];
 
 		//sanitize the destination conditions
 			if (!empty($destination_conditions)) {
@@ -314,6 +315,9 @@
 				if (!permission_exists('destination_domain')) {
 					$domain_uuid = $row["domain_uuid"] ?? null;
 				}
+				if (!permission_exists('destination_email')) {
+					$destination_email = $row["destination_email"] ?? null;
+				}
 			}
 			unset($row);
 
@@ -1090,6 +1094,7 @@
 									$array['destinations'][$x]["destination_distinctive_ring"] = $destination_distinctive_ring;
 								}
 								$array['destinations'][$x]["destination_record"] = $destination_record;
+								$array['destinations'][$x]["destination_email"] = $destination_email;
 								if (!empty($destination_ringback) && $ringbacks->valid($destination_ringback)) {
 									$array['destinations'][$x]["destination_ringback"] = $destination_ringback;
 								}
@@ -1139,7 +1144,7 @@
 					}
 
 				//add the dialplan permission
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("dialplan_add", 'temp');
 					$p->add("dialplan_detail_add", 'temp');
 					$p->add("dialplan_edit", 'temp');
@@ -1270,6 +1275,7 @@
 	$destination_order = $destination_order ?? '';
 	$destination_enabled = $destination_enabled ?? '';
 	$destination_description = $destination_description ?? '';
+	$destination_email = $destination_email ?? '';
 	$select_style = $select_style ?? '';
 
 //pre-populate the form
@@ -1316,6 +1322,7 @@
 				$destination_order = $row["destination_order"];
 				$destination_enabled = $row["destination_enabled"];
 				$destination_description = $row["destination_description"];
+				$destination_email = $row["destination_email"];
 			}
 			unset($sql, $parameters, $row);
 		}
@@ -1815,6 +1822,34 @@
 		echo "</tr>\n";
 	}
 
+	//destination email
+	if (permission_exists('destination_email') && permission_exists('message_view')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-destination_email']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<select class='formfld' name='destination_email'>\n";
+		echo "	<option value=''></option>\n";
+		if (!empty($destination_email) && $destination_email == "true") {
+			echo "	<option value='true' selected='selected'>".$text['option-true']."</option>\n";
+		}
+		else {
+			echo "	<option value='true'>".$text['option-true']."</option>\n";
+		}
+		if (!empty($destination_email) && $destination_email == "false") {
+			echo "	<option value='false' selected='selected'>".$text['option-false']."</option>\n";
+		}
+		else {
+			echo "	<option value='false'>".$text['option-false']."</option>\n";
+		}
+		echo "	</select>\n";
+		echo "<br />\n";
+		echo $text['description-destination_email']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	//users
 	if (permission_exists('user_edit')) {
 		echo "<tr id='tr_user'>\n";
diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 2694665e47..6b05c30c64 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -402,7 +402,7 @@ if (!class_exists('destinations')) {
 										}
 									}
 									//application: hangup
-									if (!empty($data['application'])) {
+									if (!empty($data['application']) && $data['application'] === 'hangup') {
 										$select_value = str_replace("transfer", $data['application'], $select_value);
 									}
 								}
@@ -1081,7 +1081,7 @@ if (!class_exists('destinations')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_delete', 'temp');
 									$p->add('dialplan_detail_delete', 'temp');
 
diff --git a/app/destinations/resources/dashboard/config.php b/app/destinations/resources/dashboard/config.php
index dcb4590bd7..6eb1d00670 100644
--- a/app/destinations/resources/dashboard/config.php
+++ b/app/destinations/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'a294b771-a125-4d36-b51a-973540346fa
 $array['dashboard'][$x]['dashboard_name'] = 'Destinations';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-right-to-bracket';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/destinations/destinations.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php
index eb2acdd48b..9dde91d806 100644
--- a/app/devices/app_defaults.php
+++ b/app/devices/app_defaults.php
@@ -62,7 +62,7 @@ if ($domains_processed == 1) {
 				$array['device_keys'][$index]['device_key_vendor'] = $row["device_vendor"];
 			}
 			if (is_array($array) && @sizeof($array)) {
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('device_key_edit', 'temp');
 
 				$database->app_name = 'devices';
@@ -106,7 +106,7 @@ if ($domains_processed == 1) {
 
 			//save the array
 			if (!empty($array)) {
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('device_profile_key_add', 'temp');
 
 				$database->app_name = 'devices';
@@ -144,7 +144,7 @@ if ($domains_processed == 1) {
 
 			//save the array
 			if (!empty($array)) {
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('device_profile_setting_add', 'temp');
 
 				$database->app_name = 'devices';
@@ -225,7 +225,7 @@ if ($domains_processed == 1) {
 
 			//execute
 				if (!empty($array)) {
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('device_vendor_add', 'temp');
 					$p->add('device_vendor_function_add', 'temp');
 					$p->add('device_vendor_function_group_add', 'temp');
diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php
index d510a751b6..922302a045 100644
--- a/app/devices/device_vendor_function_edit.php
+++ b/app/devices/device_vendor_function_edit.php
@@ -44,7 +44,7 @@
 		//delete the device vendor function group
 			$array['device_vendor_function_groups'][0]['device_vendor_function_group_uuid'] = $device_vendor_function_group_uuid;
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('device_vendor_function_group_delete', 'temp');
 
 			$database = new database;
@@ -183,7 +183,7 @@
 								$array['device_vendor_function_groups'][0]['group_name'] = $group_name;
 								$array['device_vendor_function_groups'][0]['group_uuid'] = $group_uuid;
 
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('device_vendor_function_group_add', 'temp');
 
 								$database = new database;
diff --git a/app/devices/device_vendor_restore.php b/app/devices/device_vendor_restore.php
index 779b6e14d9..2a40b1c475 100644
--- a/app/devices/device_vendor_restore.php
+++ b/app/devices/device_vendor_restore.php
@@ -129,7 +129,7 @@
 			}
 
 		//assign temp permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('device_vendor_add', 'temp');
 			$p->add('device_vendor_function_add', 'temp');
 			$p->add('device_vendor_function_group_add', 'temp');
diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php
index fba69b9fa9..899962262e 100644
--- a/app/devices/resources/classes/device.php
+++ b/app/devices/resources/classes/device.php
@@ -518,7 +518,7 @@
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('device_setting_delete', 'temp');
 									$p->add('device_line_delete', 'temp');
 									$p->add('device_key_delete', 'temp');
@@ -728,7 +728,7 @@
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('device_vendor_function_delete', 'temp');
 									$p->add('device_vendor_function_group_delete', 'temp');
 
@@ -790,7 +790,7 @@
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('device_vendor_function_group_delete', 'temp');
 
 								//execute delete
@@ -851,7 +851,7 @@
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('device_profile_key_delete', 'temp');
 									$p->add('device_profile_setting_delete', 'temp');
 
@@ -1376,7 +1376,7 @@
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('device_profile_key_add', 'temp');
 									$p->add('device_profile_setting_add', 'temp');
 
diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php
index e095100105..402c1409fb 100644
--- a/app/devices/resources/dashboard/device_keys.php
+++ b/app/devices/resources/dashboard/device_keys.php
@@ -259,7 +259,7 @@
 								}
 								if ($save) {
 									//add the temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('device_keys_add', 'temp');
 										$p->add('device_key_edit', 'temp');
 
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index deb8175233..4b1d2b1f5a 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -402,7 +402,7 @@
 		//update the destination dialplan_uuid
 			if (is_uuid($destination_uuid)) {
 
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('destination_edit', 'temp');
 
 				$array['destinations'][0]['destination_uuid'] = $destination_uuid;
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index cc22127260..7c6a8a44ec 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -815,7 +815,7 @@
 			}
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_detail_add", "temp");
 
diff --git a/app/dialplans/app_defaults.php b/app/dialplans/app_defaults.php
index 6e81a9678c..923e13f8d8 100644
--- a/app/dialplans/app_defaults.php
+++ b/app/dialplans/app_defaults.php
@@ -170,7 +170,7 @@
 				$array['dialplan_details'][1]['dialplan_detail_data'] = 'WARNING [inbound routes] 404 not found \${sip_network_ip}';
 				$array['dialplan_details'][1]['dialplan_detail_order'] = '20';
 
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('dialplan_add', 'temp');
 				$p->add('dialplan_detail_add', 'temp');
 
diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php
index 9bfa12b491..5c5b1cee7b 100644
--- a/app/dialplans/resources/classes/dialplan.php
+++ b/app/dialplans/resources/classes/dialplan.php
@@ -124,7 +124,7 @@
 					$array['dialplans'][0]['dialplan_description'] = $this->dialplan_description;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_add', 'temp');
 
 				//execute insert
@@ -156,7 +156,7 @@
 					$array['dialplans'][0]['dialplan_description'] = $this->dialplan_description;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_edit', 'temp');
 
 				//execute update
@@ -452,7 +452,7 @@
 								} //end foreach $xml_list
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('dialplan_add', 'temp');
 								$p->add('dialplan_edit', 'temp');
 								$p->add('dialplan_detail_add', 'temp');
@@ -1065,7 +1065,7 @@
 									$array['dialplans'][$x]['dialplan_xml'] = $value;
 
 									//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_edit', 'temp');
 
 									//execute update
@@ -1188,7 +1188,7 @@
 								if (!empty($array)) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_delete', 'temp');
 										$p->add('dialplan_detail_delete', 'temp');
 
@@ -1290,7 +1290,7 @@
 								if (!empty($array)) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_detail_delete', 'temp');
 
 									//execute delete
@@ -1395,7 +1395,7 @@
 								if (!empty($array)) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_edit', 'temp');
 
 									//save the array
@@ -1546,7 +1546,7 @@
 								if (!empty($array)) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_detail_add', 'temp');
 
 									//save the array
diff --git a/app/email_queue/resources/jobs/email_queue.php b/app/email_queue/resources/jobs/email_queue.php
old mode 100644
new mode 100755
index c5cd45d13b..9e1d3952eb
--- a/app/email_queue/resources/jobs/email_queue.php
+++ b/app/email_queue/resources/jobs/email_queue.php
@@ -138,9 +138,8 @@
 
     //process the messages
     if (is_array($email_queue) && @sizeof($email_queue) != 0) {
-	$which_php = exec('which php');
         foreach($email_queue as $row) {
-            $command = $which_php." ".$_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/jobs/email_send.php ";
+            $command = PHP_BINARY." ".$_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/jobs/email_send.php ";
             $command .= "'action=send&email_queue_uuid=".$row["email_queue_uuid"]."&hostname=".$hostname."'";
             if (isset($debug)) {
                 //run process inline to see debug info
diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php
old mode 100644
new mode 100755
index 5eb99db1b1..0b116a691c
--- a/app/email_queue/resources/jobs/email_send.php
+++ b/app/email_queue/resources/jobs/email_send.php
@@ -49,12 +49,20 @@
 		//check to see if the process is running
 		if (file_exists($file)) {
 			$pid = file_get_contents($file);
-			if (posix_getsid($pid) === false) {
-				//process is not running
-				$exists = false;
+			if (function_exists('posix_getsid')) {
+				//check if the process is running
+				$pid = posix_getsid($pid);
+				if ($pid === null || $pid === 0) {
+					//process is not running
+					$exists = false;
+				}
+				else {
+					//process is running
+					$exists = true;
+				}
 			}
 			else {
-				//process is running
+				//file exists assume the pid is running
 				$exists = true;
 			}
 		}
@@ -443,7 +451,7 @@
 			$array['email_queue'][0]['email_status'] = 'sent';
 
 		//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('email_queue_add', 'temp');
 			$p->add('email_queue_update', 'temp');
 		//execute insert
@@ -474,7 +482,7 @@
 		$array['email_queue'][0]['email_status'] = 'failed';
 
 		//grant temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('email_queue_add', 'temp');
 
 		//execute insert
@@ -528,7 +536,7 @@
 					$array['email_logs'][0]['status'] = 'failed';
 					$array['email_logs'][0]['email'] = str_replace("'", "''", $msg);
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('email_log_add', 'temp');
 				//execute insert
 					$database->app_name = 'v_mailto';
@@ -571,4 +579,3 @@
 
 	//fwrite($esl, $content);
 	//fclose($esl);
-
diff --git a/app/email_queue/resources/service/email_queue.php b/app/email_queue/resources/service/email_queue.php
index 5385b77325..06f2c3d6c0 100644
--- a/app/email_queue/resources/service/email_queue.php
+++ b/app/email_queue/resources/service/email_queue.php
@@ -51,7 +51,7 @@
 		if (file_exists($file)) {
 			$pid = file_get_contents($file);
 			if (function_exists('posix_getsid')) {
-				if (posix_getsid($pid) === false) { 
+				if (posix_getsid($pid) === false) {
 					//process is not running
 					$exists = false;
 				}
@@ -95,12 +95,12 @@
 	}
 
 //make sure the /var/run/fusionpbx directory exists
-    if (!file_exists('/var/run/fusionpbx')) {
-        $result = mkdir('/var/run/fusionpbx', 0777, true);
-        if (!$result) {
-            die('Failed to create /var/run/fusionpbx');
-        }
-    }
+	if (!file_exists('/var/run/fusionpbx')) {
+		$result = mkdir('/var/run/fusionpbx', 0777, true);
+		if (!$result) {
+			die('Failed to create /var/run/fusionpbx');
+		}
+	}
 
 //create the process id file if the process doesn't exist
 	if (!$pid_exists) {
@@ -152,7 +152,7 @@
 		//process the messages
 		if (is_array($email_queue) && @sizeof($email_queue) != 0) {
 			foreach($email_queue as $row) {
-				$command = exec('which php')." ".$_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/jobs/email_send.php ";
+				$command = PHP_BINARY." ".$_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/jobs/email_send.php ";
 				$command .= "'action=send&email_queue_uuid=".$row["email_queue_uuid"]."&hostname=".$hostname."'";
 				if (isset($debug)) {
 					//run process inline to see debug info
@@ -162,7 +162,7 @@
 				}
 				else {
 					//starts process rapidly doesn't wait for previous process to finish (used for production)
-					$handle = popen($command." > /dev/null &", 'r'); 
+					$handle = popen($command." > /dev/null &", 'r');
 					echo "'$handle'; " . gettype($handle) . "\n";
 					$read = fread($handle, 2096);
 					echo $read;
diff --git a/app/email_templates/app_defaults.php b/app/email_templates/app_defaults.php
index b860794f1a..de95aa70ab 100644
--- a/app/email_templates/app_defaults.php
+++ b/app/email_templates/app_defaults.php
@@ -579,7 +579,7 @@
 		//add the missing email templates
 		if (!empty($array['email_templates'])) {
 			//add the temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("email_template_add", 'temp');
 			$p->add("email_template_edit", 'temp');
 
diff --git a/app/event_guard/resources/dashboard/config.php b/app/event_guard/resources/dashboard/config.php
index 6e5ec741fd..49d060ee1d 100644
--- a/app/event_guard/resources/dashboard/config.php
+++ b/app/event_guard/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'e95f0221-d956-4baf-90c5-e38e16a20a4
 $array['dashboard'][$x]['dashboard_name'] = 'Event Guard';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-person-military-pointing';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#5D5CE3';
 $array['dashboard'][$x]['dashboard_url'] = '/app/event_guard/event_guard_logs.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -17,9 +18,9 @@ $array['dashboard'][$x]['dashboard_heading_text_color'] = '';
 $array['dashboard'][$x]['dashboard_heading_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_heading_background_color'] = '';
 $array['dashboard'][$x]['dashboard_heading_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#5D5CE3';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/event_guard/resources/service/event_guard.php b/app/event_guard/resources/service/event_guard.php
index 45c269bdac..b916d578df 100644
--- a/app/event_guard/resources/service/event_guard.php
+++ b/app/event_guard/resources/service/event_guard.php
@@ -229,7 +229,7 @@
 					$x++;
 				}
 				if (is_array($array)) {
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('event_guard_log_edit', 'temp');
 					$database->app_name = 'event guard';
 					$database->app_uuid = 'c5b86612-1514-40cb-8e2c-3f01a8f6f637';
@@ -349,7 +349,7 @@
 		$array['event_guard_logs'][0]['extension'] = $event['to-user'].'@'.$event['to-host'];
 		$array['event_guard_logs'][0]['user_agent'] = $event['user-agent'];
 		$array['event_guard_logs'][0]['log_status'] = 'blocked';
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('event_guard_log_add', 'temp');
 		$database->app_name = 'event guard';
 		$database->app_uuid = 'c5b86612-1514-40cb-8e2c-3f01a8f6f637';
diff --git a/app/extensions/app_defaults.php b/app/extensions/app_defaults.php
index b22e77551f..c4884a9819 100644
--- a/app/extensions/app_defaults.php
+++ b/app/extensions/app_defaults.php
@@ -50,7 +50,7 @@
 					}
 				}
 				if (is_array($array) && @sizeof($array) != 0) {
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('extension_edit', 'temp');
 
 					$database->app_name = 'extensions';
@@ -69,7 +69,7 @@
 			$sql .= "where default_setting_category = 'security' ";
 			$sql .= "and default_setting_subcategory like 'password_%' ";
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('default_setting_edit', 'temp');
 
 			$database->execute($sql);
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index c927d4e81c..8542c3430b 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -261,7 +261,7 @@
 			$array['extension_users'][0]['user_uuid'] = $user_uuid;
 
 		//add temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('extension_user_delete', 'temp');
 
 		//save the array
@@ -288,7 +288,7 @@
 				$array['device_lines'][0]['device_line_uuid'] = $device_line_uuid;
 
 			//add temporary permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('device_line_delete', 'temp');
 
 			//save the array
@@ -1061,6 +1061,9 @@
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
+//set the back button
+	$_SESSION['call_forward_back'] = $_SERVER['PHP_SELF']  . "?id=$extension_uuid";
+
 //begin the page content
 	require_once "resources/header.php";
 	if ($action == "update") {
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 6736481c84..8a8eab1afa 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -153,7 +153,7 @@ if (!class_exists('extension')) {
 					//build update array
 						$array['voicemails'][0]['voicemail_uuid'] = $voicemail_uuid;
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('voicemail_edit', 'temp');
 				}
 				else {
@@ -161,7 +161,7 @@ if (!class_exists('extension')) {
 						$array['voicemails'][0]['voicemail_uuid'] = uuid();
 						$array['voicemails'][0]['domain_uuid'] = $this->domain_uuid;
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('voicemail_add', 'temp');
 				}
 				if (is_array($array) && @sizeof($array) != 0) {
@@ -639,7 +639,7 @@ if (!class_exists('extension')) {
 									}
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('extension_user_delete', 'temp');
 									$p->add('follow_me_delete', 'temp');
 									$p->add('follow_me_destination_delete', 'temp');
@@ -743,7 +743,7 @@ if (!class_exists('extension')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('extension_edit', 'temp');
 
 								//save the array
diff --git a/app/extensions/resources/dashboard/caller_id.php b/app/extensions/resources/dashboard/caller_id.php
index 19ed5e7813..9f6e6929cf 100644
--- a/app/extensions/resources/dashboard/caller_id.php
+++ b/app/extensions/resources/dashboard/caller_id.php
@@ -89,7 +89,7 @@
 					$array_temp = $array;
 
 				//add the dialplan permission
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("extension_edit", "temp");
 
 				//save to the data
diff --git a/app/extensions/resources/dashboard/config.php b/app/extensions/resources/dashboard/config.php
index fbd82ae049..ed8eff5fb1 100644
--- a/app/extensions/resources/dashboard/config.php
+++ b/app/extensions/resources/dashboard/config.php
@@ -26,6 +26,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '4b7b6652-7e5f-48d3-987e-971053f093a
 $array['dashboard'][$x]['dashboard_name'] = 'Extensions';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-suitcase';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/extensions/extensions.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -39,9 +40,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php
index b32e6ace46..3672fbc934 100644
--- a/app/fax/app_defaults.php
+++ b/app/fax/app_defaults.php
@@ -202,7 +202,7 @@
 		//add the missing email templates
 		if (!empty($array['email_templates'])) {
 			//add the temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("email_template_add", 'temp');
 			$p->add("email_template_edit", 'temp');
 
diff --git a/app/fax/fax_advanced.php b/app/fax/fax_advanced.php
index b97e3e3ad4..73af5df487 100644
--- a/app/fax/fax_advanced.php
+++ b/app/fax/fax_advanced.php
@@ -135,7 +135,7 @@
 				//execute
 					if (isset($array) && is_array($array)) {
 						//assign temp permission
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('fax_add', 'temp');
 						$p->add('fax_edit', 'temp');
 
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 1a8af19be7..dec3752933 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -107,7 +107,7 @@
 			$array['fax'][0]['fax_description'] = $fax_description;
 
 		//execute insert
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('fax_add', 'temp');
 
 			$database = new database;
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 5c4fe9a2c8..b135d935c7 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -175,7 +175,7 @@
 			$array['fax_users'][0]['fax_uuid'] = $fax_uuid;
 			$array['fax_users'][0]['user_uuid'] = $user_uuid;
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('fax_user_delete', 'temp');
 
 			$database = new database;
@@ -203,7 +203,7 @@
 			$array['fax_users'][0]['fax_uuid'] = $fax_uuid;
 			$array['fax_users'][0]['user_uuid'] = $user_uuid;
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('fax_user_add', 'temp');
 
 			$database = new database;
@@ -303,7 +303,7 @@
 						$array['fax'][0]['dialplan_uuid'] = $dialplan_uuid;
 
 					//assign temp permission
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('fax_add', 'temp');
 
 					//set the dialplan action
@@ -315,7 +315,7 @@
 						$array['fax'][0]['fax_uuid'] = $fax_uuid;
 
 					//assign temp permission
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('fax_edit', 'temp');
 				}
 
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 33c4fcd59d..fff0a9d60f 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -836,7 +836,7 @@ if (!function_exists('fax_split_dtmf')) {
 				$array['fax_queue'][0]['fax_command'] = 'originate '.$dial_string;
 
 				//add temporary permisison
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('fax_queue_add', 'temp');
 
 				//save the data
diff --git a/app/fax/resources/classes/fax.php b/app/fax/resources/classes/fax.php
index 0096bcfb15..d3b6b8748d 100644
--- a/app/fax/resources/classes/fax.php
+++ b/app/fax/resources/classes/fax.php
@@ -99,7 +99,7 @@ if (!class_exists('fax')) {
 						$array['dialplan_details'][0]['domain_uuid'] = $this->domain_uuid;
 
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('dialplan_detail_delete', 'temp');
 
 					//execute delete
@@ -166,7 +166,7 @@ if (!class_exists('fax')) {
 				$array['dialplans'][] = $dialplan;
 
 			//add the dialplan permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("dialplan_add", 'temp');
 				$p->add("dialplan_detail_add", 'temp');
 				$p->add("dialplan_edit", 'temp');
@@ -312,7 +312,7 @@ if (!class_exists('fax')) {
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('fax_delete', 'temp');
 									$p->add('fax_user_delete', 'temp');
 									$p->add('fax_file_delete', 'temp');
@@ -625,7 +625,7 @@ if (!class_exists('fax')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('fax_add', 'temp');
 									$p->add('dialplan_add', 'temp');
 
diff --git a/app/fax/resources/dashboard/config.php b/app/fax/resources/dashboard/config.php
index 11888f256a..f769641f90 100644
--- a/app/fax/resources/dashboard/config.php
+++ b/app/fax/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'ea3f5a8a-fc93-47d7-a632-a733522affc
 $array['dashboard'][$x]['dashboard_name'] = 'Fax Server';
 $array['dashboard'][$x]['dashboard_path'] = 'core/dashboard/resources/dashboard/icon.php';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-print';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#5D5CE3';
 $array['dashboard'][$x]['dashboard_url'] = '/app/fax/fax.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#5d5ce3';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/fax/resources/functions/parse_message.php b/app/fax/resources/functions/parse_message.php
index b4d241ba06..6e987457d6 100644
--- a/app/fax/resources/functions/parse_message.php
+++ b/app/fax/resources/functions/parse_message.php
@@ -47,7 +47,11 @@ function parse_message_decode_text($connection, &$part, $message_number, $id, $o
 			}
 		}
 		if($charset){
-			$msg = mb_convert_encoding($msg, $to_charset, $charset);
+			if ($charset === 'windows-1256') {
+				$msg = iconv('windows-1256', 'utf-8', $msg);
+			} else {
+				$msg = mb_convert_encoding($msg, $to_charset, $charset);
+			}
 		}
 		$msg = trim($msg);
 	}
diff --git a/app/fax_queue/resources/job/fax_queue.php b/app/fax_queue/resources/job/fax_queue.php
index 60a113b21c..b08ffcde96 100644
--- a/app/fax_queue/resources/job/fax_queue.php
+++ b/app/fax_queue/resources/job/fax_queue.php
@@ -151,7 +151,7 @@
 //process the messages
 	if (is_array($fax_queue) && @sizeof($fax_queue) != 0) {
 		foreach($fax_queue as $row) {
-			$command = exec('which php')." ".$_SERVER['DOCUMENT_ROOT']."/app/fax_queue/resources/job/fax_send.php ";
+			$command = PHP_BINARY." ".$_SERVER['DOCUMENT_ROOT']."/app/fax_queue/resources/job/fax_send.php ";
 			$command .= "'action=send&fax_queue_uuid=".$row["fax_queue_uuid"]."&hostname=".$hostname."&debug=true'";
 			if (isset($debug)) {
 				//run process inline to see debug info
diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php
index 4815f65eef..b48a9e0674 100644
--- a/app/fax_queue/resources/job/fax_send.php
+++ b/app/fax_queue/resources/job/fax_send.php
@@ -390,7 +390,7 @@
 				$array['fax_queue'][0]['fax_response'] = $fax_response;
 
 				//add temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('fax_queue_edit', 'temp');
 
 				//save the data
@@ -605,7 +605,7 @@
 			$array['fax_queue'][0]['fax_notify_date'] = 'now()';
 
 		//add temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('fax_queue_edit', 'temp');
 
 		//save the data
diff --git a/app/fax_queue/resources/service/fax_queue.php b/app/fax_queue/resources/service/fax_queue.php
index 22df8fd69b..6084254ebf 100644
--- a/app/fax_queue/resources/service/fax_queue.php
+++ b/app/fax_queue/resources/service/fax_queue.php
@@ -181,7 +181,7 @@
 		//process the messages
 			if (is_array($fax_queue) && @sizeof($fax_queue) != 0) {
 				foreach($fax_queue as $row) {
-					$command = exec('which php')." ".$_SERVER['DOCUMENT_ROOT']."/app/fax_queue/resources/job/fax_send.php ";
+					$command = PHP_BINARY." ".$_SERVER['DOCUMENT_ROOT']."/app/fax_queue/resources/job/fax_send.php ";
 					$command .= "'action=send&fax_queue_uuid=".$row["fax_queue_uuid"]."&hostname=".$hostname."'";
 					if (isset($debug)) {
 						//run process inline to see debug info
diff --git a/app/fifo/fifo_edit.php b/app/fifo/fifo_edit.php
index 58fcc33505..0087904d74 100644
--- a/app/fifo/fifo_edit.php
+++ b/app/fifo/fifo_edit.php
@@ -242,7 +242,7 @@
 			}
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/fifo/resources/classes/fifo.php b/app/fifo/resources/classes/fifo.php
index 415b174a2c..4338f3f48e 100644
--- a/app/fifo/resources/classes/fifo.php
+++ b/app/fifo/resources/classes/fifo.php
@@ -111,7 +111,7 @@ if (!class_exists('fifo')) {
 						//delete the checked rows
 							if (is_array($array) && @sizeof($array) != 0) {
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('fifo_member_delete', 'temp');
 									$p->add('dialplan_delete', 'temp');
 
@@ -261,7 +261,7 @@ if (!class_exists('fifo')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('fifo_member_add', 'temp');
 
 								//save the array
diff --git a/app/ivr_menus/app_defaults.php b/app/ivr_menus/app_defaults.php
index c79980b75d..4df19f5b75 100644
--- a/app/ivr_menus/app_defaults.php
+++ b/app/ivr_menus/app_defaults.php
@@ -54,7 +54,7 @@ if ($domains_processed == 1) {
 		}
 		if (!empty($array)) {
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('ivr_menu_edit', 'temp');
 
 			$database->app_name = 'ivr_menus';
diff --git a/app/ivr_menus/ivr_menu_copy.php b/app/ivr_menus/ivr_menu_copy.php
index 02f1e702b7..830a9c577c 100644
--- a/app/ivr_menus/ivr_menu_copy.php
+++ b/app/ivr_menus/ivr_menu_copy.php
@@ -151,7 +151,7 @@
 			$array['dialplans'] = $dialplan;
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index 7467683fbc..68b076b4c2 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -401,7 +401,7 @@
 					$array['dialplans'][0]["app_uuid"] = "a5788e9b-58bc-bd1b-df59-fff5d51253ab";
 
 				//add the dialplan permission
-					$p = new permissions;
+					$p = permissions::new();
 					if ($action == "add") {
 						$p->add("dialplan_add", "temp");
 					}
diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php
index 734200becf..50a0fde239 100644
--- a/app/ivr_menus/resources/classes/ivr_menu.php
+++ b/app/ivr_menus/resources/classes/ivr_menu.php
@@ -139,7 +139,7 @@ if (!class_exists('ivr_menu')) {
 						if (!empty($array)) {
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('ivr_menu_option_delete', 'temp');
 								$p->add('dialplan_delete', 'temp');
 
@@ -312,7 +312,7 @@ if (!class_exists('ivr_menu')) {
 						if (!empty($array)) {
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('dialplan_edit', 'temp');
 
 							//save the array
@@ -459,7 +459,7 @@ if (!class_exists('ivr_menu')) {
 						if (!empty($array)) {
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('ivr_menu_option_add', 'temp');
 								$p->add('dialplan_add', 'temp');
 
@@ -471,7 +471,7 @@ if (!class_exists('ivr_menu')) {
 								unset($array);
 
 							//revoke temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->delete('ivr_menu_option_add', 'temp');
 								$p->delete('dialplan_add', 'temp');
 
diff --git a/app/ivr_menus/resources/dashboard/config.php b/app/ivr_menus/resources/dashboard/config.php
index feae19b377..f3ea72026d 100644
--- a/app/ivr_menus/resources/dashboard/config.php
+++ b/app/ivr_menus/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '3af7af65-7861-4d05-a0bc-36d704458fa
 $array['dashboard'][$x]['dashboard_name'] = 'IVR Menus';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-diagram-project';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/ivr_menus/ivr_menus.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/modules/resources/classes/modules.php b/app/modules/resources/classes/modules.php
index f158c06454..28b83949e0 100644
--- a/app/modules/resources/classes/modules.php
+++ b/app/modules/resources/classes/modules.php
@@ -743,7 +743,7 @@ if (!class_exists('modules')) {
 					}
 					if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('module_add', 'temp');
 						//execute insert
 							$database = new database;
diff --git a/app/music_on_hold/app_defaults.php b/app/music_on_hold/app_defaults.php
index c3c34f624a..bd9bf7f0e1 100644
--- a/app/music_on_hold/app_defaults.php
+++ b/app/music_on_hold/app_defaults.php
@@ -93,7 +93,7 @@ if ($domains_processed == 1) {
 							$array['music_on_hold'][0]['music_on_hold_chime_max'] = isset($chime_max) ? $chime_max : null;
 							$array['music_on_hold'][0]['music_on_hold_path'] = $stream_path;
 
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('music_on_hold_add', 'temp');
 
 							$database->app_name = 'app_name';
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index ad267a2651..95c4443a81 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -272,7 +272,7 @@
 						$array['music_on_hold'][0]['music_on_hold_chime_freq'] = null;
 						$array['music_on_hold'][0]['music_on_hold_chime_max'] = null;
 
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('music_on_hold_add', 'temp');
 
 						$database = new database;
diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php
index 99d778d5f9..71d628eca2 100644
--- a/app/music_on_hold/resources/classes/switch_music_on_hold.php
+++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php
@@ -301,7 +301,7 @@ if (!class_exists('switch_music_on_hold')) {
 				//view_array($array, false);
 
 			//save the data
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('music_on_hold_add', 'temp');
 
 				$database = new database;
diff --git a/app/number_translations/resources/classes/number_translations.php b/app/number_translations/resources/classes/number_translations.php
index 7ff7ff2396..22a2836401 100644
--- a/app/number_translations/resources/classes/number_translations.php
+++ b/app/number_translations/resources/classes/number_translations.php
@@ -119,7 +119,7 @@ if (!class_exists('number_translations')) {
 							}
 						}
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('number_translation_add', 'temp');
 						$p->add('number_translation_detail_add', 'temp');
 					//execute insert
@@ -176,7 +176,7 @@ if (!class_exists('number_translations')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('number_translation_detail_delete', 'temp');
 
 								//execute delete
@@ -390,7 +390,7 @@ if (!class_exists('number_translations')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('number_translation_detail_add', 'temp');
 
 								//save the array
diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php
index 4134b887f4..e2b0f79571 100644
--- a/app/phrases/app_defaults.php
+++ b/app/phrases/app_defaults.php
@@ -83,7 +83,7 @@ if ($domains_processed == 1) {
 						$array['phrase_details'][$index]['phrase_detail_data'] = $phrase_detail_data;
 				}
 				if (is_array($array) && @sizeof($array) != 0) {
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('phrase_detail_edit', 'temp');
 
 					$database->app_name = 'phrases';
@@ -119,7 +119,7 @@ if ($domains_processed == 1) {
 						$array['phrase_details'][$index]['phrase_detail_data'] = $phrase_detail_data;
 				}
 				if (!empty($array)) {
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('phrase_detail_edit', 'temp');
 
 					$database->app_name = 'phrases';
diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php
index 050251f5ad..00b632083a 100644
--- a/app/phrases/phrase_edit.php
+++ b/app/phrases/phrase_edit.php
@@ -160,7 +160,7 @@
 						}
 
 					//execute insert
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('phrase_detail_add', 'temp');
 
 						$database = new database;
@@ -224,7 +224,7 @@
 						}
 
 					//execute update/insert
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('phrase_detail_add', 'temp');
 
 						$database = new database;
diff --git a/app/phrases/resources/classes/phrases.php b/app/phrases/resources/classes/phrases.php
index cee405e23b..2ed6f0f893 100644
--- a/app/phrases/resources/classes/phrases.php
+++ b/app/phrases/resources/classes/phrases.php
@@ -122,7 +122,7 @@ if (!class_exists('phrases')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('phrase_detail_delete', 'temp');
 
 								//execute delete
@@ -204,7 +204,7 @@ if (!class_exists('phrases')) {
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('phrase_detail_delete', 'temp');
 
 								//execute delete
@@ -398,7 +398,7 @@ if (!class_exists('phrases')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('phrase_detail_add', 'temp');
 
 								//save the array
diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php
index ad2ff01dde..7f4b1a8368 100644
--- a/app/provision/app_defaults.php
+++ b/app/provision/app_defaults.php
@@ -43,7 +43,7 @@ if ($domains_processed == 1) {
 				$array['devices'][0]['device_uuid'] = $device_uuid;
 				$array['devices'][0]['device_address'] = $device_address;
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('device_add', 'temp');
 			//execute update
 				$database->app_name = 'provision';
@@ -67,7 +67,7 @@ if ($domains_processed == 1) {
 			$array['default_settings'][$x]['default_setting_enabled'] = 'true';
 
 		//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('default_setting_edit', 'temp');
 
 		//execute update
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 975447bfaf..bd6cc5ea71 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -548,7 +548,7 @@
 								$array['devices'][$x]['device_description'] = $_SERVER['HTTP_USER_AGENT'];
 
 								//add the dialplan permission
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add("device_add", "temp");
 								$p->add("device_edit", "temp");
 
diff --git a/app/recordings/app_defaults.php b/app/recordings/app_defaults.php
index ab68392e75..284b3aff7e 100644
--- a/app/recordings/app_defaults.php
+++ b/app/recordings/app_defaults.php
@@ -60,7 +60,7 @@
 										$array['recordings'][0]['domain_uuid'] = $recording_domain_uuid;
 										$array['recordings'][0]['recording_base64'] = $recording_base64;
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('recording_edit', 'temp');
 									//update recording record with base64
 										$database->app_name = 'recordings';
@@ -109,7 +109,7 @@
 								$array['recordings'][0]['recording_base64'] = null;
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('recording_edit', 'temp');
 
 							//update recording record
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 56d31bd13a..3e73034d64 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -180,7 +180,7 @@
 						$array['recordings'][0]['domain_uuid'] = $domain_uuid;
 						$array['recordings'][0]['recording_base64'] = null;
 					//set temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('recording_edit', 'temp');
 					//execute update
 						$database->app_name = 'recordings';
@@ -217,7 +217,7 @@
 								$array['recordings'][0]['recording_base64'] = $recording_base64;
 							}
 						//set temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('recording_add', 'temp');
 						//execute insert
 							$database->app_name = 'recordings';
@@ -238,7 +238,7 @@
 										$array['recordings'][0]['recording_uuid'] = $found_recording_uuid;
 										$array['recordings'][0]['recording_base64'] = $recording_base64;
 									//set temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('recording_edit', 'temp');
 									//execute update
 										$database->app_name = 'recordings';
diff --git a/app/recordings/resources/dashboard/config.php b/app/recordings/resources/dashboard/config.php
index 9c2779bda0..c0ea2d1d68 100644
--- a/app/recordings/resources/dashboard/config.php
+++ b/app/recordings/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '3d8efe65-49c3-4783-844e-4ebc1c97db6
 $array['dashboard'][$x]['dashboard_name'] = 'Recordings';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-microphone';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/recordings/recordings.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/registrations/resources/dashboard/config.php b/app/registrations/resources/dashboard/config.php
index 700512b15e..c7a08b6a94 100644
--- a/app/registrations/resources/dashboard/config.php
+++ b/app/registrations/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'ce343ebe-3b54-4aad-b7e0-66de02171e7
 $array['dashboard'][$x]['dashboard_name'] = 'Registrations';
 $array['dashboard'][$x]['dashboard_path'] = 'registrations/registrations.php';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-list-check';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#bfbfbf';
 $array['dashboard'][$x]['dashboard_url'] = '/app/registrations/registrations.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '#ffffff';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '#5d5ce3';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/registrations/resources/dashboard/registrations.php b/app/registrations/resources/dashboard/registrations.php
index 401ee88b11..6883af3d3d 100644
--- a/app/registrations/resources/dashboard/registrations.php
+++ b/app/registrations/resources/dashboard/registrations.php
@@ -59,7 +59,7 @@
 	echo "		<span class='hud_title' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\">".escape($dashboard_label)."</span>";
 	echo "		<div style='position: relative; display: inline-block;'>\n";
 	echo "			<span class='hud_stat' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\"><i class=\"fas ".$dashboard_icon."\"></i></span>\n";
-	echo "			<span style=\"background-color: #5d5ce3; color: #ffffff; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 22px; left: 25px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$active_registrations." / ".($active_registrations + $inactive_registrations)."</span>\n";
+	echo "			<span style=\"background-color: ".($row['dashboard_number_background_color'] ?? '#5d5ce3')."; color: ".($row['dashboard_number_text_color'] ?? '#ffffff')."; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 22px; left: 25px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$active_registrations." / ".($active_registrations + $inactive_registrations)."</span>\n";
 	echo "		</div>\n";
 	echo "	</div>\n";
 	if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
diff --git a/app/ring_groups/app_defaults.php b/app/ring_groups/app_defaults.php
index ac375ad34c..2ee2a67d66 100644
--- a/app/ring_groups/app_defaults.php
+++ b/app/ring_groups/app_defaults.php
@@ -49,7 +49,7 @@ if ($domains_processed == 1) {
 		}
 		if (is_array($array) && @sizeof($array) != 0) {
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('ring_group_edit', 'temp');
 			//execute update
 				$database->app_name = 'ring_groups';
diff --git a/app/ring_groups/resources/classes/ring_groups.php b/app/ring_groups/resources/classes/ring_groups.php
index 46a2c4adc5..ceab17b711 100644
--- a/app/ring_groups/resources/classes/ring_groups.php
+++ b/app/ring_groups/resources/classes/ring_groups.php
@@ -125,7 +125,7 @@ if (!class_exists('ring_groups')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('ring_group_user_delete', 'temp');
 									$p->add('ring_group_destination_delete', 'temp');
 									$p->add('dialplan_delete', 'temp');
@@ -305,7 +305,7 @@ if (!class_exists('ring_groups')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_edit', 'temp');
 
 								//save the array
@@ -472,7 +472,7 @@ if (!class_exists('ring_groups')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('ring_group_user_add', 'temp');
 									$p->add('ring_group_destination_add', 'temp');
 									$p->add("dialplan_add", "temp");
diff --git a/app/ring_groups/resources/dashboard/config.php b/app/ring_groups/resources/dashboard/config.php
index 790d472815..264a39606c 100644
--- a/app/ring_groups/resources/dashboard/config.php
+++ b/app/ring_groups/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'b5da1d72-2cc7-422e-b05c-f07659aed41
 $array['dashboard'][$x]['dashboard_name'] = 'Ring Group Forward';
 $array['dashboard'][$x]['dashboard_path'] = 'ring_groups/ring_group_forward';
 $array['dashboard'][$x]['dashboard_icon'] = '';
+$array['dashboard'][$x]['dashboard_icon_color'] = '0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/ring_groups/resources/dashboard/ring_group_forward.php b/app/ring_groups/resources/dashboard/ring_group_forward.php
index 90bdee4429..2e99ad6d5d 100644
--- a/app/ring_groups/resources/dashboard/ring_group_forward.php
+++ b/app/ring_groups/resources/dashboard/ring_group_forward.php
@@ -83,7 +83,7 @@
 
 		if (is_array($array) && sizeof($array) != 0) {
 			//update ring group
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('ring_group_edit', 'temp');
 
 				$database->app_name = 'ring_groups';
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 4df3cb45ff..8f85007173 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -114,7 +114,7 @@
 			$array['ring_group_users'][0]['user_uuid'] = $user_uuid;
 
 			//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('ring_group_user_delete', 'temp');
 
 			//execute delete
@@ -252,7 +252,7 @@
 		$array['ring_group_users'][0]['user_uuid'] = $user_uuid;
 
 		//grant temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('ring_group_user_add', 'temp');
 
 		//execute delete
@@ -492,7 +492,7 @@
 			$array["dialplans"][0]["app_uuid"] = "1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2";
 
 		//add the dialplan permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("dialplan_add", "temp");
 			$p->add("dialplan_edit", "temp");
 
diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php
index 662f1a2930..bad35f898c 100644
--- a/app/sip_profiles/app_defaults.php
+++ b/app/sip_profiles/app_defaults.php
@@ -120,7 +120,7 @@
 				//execute inserts
 					if (!empty($array)) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('sip_profile_add', 'temp');
 							$p->add('sip_profile_domain_add', 'temp');
 							$p->add('sip_profile_setting_add', 'temp');
@@ -198,7 +198,7 @@
 				//execute inserts
 					if (!empty($array)) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('sip_profile_domain_add', 'temp');
 
 						//execute insert
diff --git a/app/sip_profiles/resources/classes/sip_profiles.php b/app/sip_profiles/resources/classes/sip_profiles.php
index 82470a40dd..5d90bb5de8 100644
--- a/app/sip_profiles/resources/classes/sip_profiles.php
+++ b/app/sip_profiles/resources/classes/sip_profiles.php
@@ -116,7 +116,7 @@ if (!class_exists('sip_profiles')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('sip_profile_domain_delete', 'temp');
 									$p->add('sip_profile_setting_delete', 'temp');
 
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 7f59589ae3..e5bc167991 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -206,7 +206,7 @@
 			}
 
 		//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('sip_profile_domain_add', 'temp');
 			$p->add('sip_profile_setting_add', 'temp');
 
diff --git a/app/sofia_global_settings/app_defaults.php b/app/sofia_global_settings/app_defaults.php
index f9842a83b3..00b44a05b8 100644
--- a/app/sofia_global_settings/app_defaults.php
+++ b/app/sofia_global_settings/app_defaults.php
@@ -69,7 +69,7 @@ if ($domains_processed == 1) {
 	//add settings that are not in the database
 		if (!empty($array)) {
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('sofia_global_setting_add', 'temp');
 
 			//execute insert
diff --git a/app/time_conditions/resources/classes/time_conditions.php b/app/time_conditions/resources/classes/time_conditions.php
index ef82061a9b..98a5e757df 100644
--- a/app/time_conditions/resources/classes/time_conditions.php
+++ b/app/time_conditions/resources/classes/time_conditions.php
@@ -100,7 +100,7 @@
 								if (is_array($array) && @sizeof($array) != 0) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_delete', 'temp');
 										$p->add('dialplan_detail_delete', 'temp');
 
@@ -193,7 +193,7 @@
 								if (is_array($array) && @sizeof($array) != 0) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_edit', 'temp');
 
 									//save the array
@@ -310,7 +310,7 @@
 								if (is_array($array) && @sizeof($array) != 0) {
 
 									//grant temporary permissions
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_add', 'temp');
 										$p->add('dialplan_detail_add', 'temp');
 
diff --git a/app/time_conditions/resources/dashboard/config.php b/app/time_conditions/resources/dashboard/config.php
index d0bbe04dea..2e5d3507bd 100644
--- a/app/time_conditions/resources/dashboard/config.php
+++ b/app/time_conditions/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'e9f06ed4-ddfc-4611-b246-fdeab36a49c
 $array['dashboard'][$x]['dashboard_name'] = 'Time Conditions';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-clock';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/time_conditions/time_conditions.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color'] = '';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 0153342a0f..ff4761d5b2 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -153,7 +153,7 @@
 					$array['dialplans'][0]['dialplan_context'] = $dialplan_context;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_add', 'temp');
 			}
 			else if ($action == "update") {
@@ -161,7 +161,7 @@
 					$array['dialplan_details'][0]['dialplan_uuid'] = $dialplan_uuid;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_detail_delete', 'temp');
 
 				//execute delete
@@ -182,7 +182,7 @@
 					}
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_edit', 'temp');
 			}
 
@@ -481,7 +481,7 @@
 		//execute query
 			if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('dialplan_detail_add', 'temp');
 					$p->add('dialplan_detail_edit', 'temp');
 
diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php
index d817af3846..48297dfe0d 100644
--- a/app/vars/app_defaults.php
+++ b/app/vars/app_defaults.php
@@ -95,7 +95,7 @@ if ($domains_processed == 1) {
 				}
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("var_add", "temp");
 				$p->add("var_edit", "temp");
 
@@ -194,7 +194,7 @@ if ($domains_processed == 1) {
 
 				if (!empty($array)) {
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add("var_add", "temp");
 
 					//execute inserts
diff --git a/app/voicemail_greetings/app_defaults.php b/app/voicemail_greetings/app_defaults.php
index 98e8c34501..244172c14d 100644
--- a/app/voicemail_greetings/app_defaults.php
+++ b/app/voicemail_greetings/app_defaults.php
@@ -52,7 +52,7 @@ if ($domains_processed == 1) {
 		}
 		if (!empty($array)) {
 			//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('voicemail_greeting_edit', 'temp');
 
 			//execute
@@ -104,7 +104,7 @@ if ($domains_processed == 1) {
 			}
 			if (!empty($array)) {
 				//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_greeting_edit', 'temp');
 
 				//execute update
@@ -151,7 +151,7 @@ if ($domains_processed == 1) {
 			}
 			if (!empty($array)) {
 				//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_greeting_edit', 'temp');
 
 				//execute update
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index b5e7cd7357..93a5674dac 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -223,7 +223,7 @@
 			if (is_array($array) && @sizeof($array) != 0) {
 
 				//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_greeting_add', 'temp');
 				$p->add('voicemail_greeting_edit', 'temp');
 
diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php
index 8b612ecdc4..771d07ed97 100644
--- a/app/voicemails/resources/classes/voicemail.php
+++ b/app/voicemails/resources/classes/voicemail.php
@@ -313,8 +313,7 @@
 
 			//update the array with additional information
 				if (is_array($result)) {
-					$i = 0;
-					foreach ($result as $row) {
+					foreach ($result as $i => $row) {
 						//set the greeting directory
 						$path = $this->settings->get('switch', 'voicemail', '/var/lib/freeswitch/storage').'/default/'.$_SESSION['domain_name'].'/'.$row['voicemail_id'];
 						if (file_exists($path.'/msg_'.$row['voicemail_message_uuid'].'.wav')) {
@@ -323,17 +322,16 @@
 						if (file_exists($path.'/msg_'.$row['voicemail_message_uuid'].'.mp3')) {
 							$result[$i]['file_path'] = $path.'/msg_'.$row['voicemail_message_uuid'].'.mp3';
 						}
-						$result[$i]['file_size'] = filesize($row['file_path'] ?? '');
-						$result[$i]['file_size_label'] = byte_convert($row['file_size'] ?? 0);
-						$result[$i]['file_ext'] = substr($row['file_path'] ?? '', -3);
+						$result[$i]['file_size'] = filesize($result[$i]['file_path'] ?? '');
+						$result[$i]['file_size_label'] = byte_convert($result[$i]['file_size'] ?? 0);
+						$result[$i]['file_ext'] = substr($result[$i]['file_path'] ?? '', -3);
 
 						$message_minutes = floor($row['message_length'] / 60);
 						$message_seconds = $row['message_length'] % 60;
 
 						//use International System of Units (SI) - Source: https://en.wikipedia.org/wiki/International_System_of_Units
-						$result[$i]['message_length_label'] = ($message_minutes > 0 ? $message_minutes.' min' : null).($message_seconds > 0 ? ' '.$message_seconds.' s' : null);
+						$result[$i]['message_length_label'] = ($message_minutes > 0 ? $message_minutes.' min' : '').($message_seconds > 0 ? ' '.$message_seconds.' s' : '');
 						$result[$i]['created_date'] = date("j M Y g:i a",$row['created_epoch']);
-						$i;
 					}
 				}
 				else {
@@ -421,7 +419,7 @@
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('voicemail_delete', 'temp');
 									$p->add('voicemail_option_delete', 'temp');
 									$p->add('voicemail_message_delete', 'temp');
@@ -537,7 +535,7 @@
 						//delete the checked rows
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('voicemail_destination_delete', 'temp');
 
 								//execute delete
@@ -708,7 +706,7 @@
 				}
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_message_delete', 'temp');
 
 			//execute delete
@@ -746,7 +744,7 @@
 				$array['voicemail_messages'][0]['message_status'] = $new_status;
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_message_edit', 'temp');
 
 			//execute update
@@ -989,7 +987,7 @@
 			}
 
 			//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('email_queue_add', 'temp');
 			$p->add('email_queue_attachment_add', 'temp');
 
@@ -1094,7 +1092,7 @@
 				if (is_array($array) && @sizeof($array) != 0) {
 
 					//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('voicemail_message_edit', 'temp');
 
 					//execute update
@@ -1134,7 +1132,7 @@
 				$array['voicemail_messages'][0]['message_status'] = 'saved';
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('voicemail_message_edit', 'temp');
 
 			//execute update
diff --git a/app/voicemails/resources/dashboard/config.php b/app/voicemails/resources/dashboard/config.php
index e62cdc84a7..387d3af327 100644
--- a/app/voicemails/resources/dashboard/config.php
+++ b/app/voicemails/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'be2aaa22-d8f1-4d9b-b5f9-14a26da329c
 $array['dashboard'][$x]['dashboard_name'] = 'New Messages';
 $array['dashboard'][$x]['dashboard_path'] = 'voicemails/voicemails';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-envelope';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#bfbfbf';
 $array['dashboard'][$x]['dashboard_url'] = '';
 $array['dashboard'][$x]['dashboard_target'] = '';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '#ffffff';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '#03c04a';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php
index f1e0baaa61..9c5b571c08 100644
--- a/app/voicemails/resources/dashboard/voicemails.php
+++ b/app/voicemails/resources/dashboard/voicemails.php
@@ -111,7 +111,7 @@
 		echo "<span class='hud_content'>\n";
 		echo "<div style='position: relative; display: inline-block;'>\n";
 		echo "		<span class='hud_stat'><i class=\"fas ".$dashboard_icon." \"></i></span>\n";
-		echo "		<span style=\"background-color: #03c04a; color: #ffffff; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$messages['new']."</span>\n";
+		echo "		<span style=\"background-color: ".($row['dashboard_number_background_color'] ?? '#03c04a')."; color: ".($row['dashboard_number_text_color'] ?? '#ffffff')."; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$messages['new']."</span>\n";
 		echo "	</div>\n";
 		echo "</span>";
 	}
@@ -157,4 +157,4 @@
 
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index af6b11ecf5..8ed1b8a675 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -199,7 +199,7 @@
 					$array['voicemails'][0]['voicemail_description'] = $voicemail_description;
 
 				//create permissions object
-					$p = new permissions;
+					$p = permissions::new();
 
 				//add voicemail options
 					if (permission_exists('voicemail_option_add') && sizeof($voicemail_options) > 0) {
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 1753f97565..435a3be647 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -45,6 +45,12 @@
 	$language = new text;
 	$text = $language->get();
 
+//set up database object
+	$database = database::new();
+
+//get the settings
+	$settings = new settings(['database' => $database, 'domain_uuid' => $_SESSION['domain_uuid'] ?? '', 'user_uuid' => $_SESSION['user_uuid'] ?? '']);
+
 //get the http post data
 	if (!empty($_POST['voicemails'])) {
 		$action = $_POST['action'];
@@ -119,18 +125,19 @@
 //prepare to page the results
 	$sql = "select count(voicemail_uuid) from v_voicemails ";
 	$sql .= "where true ";
+	$parameters = null;
 	if ($show != "all" || !permission_exists('voicemail_all')) {
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	}
 	if (!permission_exists('voicemail_domain')) {
-		if (is_array($voicemail_uuids) && @sizeof($voicemail_uuids) != 0) {
+		if (is_array($voicemail_uuids) && sizeof($voicemail_uuids) != 0) {
 			$sql .= "and (";
 			foreach ($voicemail_uuids as $x => $row) {
 				$sql_where_or[] = 'voicemail_uuid = :voicemail_uuid_'.$x;
 				$parameters['voicemail_uuid_'.$x] = $row['voicemail_uuid'];
 			}
-			if (is_array($sql_where_or) && @sizeof($sql_where_or) != 0) {
+			if (is_array($sql_where_or) && sizeof($sql_where_or) != 0) {
 				$sql .= implode(' or ', $sql_where_or);
 			}
 			$sql .= ")";
@@ -140,8 +147,7 @@
 		}
 	}
 	$sql .= $sql_search ?? '';
-	$database = new database;
-	$num_rows = $database->select($sql, $parameters ?? null, 'column');
+	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
@@ -158,17 +164,19 @@
 	$sql = str_replace('count(voicemail_uuid)', '*', $sql);
 	$sql .= order_by($order_by, $order, null, null, $sort);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
-	$voicemails = $database->select($sql, $parameters ?? null, 'all');
+	$voicemails = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
 //get vm count for each mailbox
 	if (permission_exists('voicemail_message_view')) {
-		$sql = "select voicemail_uuid, count(*) as voicemail_count ";
-		$sql .= "from v_voicemail_messages where domain_uuid = :domain_uuid";
-		$sql .= " group by voicemail_uuid";
-		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
+		$parameters = null;
+		$sql = "select voicemail_uuid, count(voicemail_uuid) as voicemail_count ";
+		$sql .= "from v_voicemail_messages where true ";
+		if ($show !== 'all' || !permission_exists('voicemail_all')) {
+			$sql .= "and domain_uuid = :domain_uuid ";
+			$parameters['domain_uuid'] = $domain_uuid;
+		}
+		$sql .= "group by voicemail_uuid";
 		$voicemails_count_tmp = $database->select($sql, $parameters, 'all');
 
 		$voicemails_count = array();
@@ -180,11 +188,14 @@
 
 //get vm greeting count for each mailbox
 	if (permission_exists('voicemail_greeting_view')) {
+		$parameters = null;
 		$sql = "select voicemail_id, count(greeting_id) as greeting_count ";
-		$sql .= "from v_voicemail_greetings where domain_uuid = :domain_uuid";
-		$sql .= " group by voicemail_id";
-		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
+		$sql .= "from v_voicemail_greetings where true ";
+		if ($show !== 'all' || !permission_exists('voicemail_all')) {
+			$sql .= "and domain_uuid = :domain_uuid ";
+			$parameters['domain_uuid'] = $domain_uuid;
+		}
+		$sql .= "group by voicemail_id";
 		$voicemail_greetings_count_tmp = $database->select($sql, $parameters, 'all');
 
 		$voicemail_greetings_count = array();
@@ -283,7 +294,7 @@
 	}
 	echo "</tr>\n";
 
-	if (is_array($voicemails) && @sizeof($voicemails) != 0) {
+	if (is_array($voicemails) && sizeof($voicemails) != 0) {
 		$x = 0;
 		foreach ($voicemails as $row) {
 			if (permission_exists('voicemail_edit')) {
@@ -362,4 +373,3 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 9e67bd6b2b..8a5e20bb98 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -231,7 +231,7 @@ if (!class_exists('xml_cdr')) {
 				}
 
 				//add the temporary permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("xml_cdr_add", "temp");
 				$p->add("xml_cdr_json_add", "temp");
 				$p->add("xml_cdr_flow_add", "temp");
@@ -2113,7 +2113,7 @@ if (!class_exists('xml_cdr')) {
 			}
 
 			//grant temporary permissions
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('call_recording_delete', 'temp');
 
 			//execute delete
diff --git a/app/xml_cdr/resources/dashboard/config.php b/app/xml_cdr/resources/dashboard/config.php
index 0c842eda8c..3b1b4b2e05 100644
--- a/app/xml_cdr/resources/dashboard/config.php
+++ b/app/xml_cdr/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '6ad0e056-bf3d-465a-956d-bd77d513ab3
 $array['dashboard'][$x]['dashboard_name'] = 'Missed Calls';
 $array['dashboard'][$x]['dashboard_path'] = 'xml_cdr/missed_calls';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-circle-xmark';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#bfbfbf';
 $array['dashboard'][$x]['dashboard_url'] = '';
 $array['dashboard'][$x]['dashboard_target'] = '';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '#ffffff';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '#EA4C46';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
@@ -49,6 +50,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'c323e296-b1cf-42ea-9c57-fc00697915b
 $array['dashboard'][$x]['dashboard_name'] = 'Recent Calls';
 $array['dashboard'][$x]['dashboard_path'] = 'xml_cdr/recent_calls';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-rectangle-list';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#bfbfbf';
 $array['dashboard'][$x]['dashboard_url'] = '';
 $array['dashboard'][$x]['dashboard_target'] = '';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -62,9 +64,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '#ffffff';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '#417ed3';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
@@ -93,6 +95,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '7fb8c79b-3fc4-4977-992a-eb0404f80fe
 $array['dashboard'][$x]['dashboard_name'] = 'Call Detail Records';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-list-ul';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#0292ff';
 $array['dashboard'][$x]['dashboard_url'] = '/app/xml_cdr/xml_cdr.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php
index b00e62a973..80b3378c2d 100644
--- a/app/xml_cdr/resources/dashboard/missed_calls.php
+++ b/app/xml_cdr/resources/dashboard/missed_calls.php
@@ -149,7 +149,7 @@
 		echo "<span class='hud_content'>\n";
 		echo "<div style='position: relative; display: inline-block;'>\n";
 		echo "		<span class='hud_stat'><i class=\"fas ".$dashboard_icon." \"></i></span>\n";
-		echo "		<span style=\"background-color: #EA4C46; color: #ffffff; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$num_rows."</span>\n";
+		echo "		<span style=\"background-color: ".($row['dashboard_number_background_color'] ?? '#EA4C46')."; color: ".($row['dashboard_number_text_color'] ?? '#ffffff')."; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$num_rows."</span>\n";
 		echo "	</div>\n";
 		echo "</span>";
 	}
@@ -220,4 +220,4 @@
 	}
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php
index bdeb2148f3..8de16e74cb 100644
--- a/app/xml_cdr/resources/dashboard/recent_calls.php
+++ b/app/xml_cdr/resources/dashboard/recent_calls.php
@@ -147,7 +147,7 @@
 		echo "<div class='hud_content'>\n";
 		echo "	<div style='position: relative; display: inline-block;'>\n";
 		echo "		<span class='hud_stat'><i class=\"fas ".$dashboard_icon." \"></i></span>\n";
-		echo "		<span style=\"background-color: #417ed3; color: #ffffff; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$num_rows."</span>\n";
+		echo "		<span style=\"background-color: ".($row['dashboard_number_background_color'] ?? '#417ed3')."; color: ".($row['dashboard_number_text_color'] ?? '#ffffff')."; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 23px; left: 24.5px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$num_rows."</span>\n";
 		echo "	</div>\n";
 		echo "</div>";
 	}
@@ -240,4 +240,4 @@
 	}
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php
index 414b6f998a..eca4c79e62 100644
--- a/app/xml_cdr/xml_cdr_details.php
+++ b/app/xml_cdr/xml_cdr_details.php
@@ -114,7 +114,7 @@
 			if (is_array($array) && @sizeof($array) != 0) {
 
 				//add temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('xml_cdr_edit', 'temp');
 
 				//remove record_path, record_name and record_length
diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index fc77f5f507..b7eade3167 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -67,7 +67,7 @@
 
 		//set the headers
 			header('Content-type: application/octet-binary');
-			header('Content-Disposition: attachment; filename=user-summary.csv');
+			header('Content-Disposition: attachment; filename=extension-summary.csv');
 
 		//show the column names on the first line
 			$z = 0;
diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index d09a0784c2..2f5a9f280a 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -228,7 +228,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_cid_source";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "2";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "4";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The type of SIP header(s) to carry the caller ID; 0-FROM, 1-PAI 2-PAI-FROM (default), 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM, 6-Preference";
 		$y++;
diff --git a/core/authentication/app_defaults.php b/core/authentication/app_defaults.php
index d0d2c6f9f0..ed70985cbd 100644
--- a/core/authentication/app_defaults.php
+++ b/core/authentication/app_defaults.php
@@ -94,7 +94,7 @@
 		//add the missing email templates
 		if (!empty($array['email_templates'])) {
 			//add the temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("email_template_add", 'temp');
 			$p->add("email_template_edit", 'temp');
 
diff --git a/core/authentication/resources/classes/authentication.php b/core/authentication/resources/classes/authentication.php
index 5355451606..790f319709 100644
--- a/core/authentication/resources/classes/authentication.php
+++ b/core/authentication/resources/classes/authentication.php
@@ -79,7 +79,7 @@ class authentication {
 			}
 
 		//check if contacts app exists
-			$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/contacts/') ? true : false;
+			$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/core/contacts/') ? true : false;
 
 		//use the authentication plugins
 			foreach ($_SESSION['authentication']['methods'] as $name) {
diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index 7b55144de9..9d61f26379 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -171,7 +171,7 @@ class plugin_database {
 			$user_authorized = false;
 
 		//check if contacts app exists
-			$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/contacts/') ? true : false;
+			$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/core/contacts/') ? true : false;
 
 		//check the username and password if they don't match then redirect to the login
 			$sql = "select ";
@@ -310,7 +310,7 @@ class plugin_database {
 								$array['user_groups'][0]['user_uuid'] = $this->user_uuid;
 
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('user_edit', 'temp');
 
 							//execute insert
diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php
index dc822d7a01..900c467b36 100644
--- a/core/authentication/resources/classes/plugins/email.php
+++ b/core/authentication/resources/classes/plugins/email.php
@@ -258,7 +258,7 @@ class plugin_email {
 					$hostname = gethostname();
 
 					//add the temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("email_queue_add", 'temp');
 					$p->add("email_queue_edit", 'temp');
 
@@ -404,7 +404,7 @@ class plugin_email {
 				unset($_POST['authentication_code']);
 
 				//check if contacts app exists
-				$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/contacts/') ? true : false;
+				$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/core/contacts/') ? true : false;
 
 				//get the user details
 				if ($auth_valid) {
@@ -522,4 +522,4 @@ class plugin_email {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/core/authentication/resources/classes/plugins/ldap.php b/core/authentication/resources/classes/plugins/ldap.php
index 3fe2ec859b..dfd499602f 100644
--- a/core/authentication/resources/classes/plugins/ldap.php
+++ b/core/authentication/resources/classes/plugins/ldap.php
@@ -178,7 +178,7 @@ class plugin_ldap {
 						$array['user_groups'][0]['user_uuid'] = $this->user_uuid;
 
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('user_add', 'temp');
 						$p->add('user_group_add', 'temp');
 
diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php
index 5bb5134857..0524335a63 100644
--- a/core/authentication/resources/classes/plugins/totp.php
+++ b/core/authentication/resources/classes/plugins/totp.php
@@ -224,7 +224,7 @@ class plugin_totp {
 					$array['users'][$x]['user_totp_secret'] = $this->user_totp_secret;
 
 					//add the user_edit permission
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("user_edit", "temp");
 
 					//save the data
@@ -328,7 +328,7 @@ class plugin_totp {
 				unset($_POST['authentication_code']);
 
 				//check if contacts app exists
-				$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/contacts/') ? true : false;
+				$contacts_exists = file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/core/contacts/') ? true : false;
 
 				//get the user details
 				if ($auth_valid) {
@@ -440,4 +440,4 @@ class plugin_totp {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/core/contacts/contact_address_edit.php b/core/contacts/contact_address_edit.php
index a1a079e2b3..1715f04f65 100644
--- a/core/contacts/contact_address_edit.php
+++ b/core/contacts/contact_address_edit.php
@@ -131,7 +131,7 @@
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
diff --git a/core/contacts/contact_auth.php b/core/contacts/contact_auth.php
index b5c9335960..e43356017f 100644
--- a/core/contacts/contact_auth.php
+++ b/core/contacts/contact_auth.php
@@ -61,7 +61,7 @@ if ($_SESSION['contact_auth']['source'] == 'google') {
 	if (isset($_REQUEST['signout'])) {
 		unset($_SESSION['contact_auth']['token']);
 		message::add($text['message-google_signed_out']);
-		header("Location: https://www.google.com/accounts/Logout?continue=https://appengine.google.com/_ah/logout?continue=".(($_SERVER["HTTPS"] == "on") ? "https" : "http")."://".$_SERVER['HTTP_HOST'].PROJECT_PATH."/app/contacts/".$_SESSION['contact_auth']['referer']);
+		header("Location: https://www.google.com/accounts/Logout?continue=https://appengine.google.com/_ah/logout?continue=".(($_SERVER["HTTPS"] == "on") ? "https" : "http")."://".$_SERVER['HTTP_HOST'].PROJECT_PATH."/core/contacts/".$_SESSION['contact_auth']['referer']);
 		exit;
 	}
 
@@ -117,4 +117,4 @@ else {
 	exit;
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/core/contacts/contact_edit.php b/core/contacts/contact_edit.php
index 605f7045fc..d8d1767eab 100644
--- a/core/contacts/contact_edit.php
+++ b/core/contacts/contact_edit.php
@@ -543,7 +543,7 @@
 		//save the data
 			if (!empty($array)) {
 				//add the permission object
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('contact_add', 'temp');
 				$p->add('contact_phone_add', 'temp');
 				$p->add('contact_address_add', 'temp');
@@ -963,10 +963,10 @@
 			}
 		};
 		if (search) {
-			xhttp.open("GET", "/app/contacts/contact_json.php?search="+search, true);
+			xhttp.open("GET", "/core/contacts/contact_json.php?search="+search, true);
 		}
 		else {
-			xhttp.open("GET", "/app/contacts/contact_json.php", true);
+			xhttp.open("GET", "/core/contacts/contact_json.php", true);
 		}
 		xhttp.send();
 	}
diff --git a/core/contacts/contact_email_edit.php b/core/contacts/contact_email_edit.php
index b6c89d8b37..1f41f0ba77 100644
--- a/core/contacts/contact_email_edit.php
+++ b/core/contacts/contact_email_edit.php
@@ -112,7 +112,7 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
diff --git a/core/contacts/contact_import_google.php b/core/contacts/contact_import_google.php
index 0cb041c5ef..aebd791ff6 100644
--- a/core/contacts/contact_import_google.php
+++ b/core/contacts/contact_import_google.php
@@ -107,7 +107,7 @@ if ($_POST['a'] == 'import') {
 					unset($duplicate_contact_uuid);
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_delete', 'temp');
 
 				//delete duplicate contact
diff --git a/core/contacts/contact_note_edit.php b/core/contacts/contact_note_edit.php
index 6c6061e13a..0915d21c44 100644
--- a/core/contacts/contact_note_edit.php
+++ b/core/contacts/contact_note_edit.php
@@ -102,7 +102,7 @@
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
diff --git a/core/contacts/contact_phone_edit.php b/core/contacts/contact_phone_edit.php
index 4d729c34f2..c999eb7aec 100644
--- a/core/contacts/contact_phone_edit.php
+++ b/core/contacts/contact_phone_edit.php
@@ -132,7 +132,7 @@
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
diff --git a/core/contacts/contact_relation_edit.php b/core/contacts/contact_relation_edit.php
index e77b1d4fcf..f223e084e5 100644
--- a/core/contacts/contact_relation_edit.php
+++ b/core/contacts/contact_relation_edit.php
@@ -110,7 +110,7 @@
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
@@ -241,10 +241,10 @@
 			}
 		};
 		if (search) {
-			xhttp.open("GET", "/app/contacts/contact_json.php?search="+search, true);
+			xhttp.open("GET", "/core/contacts/contact_json.php?search="+search, true);
 		}
 		else {
-			xhttp.open("GET", "/app/contacts/contact_json.php", true);
+			xhttp.open("GET", "/core/contacts/contact_json.php", true);
 		}
 		xhttp.send();
 	}
diff --git a/core/contacts/contact_setting_edit.php b/core/contacts/contact_setting_edit.php
index 5fe5a36dbb..94d1f63f71 100644
--- a/core/contacts/contact_setting_edit.php
+++ b/core/contacts/contact_setting_edit.php
@@ -129,7 +129,7 @@
 					$array['contacts'][0]['last_mod_date'] = 'now()';
 					$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
 					$database = new database;
diff --git a/core/contacts/contact_time_edit.php b/core/contacts/contact_time_edit.php
index d7d4b0cb08..ec4d3fa7bb 100644
--- a/core/contacts/contact_time_edit.php
+++ b/core/contacts/contact_time_edit.php
@@ -102,7 +102,7 @@
 				$array['contacts'][0]['last_mod_date'] = 'now()';
 				$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
 				$database = new database;
diff --git a/core/contacts/contact_url_edit.php b/core/contacts/contact_url_edit.php
index 3cef3ff885..323e5e7afa 100644
--- a/core/contacts/contact_url_edit.php
+++ b/core/contacts/contact_url_edit.php
@@ -115,7 +115,7 @@
 				$array['contacts'][0]['last_mod_date'] = 'now()';
 				$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
 
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
 				$database = new database;
diff --git a/core/contacts/resources/classes/contacts.php b/core/contacts/resources/classes/contacts.php
index 9fa93eec23..c29f0243a8 100644
--- a/core/contacts/resources/classes/contacts.php
+++ b/core/contacts/resources/classes/contacts.php
@@ -108,7 +108,7 @@ if (!class_exists('contacts')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temp permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$database = new database;
 									foreach ($this->tables as $table) {
 										$p->add(database::singular($table).'_delete', 'temp');
diff --git a/core/contacts/resources/dashboard/config.php b/core/contacts/resources/dashboard/config.php
index 09f7ca8b64..4f076d885c 100644
--- a/core/contacts/resources/dashboard/config.php
+++ b/core/contacts/resources/dashboard/config.php
@@ -5,7 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = '3b0cbb2f-733d-4646-8332-7d108808f2f
 $array['dashboard'][$x]['dashboard_name'] = 'Contacts';
 $array['dashboard'][$x]['dashboard_path'] = 'dashboard/icon';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-regular fa-address-card';
-$array['dashboard'][$x]['dashboard_url'] = '/app/contacts/contacts.php';
+$array['dashboard'][$x]['dashboard_url'] = '/core/contacts/contacts.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
 $array['dashboard'][$x]['dashboard_height'] = '';
diff --git a/core/dashboard/app_config.php b/core/dashboard/app_config.php
index 63f0950532..89549d09e7 100644
--- a/core/dashboard/app_config.php
+++ b/core/dashboard/app_config.php
@@ -78,6 +78,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard icon.';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_icon_color';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard icon color.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_url';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
@@ -157,6 +162,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the number text color hover.';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_number_background_color';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the number background color.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_background_color';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php
index 7334a5591a..7019d63cf1 100644
--- a/core/dashboard/app_defaults.php
+++ b/core/dashboard/app_defaults.php
@@ -66,7 +66,9 @@ if ($domains_processed == 1) {
 				if (!empty($row['dashboard_label_text_color_hover'])) { $array['dashboard'][$x]['dashboard_label_text_color_hover'] = $row['dashboard_label_text_color_hover']; }
 				if (!empty($row['dashboard_number_text_color'])) { $array['dashboard'][$x]['dashboard_number_text_color'] = $row['dashboard_number_text_color']; }
 				if (!empty($row['dashboard_number_text_color_hover'])) { $array['dashboard'][$x]['dashboard_number_text_color_hover'] = $row['dashboard_number_text_color_hover']; }
+				if (!empty($row['dashboard_number_background_color'])) { $array['dashboard'][$x]['dashboard_number_background_color'] = $row['dashboard_number_background_color']; }
 				if (!empty($row['dashboard_icon'])) { $array['dashboard'][$x]['dashboard_icon'] = $row['dashboard_icon']; }
+				if (!empty($row['dashboard_icon_color'])) { $array['dashboard'][$x]['dashboard_icon_color'] = $row['dashboard_icon_color']; }
 				if (!empty($row['dashboard_url'])) { $array['dashboard'][$x]['dashboard_url'] = $row['dashboard_url']; }
 				if (!empty($row['dashboard_width'])) { $array['dashboard'][$x]['dashboard_width'] = $row['dashboard_width']; }
 				if (!empty($row['dashboard_height'])) { $array['dashboard'][$x]['dashboard_height'] = $row['dashboard_height']; }
@@ -98,7 +100,7 @@ if ($domains_processed == 1) {
 		}
 
 	//add the temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('dashboard_add', 'temp');
 		$p->add('dashboard_group_add', 'temp');
 
diff --git a/core/dashboard/app_languages.php b/core/dashboard/app_languages.php
index 1cdca26cda..02d88537c3 100644
--- a/core/dashboard/app_languages.php
+++ b/core/dashboard/app_languages.php
@@ -216,6 +216,168 @@ $text['description-dashboard_path']['zh-cn'] = "输入仪表板小部件路径
 $text['description-dashboard_path']['ja-jp'] = "ダッシュボード ウィジェットのパスを入力します。";
 $text['description-dashboard_path']['ko-kr'] = "대시보드 위젯 경로를 입력합니다.";
 
+$text['description-dashboard_icon']['en-us'] = "Select an icon.";
+$text['description-dashboard_icon']['en-gb'] = "Select an icon.";
+$text['description-dashboard_icon']['ar-eg'] = "اختر أيقونة.";
+$text['description-dashboard_icon']['de-at'] = "Wählen Sie ein Symbol.";
+$text['description-dashboard_icon']['de-ch'] = "Wählen Sie ein Symbol.";
+$text['description-dashboard_icon']['de-de'] = "Wählen Sie ein Symbol.";
+$text['description-dashboard_icon']['el-gr'] = "Επιλέξτε ένα εικονίδιο.";
+$text['description-dashboard_icon']['es-cl'] = "Selecciona un ícono.";
+$text['description-dashboard_icon']['es-mx'] = "Selecciona un ícono.";
+$text['description-dashboard_icon']['fr-ca'] = "Sélectionnez une icône.";
+$text['description-dashboard_icon']['fr-fr'] = "Sélectionnez une icône.";
+$text['description-dashboard_icon']['he-il'] = "בחר אייקון.";
+$text['description-dashboard_icon']['it-it'] = "Seleziona un'icona.";
+$text['description-dashboard_icon']['ka-ge'] = "აირჩიეთ ხატული.";
+$text['description-dashboard_icon']['nl-nl'] = "Selecteer een pictogram.";
+$text['description-dashboard_icon']['pl-pl'] = "Wybierz ikonę.";
+$text['description-dashboard_icon']['pt-br'] = "Selecione um ícone.";
+$text['description-dashboard_icon']['pt-pt'] = "Selecione um ícone.";
+$text['description-dashboard_icon']['ro-ro'] = "Selectați o pictogramă.";
+$text['description-dashboard_icon']['ru-ru'] = "Выберите значок.";
+$text['description-dashboard_icon']['sv-se'] = "Välj ett ikon.";
+$text['description-dashboard_icon']['uk-ua'] = "Виберіть значок.";
+$text['description-dashboard_icon']['tr-tr'] = "Bir simge seçin.";
+$text['description-dashboard_icon']['zh-cn'] = "选择一个图标。";
+$text['description-dashboard_icon']['ja-jp'] = "アイコンを選択してください。";
+$text['description-dashboard_icon']['ko-kr'] = "아이콘을 선택하세요.";
+
+$text['label-dashboard_icon_color']['en-us'] = "Color";
+$text['label-dashboard_icon_color']['en-gb'] = "Color";
+$text['label-dashboard_icon_color']['ar-eg'] = "اللون";
+$text['label-dashboard_icon_color']['de-at'] = "Farbe";
+$text['label-dashboard_icon_color']['de-ch'] = "Farbe";
+$text['label-dashboard_icon_color']['de-de'] = "Farbe";
+$text['label-dashboard_icon_color']['el-gr'] = "Χρώμα";
+$text['label-dashboard_icon_color']['es-cl'] = "Color";
+$text['label-dashboard_icon_color']['es-mx'] = "Color";
+$text['label-dashboard_icon_color']['fr-ca'] = "Couleur";
+$text['label-dashboard_icon_color']['fr-fr'] = "Couleur";
+$text['label-dashboard_icon_color']['he-il'] = "צבע";
+$text['label-dashboard_icon_color']['it-it'] = "Colore";
+$text['label-dashboard_icon_color']['ka-ge'] = "ფერი";
+$text['label-dashboard_icon_color']['nl-nl'] = "Kleur";
+$text['label-dashboard_icon_color']['pl-pl'] = "Kolor";
+$text['label-dashboard_icon_color']['pt-br'] = "Cor";
+$text['label-dashboard_icon_color']['pt-pt'] = "Cor";
+$text['label-dashboard_icon_color']['ro-ro'] = "Culoare";
+$text['label-dashboard_icon_color']['ru-ru'] = "Цвет";
+$text['label-dashboard_icon_color']['sv-se'] = "Färg";
+$text['label-dashboard_icon_color']['uk-ua'] = "Колір";
+$text['label-dashboard_icon_color']['tr-tr'] = "Renk";
+$text['label-dashboard_icon_color']['zh-cn'] = "颜色";
+$text['label-dashboard_icon_color']['ja-jp'] = "色";
+$text['label-dashboard_icon_color']['ko-kr'] = "색상";
+
+$text['description-dashboard_icon_color']['en-us'] = "Enter the icon color.";
+$text['description-dashboard_icon_color']['en-gb'] = "Enter the icon color.";
+$text['description-dashboard_icon_color']['ar-eg'] = "أدخل لون الأيقونة.";
+$text['description-dashboard_icon_color']['de-at'] = "Geben Sie die Symbolfarbe ein.";
+$text['description-dashboard_icon_color']['de-ch'] = "Geben Sie die Symbolfarbe ein.";
+$text['description-dashboard_icon_color']['de-de'] = "Geben Sie die Symbolfarbe ein.";
+$text['description-dashboard_icon_color']['el-gr'] = "Εισάγετε το χρώμα του εικονιδίου.";
+$text['description-dashboard_icon_color']['es-cl'] = "Ingresa el color del ícono.";
+$text['description-dashboard_icon_color']['es-mx'] = "Ingresa el color del ícono.";
+$text['description-dashboard_icon_color']['fr-ca'] = "Entrez la couleur de l'icône.";
+$text['description-dashboard_icon_color']['fr-fr'] = "Entrez la couleur de l'icône.";
+$text['description-dashboard_icon_color']['he-il'] = "הזן את צבע האייקון.";
+$text['description-dashboard_icon_color']['it-it'] = "Inserisci il colore dell'icona.";
+$text['description-dashboard_icon_color']['ka-ge'] = "შეიყვანეთ ხატულის ფერი.";
+$text['description-dashboard_icon_color']['nl-nl'] = "Voer de kleur van het pictogram in.";
+$text['description-dashboard_icon_color']['pl-pl'] = "Wprowadź kolor ikony.";
+$text['description-dashboard_icon_color']['pt-br'] = "Digite a cor do ícone.";
+$text['description-dashboard_icon_color']['pt-pt'] = "Digite a cor do ícone.";
+$text['description-dashboard_icon_color']['ro-ro'] = "Introduceți culoarea pictogramei.";
+$text['description-dashboard_icon_color']['ru-ru'] = "Введите цвет значка.";
+$text['description-dashboard_icon_color']['sv-se'] = "Ange ikons färg.";
+$text['description-dashboard_icon_color']['uk-ua'] = "Введіть колір значка.";
+$text['description-dashboard_icon_color']['tr-tr'] = "Simge rengini girin.";
+$text['description-dashboard_icon_color']['zh-cn'] = "输入图标颜色。";
+$text['description-dashboard_icon_color']['ja-jp'] = "アイコンの色を入力してください。";
+$text['description-dashboard_icon_color']['ko-kr'] = "아이콘 색상을 입력하세요.";
+
+$text['description-dashboard_url']['en-us'] = "Enter the URL.";
+$text['description-dashboard_url']['en-gb'] = "Enter the URL.";
+$text['description-dashboard_url']['ar-eg'] = "أدخل الرابط.";
+$text['description-dashboard_url']['de-at'] = "Geben Sie die URL ein.";
+$text['description-dashboard_url']['de-ch'] = "Geben Sie die URL ein.";
+$text['description-dashboard_url']['de-de'] = "Geben Sie die URL ein.";
+$text['description-dashboard_url']['el-gr'] = "Εισάγετε τη διεύθυνση URL.";
+$text['description-dashboard_url']['es-cl'] = "Ingrese la URL.";
+$text['description-dashboard_url']['es-mx'] = "Ingrese la URL.";
+$text['description-dashboard_url']['fr-ca'] = "Entrez l'URL.";
+$text['description-dashboard_url']['fr-fr'] = "Entrez l'URL.";
+$text['description-dashboard_url']['he-il'] = "הכנס את ה-URL.";
+$text['description-dashboard_url']['it-it'] = "Inserisci l'URL.";
+$text['description-dashboard_url']['ka-ge'] = "შეიყვანეთ URL-მისამართი.";
+$text['description-dashboard_url']['nl-nl'] = "Voer de URL in.";
+$text['description-dashboard_url']['pl-pl'] = "Wprowadź URL.";
+$text['description-dashboard_url']['pt-br'] = "Digite a URL.";
+$text['description-dashboard_url']['pt-pt'] = "Digite a URL.";
+$text['description-dashboard_url']['ro-ro'] = "Introduceți URL-ul.";
+$text['description-dashboard_url']['ru-ru'] = "Введите URL.";
+$text['description-dashboard_url']['sv-se'] = "Ange URL:en.";
+$text['description-dashboard_url']['uk-ua'] = "Введіть URL.";
+$text['description-dashboard_url']['tr-tr'] = "URL'yi girin.";
+$text['description-dashboard_url']['zh-cn'] = "请输入网址.";
+$text['description-dashboard_url']['ja-jp'] = "URLを入力してください。";
+$text['description-dashboard_url']['ko-kr'] = "URL을 입력하세요.";
+
+$text['description-dashboard_width']['en-us'] = "Enter the window width.";
+$text['description-dashboard_width']['en-gb'] = "Enter the window width.";
+$text['description-dashboard_width']['ar-eg'] = "أدخل عرض النافذة.";
+$text['description-dashboard_width']['de-at'] = "Geben Sie die Fensterbreite ein.";
+$text['description-dashboard_width']['de-ch'] = "Geben Sie die Fensterbreite ein.";
+$text['description-dashboard_width']['de-de'] = "Geben Sie die Fensterbreite ein.";
+$text['description-dashboard_width']['el-gr'] = "Εισάγετε το πλάτος του παραθύρου.";
+$text['description-dashboard_width']['es-cl'] = "Ingrese el ancho de la ventana.";
+$text['description-dashboard_width']['es-mx'] = "Ingrese el ancho de la ventana.";
+$text['description-dashboard_width']['fr-ca'] = "Entrez la largeur de la fenêtre.";
+$text['description-dashboard_width']['fr-fr'] = "Entrez la largeur de la fenêtre.";
+$text['description-dashboard_width']['he-il'] = "הכנס את רוחב החלון.";
+$text['description-dashboard_width']['it-it'] = "Inserisci la larghezza della finestra.";
+$text['description-dashboard_width']['ka-ge'] = "შეიყვანეთ ფანჯრის სიგანე.";
+$text['description-dashboard_width']['nl-nl'] = "Voer de vensterbreedte in.";
+$text['description-dashboard_width']['pl-pl'] = "Wprowadź szerokość okna.";
+$text['description-dashboard_width']['pt-br'] = "Digite a largura da janela.";
+$text['description-dashboard_width']['pt-pt'] = "Digite a largura da janela.";
+$text['description-dashboard_width']['ro-ro'] = "Introduceți lățimea ferestrei.";
+$text['description-dashboard_width']['ru-ru'] = "Введите ширину окна.";
+$text['description-dashboard_width']['sv-se'] = "Ange fönstrets bredd.";
+$text['description-dashboard_width']['uk-ua'] = "Введіть ширину вікна.";
+$text['description-dashboard_width']['tr-tr'] = "Pencere genişliğini girin.";
+$text['description-dashboard_width']['zh-cn'] = "请输入窗口宽度.";
+$text['description-dashboard_width']['ja-jp'] = "ウィンドウの幅を入力してください。";
+$text['description-dashboard_width']['ko-kr'] = "창 너비를 입력하세요.";
+
+$text['description-dashboard_height']['en-us'] = "Enter the window height.";
+$text['description-dashboard_height']['en-gb'] = "Enter the window height.";
+$text['description-dashboard_height']['ar-eg'] = "أدخل ارتفاع النافذة.";
+$text['description-dashboard_height']['de-at'] = "Geben Sie die Fensterhöhe ein.";
+$text['description-dashboard_height']['de-ch'] = "Geben Sie die Fensterhöhe ein.";
+$text['description-dashboard_height']['de-de'] = "Geben Sie die Fensterhöhe ein.";
+$text['description-dashboard_height']['el-gr'] = "Εισάγετε το ύψος του παραθύρου.";
+$text['description-dashboard_height']['es-cl'] = "Ingrese la altura de la ventana.";
+$text['description-dashboard_height']['es-mx'] = "Ingrese la altura de la ventana.";
+$text['description-dashboard_height']['fr-ca'] = "Entrez la hauteur de la fenêtre.";
+$text['description-dashboard_height']['fr-fr'] = "Entrez la hauteur de la fenêtre.";
+$text['description-dashboard_height']['he-il'] = "הכנס את גובה החלון.";
+$text['description-dashboard_height']['it-it'] = "Inserisci l'altezza della finestra.";
+$text['description-dashboard_height']['ka-ge'] = "შეიყვანეთ ფანჯრის სიმაღლე.";
+$text['description-dashboard_height']['nl-nl'] = "Voer de vensterhoogte in.";
+$text['description-dashboard_height']['pl-pl'] = "Wprowadź wysokość okna.";
+$text['description-dashboard_height']['pt-br'] = "Digite a altura da janela.";
+$text['description-dashboard_height']['pt-pt'] = "Digite a altura da janela.";
+$text['description-dashboard_height']['ro-ro'] = "Introduceți înălțimea ferestrei.";
+$text['description-dashboard_height']['ru-ru'] = "Введите высоту окна.";
+$text['description-dashboard_height']['sv-se'] = "Ange fönstrets höjd.";
+$text['description-dashboard_height']['uk-ua'] = "Введіть висоту вікна.";
+$text['description-dashboard_height']['tr-tr'] = "Pencere yüksekliğini girin.";
+$text['description-dashboard_height']['zh-cn'] = "请输入窗口高度.";
+$text['description-dashboard_height']['ja-jp'] = "ウィンドウの高さを入力してください。";
+$text['description-dashboard_height']['ko-kr'] = "창 높이를 입력하세요.";
+
 $text['label-dashboard_content_text_align']['en-us'] = "Text Align";
 $text['label-dashboard_content_text_align']['en-gb'] = "Text Align";
 $text['label-dashboard_content_text_align']['ar-eg'] = "محاذاة النص";
@@ -488,7 +650,7 @@ $text['label-doughnut']['ko-kr'] = "도넛";
 
 $text['label-progress_bar']['en-us'] = "Progress Bar";
 $text['label-progress_bar']['en-gb'] = "Progress Bar";
-$text['label-progress_bar']['ar-eg'] = "شريط التقدم"; 
+$text['label-progress_bar']['ar-eg'] = "شريط التقدم";
 $text['label-progress_bar']['de-at'] = "Fortschrittsbalken";
 $text['label-progress_bar']['de-ch'] = "Fortschrittsbalken";
 $text['label-progress_bar']['de-de'] = "Fortschrittsbalken";
@@ -511,7 +673,7 @@ $text['label-progress_bar']['uk-ua'] = "Індикатор виконання";
 $text['label-progress_bar']['tr-tr'] = "İlerleme Çubuğu";
 $text['label-progress_bar']['zh-cn'] = "进度条";
 $text['label-progress_bar']['ja-jp'] = "進行バー";
-$text['label-progress_bar']['ko-kr'] = "진행 막대"; 
+$text['label-progress_bar']['ko-kr'] = "진행 막대";
 
 $text['label-dashboard_label_enabled']['en-us'] = "Label Enabled";
 $text['label-dashboard_label_enabled']['en-gb'] = "Label Enabled";
@@ -891,6 +1053,60 @@ $text['description-dashboard_number_text_color_hover']['zh-cn'] = "输入仪表
 $text['description-dashboard_number_text_color_hover']['ja-jp'] = "ダッシュボード ウィジェットの番号、テキストの色、ホバーを入力します。";
 $text['description-dashboard_number_text_color_hover']['ko-kr'] = "대시보드 위젯 번호 텍스트 색상을 마우스로 가리키면 입력됩니다.";
 
+$text['label-dashboard_number_background_color']['en-us'] = "Number Background Color";
+$text['label-dashboard_number_background_color']['en-gb'] = "Number Background Color";
+$text['label-dashboard_number_background_color']['ar-eg'] = "لون خلفية الرقم";
+$text['label-dashboard_number_background_color']['de-at'] = "Hintergrundfarbe der Zahl";
+$text['label-dashboard_number_background_color']['de-ch'] = "Hintergrundfarbe der Zahl";
+$text['label-dashboard_number_background_color']['de-de'] = "Hintergrundfarbe der Zahl";
+$text['label-dashboard_number_background_color']['el-gr'] = "Χρώμα φόντου αριθμού";
+$text['label-dashboard_number_background_color']['es-cl'] = "Color de fondo del número";
+$text['label-dashboard_number_background_color']['es-mx'] = "Color de fondo del número";
+$text['label-dashboard_number_background_color']['fr-ca'] = "Couleur de fond du nombre";
+$text['label-dashboard_number_background_color']['fr-fr'] = "Couleur de fond du nombre";
+$text['label-dashboard_number_background_color']['he-il'] = "צבע רקע המספר";
+$text['label-dashboard_number_background_color']['it-it'] = "Colore di sfondo del numero";
+$text['label-dashboard_number_background_color']['ka-ge'] = "რიცხვის ფონური ფერი";
+$text['label-dashboard_number_background_color']['nl-nl'] = "Achtergrondkleur van het nummer";
+$text['label-dashboard_number_background_color']['pl-pl'] = "Kolor tła liczby";
+$text['label-dashboard_number_background_color']['pt-br'] = "Cor de fundo do número";
+$text['label-dashboard_number_background_color']['pt-pt'] = "Cor de fundo do número";
+$text['label-dashboard_number_background_color']['ro-ro'] = "Culoare fundal număr";
+$text['label-dashboard_number_background_color']['ru-ru'] = "Цвет фона числа";
+$text['label-dashboard_number_background_color']['sv-se'] = "Nummerbakgrundsfärg";
+$text['label-dashboard_number_background_color']['uk-ua'] = "Колір фону числа";
+$text['label-dashboard_number_background_color']['tr-tr'] = "Numara Arka Plan Rengi";
+$text['label-dashboard_number_background_color']['zh-cn'] = "数字背景颜色";
+$text['label-dashboard_number_background_color']['ja-jp'] = "数字の背景色";
+$text['label-dashboard_number_background_color']['ko-kr'] = "숫자 배경 색상";
+
+$text['description-dashboard_number_background_color']['en-us'] = "Enter the dashboard widget number background color.";
+$text['description-dashboard_number_background_color']['en-gb'] = "Enter the dashboard widget number background color.";
+$text['description-dashboard_number_background_color']['ar-eg'] = "أدخل لون خلفية الرقم في عنصر واجهة المستخدم على لوحة التحكم.";
+$text['description-dashboard_number_background_color']['de-at'] = "Geben Sie die Hintergrundfarbe der Zahl im Dashboard-Widget ein.";
+$text['description-dashboard_number_background_color']['de-ch'] = "Geben Sie die Hintergrundfarbe der Zahl im Dashboard-Widget ein.";
+$text['description-dashboard_number_background_color']['de-de'] = "Geben Sie die Hintergrundfarbe der Zahl im Dashboard-Widget ein.";
+$text['description-dashboard_number_background_color']['el-gr'] = "Εισάγετε το χρώμα φόντου του αριθμού στο widget του πίνακα ελέγχου.";
+$text['description-dashboard_number_background_color']['es-cl'] = "Ingrese el color de fondo del número en el widget del tablero.";
+$text['description-dashboard_number_background_color']['es-mx'] = "Ingrese el color de fondo del número en el widget del tablero.";
+$text['description-dashboard_number_background_color']['fr-ca'] = "Entrez la couleur de fond du nombre dans le widget du tableau de bord.";
+$text['description-dashboard_number_background_color']['fr-fr'] = "Entrez la couleur de fond du nombre dans le widget du tableau de bord.";
+$text['description-dashboard_number_background_color']['he-il'] = "הזן את צבע הרקע של המספר בווידג'ט בלוח המחוונים.";
+$text['description-dashboard_number_background_color']['it-it'] = "Inserisci il colore di sfondo del numero nel widget del cruscotto.";
+$text['description-dashboard_number_background_color']['ka-ge'] = "შეიტანეთ ფონი რიცხვის ფონური ფერი ვიჯეტში.";
+$text['description-dashboard_number_background_color']['nl-nl'] = "Voer de achtergrondkleur van het nummer in het dashboardwidget in.";
+$text['description-dashboard_number_background_color']['pl-pl'] = "Wprowadź kolor tła liczby w widżecie pulpitu nawigacyjnego.";
+$text['description-dashboard_number_background_color']['pt-br'] = "Digite a cor de fundo do número no widget do painel.";
+$text['description-dashboard_number_background_color']['pt-pt'] = "Digite a cor de fundo do número no widget do painel.";
+$text['description-dashboard_number_background_color']['ro-ro'] = "Introduceți culoarea de fundal a numărului în widgetul tabloului de bord.";
+$text['description-dashboard_number_background_color']['ru-ru'] = "Введите цвет фона числа в виджете панели управления.";
+$text['description-dashboard_number_background_color']['sv-se'] = "Ange bakgrundsfärgen för numret i dashboard-widgeten.";
+$text['description-dashboard_number_background_color']['uk-ua'] = "Введіть колір фону числа в віджеті панелі інструментів.";
+$text['description-dashboard_number_background_color']['tr-tr'] = "Panel aracındaki numara arka plan rengini girin.";
+$text['description-dashboard_number_background_color']['zh-cn'] = "输入仪表板小部件中数字的背景颜色。";
+$text['description-dashboard_number_background_color']['ja-jp'] = "ダッシュボードウィジェットの数字の背景色を入力してください。";
+$text['description-dashboard_number_background_color']['ko-kr'] = "대시보드 위젯 숫자의 배경 색상을 입력하세요.";
+
 $text['label-dashboard_background_color']['en-us'] = "Background Color";
 $text['label-dashboard_background_color']['en-gb'] = "Background Color";
 $text['label-dashboard_background_color']['ar-eg'] = "لون الخلفية";
diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 225449b07e..24915a82c3 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -47,6 +47,7 @@
 	$dashboard_path = 'dashboard/icon';
  	//$dashboard_path = '';
 	$dashboard_icon = '';
+	$dashboard_icon_color = '';
 	$dashboard_url = '';
 	$dashboard_target = 'self';
 	$dashboard_width = '';
@@ -58,6 +59,7 @@
 	$dashboard_label_text_color = '';
 	$dashboard_label_background_color = '';
 	$dashboard_number_text_color = '';
+	$dashboard_number_background_color = '';
 	$dashboard_groups = [];
 	$dashboard_column_span = '';
 	$dashboard_row_span = '';
@@ -83,6 +85,7 @@
 		$dashboard_name = $_POST["dashboard_name"] ?? '';
 		$dashboard_path = $_POST["dashboard_path"] ?? '';
 		$dashboard_icon = $_POST["dashboard_icon"] ?? '';
+		$dashboard_icon_color = $_POST["dashboard_icon_color"] ?? '';
 		$dashboard_url = $_POST["dashboard_url"] ?? '';
 		$dashboard_target = $_POST["dashboard_target"] ?? 'self';
 		$dashboard_width = $_POST["dashboard_width"] ?? '';
@@ -99,6 +102,7 @@
 		$dashboard_label_background_color_hover = $_POST["dashboard_label_background_color_hover"] ?? '';
 		$dashboard_number_text_color = $_POST["dashboard_number_text_color"] ?? '';
 		$dashboard_number_text_color_hover = $_POST["dashboard_number_text_color_hover"] ?? '';
+		$dashboard_number_background_color = $_POST["dashboard_number_background_color"] ?? '';
 		$dashboard_background_color = $_POST["dashboard_background_color"] ?? '';
 		$dashboard_background_color_hover = $_POST["dashboard_background_color_hover"] ?? '';
 		$dashboard_detail_background_color = $_POST["dashboard_detail_background_color"] ?? '';
@@ -121,6 +125,7 @@
 		$dashboard_name = trim(preg_replace('/[^a-zA-Z0-9 _\-\/.#]/', '', $dashboard_name));
 		$dashboard_path = preg_replace($text_pattern, '', strtolower($dashboard_path));
 		$dashboard_icon = preg_replace($text_pattern, '', $dashboard_icon);
+		$dashboard_icon_color = preg_replace($text_pattern, '', $dashboard_icon_color);
 		$dashboard_url = trim(preg_replace($text_pattern, '', $dashboard_url));
 		$dashboard_target = trim(preg_replace($text_pattern, '', $dashboard_target));
 		$dashboard_width = trim(preg_replace($text_pattern, '', $dashboard_width));
@@ -136,6 +141,7 @@
 		$dashboard_label_background_color_hover = preg_replace($text_pattern, '', $dashboard_label_background_color_hover);
 		$dashboard_number_text_color = preg_replace($text_pattern, '', $dashboard_number_text_color);
 		$dashboard_number_text_color_hover = preg_replace($text_pattern, '', $dashboard_number_text_color_hover);
+		$dashboard_number_background_color = preg_replace($text_pattern, '', $dashboard_number_background_color);
 		$dashboard_background_color = preg_replace($text_pattern, '', $dashboard_background_color);
 		$dashboard_background_color_hover = preg_replace($text_pattern, '', $dashboard_background_color_hover);
 		$dashboard_detail_background_color = preg_replace($text_pattern, '', $dashboard_detail_background_color);
@@ -273,6 +279,7 @@
 			$array['dashboard'][0]['dashboard_name'] = $dashboard_name;
 			$array['dashboard'][0]['dashboard_path'] = $dashboard_path;
 			$array['dashboard'][0]['dashboard_icon'] = $dashboard_icon;
+			$array['dashboard'][0]['dashboard_icon_color'] = $dashboard_icon_color;
 			$array['dashboard'][0]['dashboard_url'] = $dashboard_url;
 			$array['dashboard'][0]['dashboard_width'] = $dashboard_width;
 			$array['dashboard'][0]['dashboard_height'] = $dashboard_height;
@@ -288,6 +295,7 @@
 			$array['dashboard'][0]['dashboard_label_background_color_hover'] = $dashboard_label_background_color_hover;
 			$array['dashboard'][0]['dashboard_number_text_color'] = $dashboard_number_text_color;
 			$array['dashboard'][0]['dashboard_number_text_color_hover'] = $dashboard_number_text_color_hover;
+			$array['dashboard'][0]['dashboard_number_background_color'] = $dashboard_number_background_color;
 			$array['dashboard'][0]['dashboard_background_color'] = $dashboard_background_color;
 			$array['dashboard'][0]['dashboard_background_color_hover'] = $dashboard_background_color_hover;
 			$array['dashboard'][0]['dashboard_detail_background_color'] = $dashboard_detail_background_color;
@@ -338,6 +346,7 @@
 		$sql .= " dashboard_name, ";
 		$sql .= " dashboard_path, ";
 		$sql .= " dashboard_icon, ";
+		$sql .= " dashboard_icon_color, ";
 		$sql .= " dashboard_url, ";
 		$sql .= " dashboard_width, ";
 		$sql .= " dashboard_height, ";
@@ -353,6 +362,7 @@
 		$sql .= " dashboard_label_background_color_hover, ";
 		$sql .= " dashboard_number_text_color, ";
 		$sql .= " dashboard_number_text_color_hover, ";
+		$sql .= " dashboard_number_background_color, ";
 		$sql .= " dashboard_background_color, ";
 		$sql .= " dashboard_background_color_hover, ";
 		$sql .= " dashboard_detail_background_color, ";
@@ -373,6 +383,7 @@
 			$dashboard_name = $row["dashboard_name"];
 			$dashboard_path = $row["dashboard_path"];
 			$dashboard_icon = $row["dashboard_icon"];
+			$dashboard_icon_color = $row["dashboard_icon_color"];
 			$dashboard_url = $row["dashboard_url"];
 			$dashboard_width = $row["dashboard_width"];
 			$dashboard_height = $row["dashboard_height"];
@@ -388,6 +399,7 @@
 			$dashboard_label_background_color_hover = $row["dashboard_label_background_color_hover"];
 			$dashboard_number_text_color = $row["dashboard_number_text_color"];
 			$dashboard_number_text_color_hover = $row["dashboard_number_text_color_hover"];
+			$dashboard_number_background_color = $row["dashboard_number_background_color"];
 			$dashboard_background_color = $row["dashboard_background_color"];
 			$dashboard_background_color_hover = $row["dashboard_background_color_hover"];
 			$dashboard_detail_background_color = $row["dashboard_detail_background_color"];
@@ -650,9 +662,21 @@
 		else {
 			echo "		<input type='text' class='formfld' name='dashboard_icon' value='".escape($dashboard_icon)."'>";
 		}
+		echo			$text['description-dashboard_icon']."\n";
 		echo "		</td>";
 		echo "	</tr>";
 
+		echo "<tr class='type_icon'>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo $text['label-dashboard_icon_color']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' style='position: relative;' align='left'>\n";
+		echo "	<input type='text' class='formfld colorpicker' name='dashboard_icon_color' value='".escape($dashboard_icon_color)."'>\n";
+		echo "<br />\n";
+		echo $text['description-dashboard_icon_color']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
 		echo "<tr class='type_icon' ".($dashboard_path != 'dashboard/icon' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-link']."\n";
@@ -704,10 +728,7 @@
 		echo "</tr>\n";
 	}
 
-	if (
-		$action == "add" ||
-		$dashboard_path == "dashboard/content"
-		) {
+	if ($action == "add" || $dashboard_path == "dashboard/content") {
 		echo "<tr class='type_content' ".($dashboard_path != 'dashboard/content' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-content']."\n";
@@ -734,11 +755,7 @@
 		echo "</tr>\n";
 	}
 
-	if (
-		$action == "add" ||
-		$dashboard_path == "dashboard/content" ||
-		$dashboard_path == "dashboard/icon"
-		) {
+	if ($action == "add" || $dashboard_path == "dashboard/content" || $dashboard_path == "dashboard/icon") {
 		echo "<tr class='type_icon type_content' ".($dashboard_path != 'dashboard/content' && $dashboard_path != 'dashboard/icon' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-details']."\n";
@@ -793,8 +810,7 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	if (
-		$dashboard_path == "voicemails/voicemails" ||
+	if ($dashboard_path == "voicemails/voicemails" ||
 		$dashboard_path == "xml_cdr/missed_calls" ||
 		$dashboard_path == "xml_cdr/recent_calls" ||
 		$dashboard_path == "system/system_status" ||
@@ -808,8 +824,7 @@
 		$dashboard_path == "registrations/registrations" ||
 		$dashboard_path == "domains/domains" ||
 		$dashboard_path == "extensions/caller_id" ||
-		$dashboard_path == "maintenance/maintenance"
-		) {
+		$dashboard_path == "maintenance/maintenance") {
 		echo "<tr class='type_chart' ".($action == "add" ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo $text['label-dashboard_chart_type']."\n";
@@ -900,18 +915,18 @@
 		echo "</tr>\n";
 	}
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo $text['label-dashboard_number_text_color']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input type='text' class='formfld colorpicker' name='dashboard_number_text_color' value='".escape($dashboard_number_text_color)."'>\n";
-	echo "<br />\n";
-	echo $text['description-dashboard_number_text_color']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	if ($dashboard_path != "dashboard/icon") {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo $text['label-dashboard_number_text_color']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' style='position: relative;' align='left'>\n";
+		echo "	<input type='text' class='formfld colorpicker' name='dashboard_number_text_color' value='".escape($dashboard_number_text_color)."'>\n";
+		echo "<br />\n";
+		echo $text['description-dashboard_number_text_color']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 
-	if ($action == "add" || $dashboard_path == "dashboard/icon") {
 		echo "<tr class='type_icon' ".($dashboard_path != 'dashboard/icon' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo $text['label-dashboard_number_text_color_hover']."\n";
@@ -923,6 +938,19 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 	}
+	
+	if ($dashboard_chart_type == "icon") {
+		echo "<tr class='type_icon'>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo $text['label-dashboard_number_background_color']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' style='position: relative;' align='left'>\n";
+		echo "	<input type='text' class='formfld colorpicker' name='dashboard_number_background_color' value='".escape($dashboard_number_background_color)."'>\n";
+		echo "<br />\n";
+		echo $text['description-dashboard_number_background_color']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index f58b4da2b3..c9b92880dc 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -78,6 +78,7 @@
 	$sql .= "dashboard_name, ";
 	$sql .= "dashboard_path, ";
 	$sql .= "dashboard_icon, ";
+	$sql .= "dashboard_icon_color, ";
 	$sql .= "dashboard_url, ";
 	$sql .= "dashboard_target, ";
 	$sql .= "dashboard_width, ";
@@ -93,6 +94,7 @@
 	$sql .= "dashboard_label_background_color_hover, ";
 	$sql .= "dashboard_number_text_color, ";
 	$sql .= "dashboard_number_text_color_hover, ";
+	$sql .= "dashboard_number_background_color, ";
 	$sql .= "dashboard_background_color, ";
 	$sql .= "dashboard_background_color_hover, ";
 	$sql .= "dashboard_detail_background_color, ";
@@ -263,6 +265,11 @@ div.hud_chart {
 <?php
 foreach ($dashboard as $row) {
 	$dashboard_name = trim(preg_replace("/[^a-z]/", '_', strtolower($row['dashboard_name'])),'_');
+	if (!empty($row['dashboard_icon_color'])) {
+		echo "#".$dashboard_name." .hud_stat:has(i) {\n";
+		echo "	color: ".$row['dashboard_icon_color'].";\n";
+		echo "}\n";
+	}
 	if (!empty($row['dashboard_label_text_color']) || !empty($row['dashboard_label_background_color'])) {
 		echo "#".$dashboard_name." .hud_title {\n";
 		if (!empty($row['dashboard_label_text_color'])) { echo "	color: ".$row['dashboard_label_text_color'].";\n"; }
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index e2839fed06..cb2b3e718a 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -159,7 +159,7 @@
 						unset($sql, $parameters);
 
 					//update the timezone
-						$p = new permissions;
+						$p = permissions::new();
 						if ($detail_action == "update") {
 							$array['dialplan_details'][0]['dialplan_detail_uuid'] = $dialplan_detail_uuid;
 							$array['dialplan_details'][0]['dialplan_detail_data'] = 'timezone='.$default_setting_value;
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 5c1f477daf..07c5b5939b 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -530,7 +530,7 @@
 				echo "		[...]\n";
 			}
 			else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || substr_count($subcategory, '_key') > 0 || substr_count($subcategory, '_secret') > 0) {
-				echo "		".str_repeat('*', strlen($row['default_setting_value'] ?? ''));
+				echo "		".str_repeat('*', 10);	//use the same number of characters to mask the password length
 			}
 			else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') {
 				echo "		".$text['option-button_icons_'.$row['default_setting_value']]."\n";
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 98f776ad8b..80b8395569 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -155,7 +155,7 @@
 							unset($sql, $parameters);
 
 						//update the timezone
-							$p = new permissions;
+							$p = permissions::new();
 							if ($detail_action == "update") {
 								$array['dialplan_details'][0]['dialplan_detail_uuid'] = $dialplan_detail_uuid;
 								$array['dialplan_details'][0]['dialplan_detail_data'] = 'timezone='.$domain_setting_value;
@@ -280,7 +280,7 @@
 										$array['dialplan_details'][0]['dialplan_detail_group'] = $dialplan_detail_group;
 										$array['dialplan_details'][0]['dialplan_detail_order'] = '15';
 
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_detail_add', 'temp');
 									}
 
@@ -289,7 +289,7 @@
 										$array['dialplan_details'][0]['dialplan_detail_uuid'] = $dialplan_detail_uuid;
 										$array['dialplan_details'][0]['dialplan_detail_data'] = 'timezone='.$domain_setting_value;
 
-										$p = new permissions;
+										$p = permissions::new();
 										$p->add('dialplan_detail_edit', 'temp');
 									}
 
diff --git a/core/domains/resources/dashboard/config.php b/core/domains/resources/dashboard/config.php
index 16ec86f112..ef2b1df3b3 100644
--- a/core/domains/resources/dashboard/config.php
+++ b/core/domains/resources/dashboard/config.php
@@ -5,6 +5,7 @@ $array['dashboard'][$x]['dashboard_uuid'] = 'c41e7619-e213-49fd-a82f-df8fb8c46ad
 $array['dashboard'][$x]['dashboard_name'] = 'Domains';
 $array['dashboard'][$x]['dashboard_path'] = 'domains/domains.php';
 $array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-earth-americas';
+$array['dashboard'][$x]['dashboard_icon_color'] = '#bfbfbf';
 $array['dashboard'][$x]['dashboard_url'] = '/core/domains/domains.php';
 $array['dashboard'][$x]['dashboard_target'] = 'self';
 $array['dashboard'][$x]['dashboard_width'] = '';
@@ -18,9 +19,9 @@ $array['dashboard'][$x]['dashboard_label_text_color'] = '';
 $array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color'] = '';
 $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
-$array['dashboard'][$x]['dashboard_number_background_color'] = '';
-$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf';
+$array['dashboard'][$x]['dashboard_number_text_color'] = '#ffffff';
 $array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
+$array['dashboard'][$x]['dashboard_number_background_color'] = '#0292FF';
 $array['dashboard'][$x]['dashboard_background_color'] ='';
 $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
 $array['dashboard'][$x]['dashboard_detail_background_color'] = '';
diff --git a/core/domains/resources/dashboard/domains.php b/core/domains/resources/dashboard/domains.php
index 6b35a3e7b4..190ebb6cd0 100644
--- a/core/domains/resources/dashboard/domains.php
+++ b/core/domains/resources/dashboard/domains.php
@@ -37,7 +37,7 @@
 	echo "		<span class='hud_title' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\">".escape($dashboard_label)."</span>";
 	echo "		<div style='position: relative; display: inline-block;'>\n";
 	echo "			<span class='hud_stat' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\"><i class=\"fas ".$dashboard_icon."\"></i></span>\n";
-	echo "			<span style=\"background-color: #0292FF; color: #ffffff; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 22px; left: 25px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$domain_count."</span>\n";
+	echo "			<span style=\"background-color: ".($row['dashboard_number_background_color'] ?? '#0292FF')."; color: ".($row['dashboard_number_text_color'] ?? '#ffffff')."; font-size: 12px; font-weight: bold; text-align: center; position: absolute; top: 22px; left: 25px; padding: 2px 7px 1px 7px; border-radius: 10px; white-space: nowrap;\">".$domain_count."</span>\n";
 	echo "		</div>\n";
 	echo "	</div>\n";
 	if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
@@ -46,4 +46,4 @@
 	echo "	<span class='hud_expander' onclick=\"$('#hud_icon_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/groups/group_member_add.php b/core/groups/group_member_add.php
index b21269d25e..98b4b310d4 100644
--- a/core/groups/group_member_add.php
+++ b/core/groups/group_member_add.php
@@ -68,7 +68,7 @@
 		$array['user_groups'][0]['group_name'] = $group_name;
 		$array['user_groups'][0]['user_uuid'] = $user_uuid;
 
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('user_group_add', 'temp');
 
 		$database->app_name = 'groups';
diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php
index 9236524cce..c017b1321b 100644
--- a/core/groups/permissions_copy.php
+++ b/core/groups/permissions_copy.php
@@ -113,7 +113,7 @@
 				}
 				if (is_array($array) && sizeof($array) != 0) {
 					//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('group_permission_add', 'temp');
 
 					//execute insert
diff --git a/core/groups/resources/classes/permission.php b/core/groups/resources/classes/permission.php
index 45578b78f5..779a176048 100644
--- a/core/groups/resources/classes/permission.php
+++ b/core/groups/resources/classes/permission.php
@@ -95,7 +95,7 @@
 						}
 						if (is_array($array) && @sizeof($array) != 0) {
 							//grant temporary permissions
-								$p = new permissions;
+								$p = permissions::new();
 								$p->add('group_permission_delete', 'temp');
 							//execute delete
 								$database = new database;
@@ -185,7 +185,7 @@
 
 					if (is_array($array) && @sizeof($array)) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('group_permission_add', 'temp');
 
 						//execute insert
diff --git a/core/install/install.php b/core/install/install.php
index 66099f5653..78b77825c0 100644
--- a/core/install/install.php
+++ b/core/install/install.php
@@ -205,7 +205,7 @@
 			//if the domain name does not exist then add the domain name
 			if (!$domain_exists) {
 				//add the domain permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("domain_add", "temp");
 
 				//prepare the array
@@ -271,7 +271,7 @@
 			unset($parameters);
 
 			//add the user permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("user_add", "temp");
 			$p->add("user_edit", "temp");
 			$p->add("user_group_add", "temp");
diff --git a/core/notifications/app_defaults.php b/core/notifications/app_defaults.php
index e379565697..27e2e818b1 100644
--- a/core/notifications/app_defaults.php
+++ b/core/notifications/app_defaults.php
@@ -36,7 +36,7 @@ if ($domains_processed == 1) {
 	//			$array['notifications'][0]['notification_uuid'] = uuid();
 	//			$array['notifications'][0]['project_notifications'] = 'false';
 	//		//grant temporary permissions
-	//			$p = new permissions;
+	//			$p = permissions::new();
 	//			$p->add('notification_add', 'temp');
 	//		//execute insert
 	//			$database->app_name = 'notifications';
diff --git a/core/permissions/app_defaults.php b/core/permissions/app_defaults.php
index 23d1113aec..b3e8fac14f 100644
--- a/core/permissions/app_defaults.php
+++ b/core/permissions/app_defaults.php
@@ -45,7 +45,7 @@ if ($domains_processed == 1) {
 	//save the data to the database
 		if (!empty($array)) {
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('permission_add', 'temp');
 
 			//execute insert
diff --git a/core/software/app_defaults.php b/core/software/app_defaults.php
index 15cb2bf3e5..62e7965bc6 100644
--- a/core/software/app_defaults.php
+++ b/core/software/app_defaults.php
@@ -46,7 +46,7 @@ if ($domains_processed == 1) {
 	//save the data in the array
 		if (!empty($array)) {
 			//add the temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("software_add", 'temp');
 			$p->add("software_edit", 'temp');
 
diff --git a/core/user_logs/resources/classes/user_logs.php b/core/user_logs/resources/classes/user_logs.php
index c690b1a32a..041603f66f 100644
--- a/core/user_logs/resources/classes/user_logs.php
+++ b/core/user_logs/resources/classes/user_logs.php
@@ -84,7 +84,7 @@ if (!class_exists('user_logs')) {
 				}
 
 			//add the dialplan permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("user_log_add", 'temp');
 
 			//save to the data
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index 4696c4c95b..b480be6f05 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -156,14 +156,14 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 
 					//update the timezone
 						if ($detail_action == "update") {
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('dialplan_detail_edit', 'temp');
 
 							$array['dialplan_details'][0]['dialplan_detail_uuid'] = $dialplan_detail_uuid;
 							$array['dialplan_details'][0]['dialplan_detail_data'] = 'timezone='.$user_setting_value;
 						}
 						else {
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('dialplan_detail_add', 'temp');
 
 							$array['dialplan_details'][0]['domain_uuid'] = $domain_uuid;
@@ -266,7 +266,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 									$array['dialplan_details'][0]['dialplan_detail_group'] = !empty($dialplan_detail_group) ? $dialplan_detail_group : 'null';
 									$array['dialplan_details'][0]['dialplan_detail_order'] = '15';
 
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_detail_add', 'temp');
 
 									$database->app_name = 'user_settings';
@@ -284,7 +284,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 									$array['dialplan_details'][0]['domain_uuid'] = $_SESSION["domain_uuid"];
 									$array['dialplan_details'][0]['dialplan_uuid'] = $dialplan_uuid;
 
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('dialplan_detail_edit', 'temp');
 
 									$database->app_name = 'user_settings';
diff --git a/core/user_settings/user_setting_set.php b/core/user_settings/user_setting_set.php
index 2c8361f6b4..90dc47ed26 100644
--- a/core/user_settings/user_setting_set.php
+++ b/core/user_settings/user_setting_set.php
@@ -97,7 +97,7 @@ Mark J Crane <markjcrane@fusionpbx.com>
 						$array['user_settings'][0]['user_uuid'] = $_SESSION['user_uuid'];
 						$array['user_settings'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('user_setting_delete', 'temp');
 					//execute
 						$database->app_name = 'user_settings';
@@ -132,7 +132,7 @@ Mark J Crane <markjcrane@fusionpbx.com>
 					$array['user_settings'][0]['user_setting_enabled'] = $user_setting_enabled;
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('user_setting_add', 'temp');
 					$p->add('user_setting_edit', 'temp');
 
diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php
index a061e6587d..75c00a25c1 100644
--- a/core/users/app_defaults.php
+++ b/core/users/app_defaults.php
@@ -151,7 +151,7 @@ if ($domains_processed == 1) {
 			$array['default_settings'][$x]['default_setting_subcategory'] = "password_special";
 
 			//add the temporary permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("default_setting_edit", 'temp');
 
 			//save to the data
@@ -200,7 +200,7 @@ if ($domains_processed == 1) {
 				$x++;
 
 				//add the temporary permission
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("email_template_add", 'temp');
 				$p->add("email_template_edit", 'temp');
 
diff --git a/core/users/resources/classes/users.php b/core/users/resources/classes/users.php
index 6f1589da9f..734ce273d9 100644
--- a/core/users/resources/classes/users.php
+++ b/core/users/resources/classes/users.php
@@ -130,7 +130,7 @@ if (!class_exists('users')) {
 						//delete the checked rows
 							if (is_array($array) && @sizeof($array) != 0) {
 								//execute
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('user_setting_delete', 'temp');
 									$p->add('user_group_delete', 'temp');
 
diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 4e7c8914ee..71813680bc 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -88,7 +88,7 @@
 			$array['user_groups'][0]['group_uuid'] = $group_uuid;
 			$array['user_groups'][0]['user_uuid'] = $user_uuid;
 
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('user_group_delete', 'temp');
 
 			$database->delete($array);
@@ -297,7 +297,7 @@
 					$array_delete['user_settings'][0]['user_setting_subcategory'] = 'language';
 					$array_delete['user_settings'][0]['user_uuid'] = $user_uuid;
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('user_setting_delete', 'temp');
 
 					$database->delete($array_delete);
@@ -345,7 +345,7 @@
 					$array_delete['user_settings'][0]['user_setting_subcategory'] = 'time_zone';
 					$array_delete['user_settings'][0]['user_uuid'] = $user_uuid;
 
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('user_setting_delete', 'temp');
 
 					$database->delete($array_delete);
@@ -394,7 +394,7 @@
 						$array_delete['user_settings'][0]['user_setting_subcategory'] = 'key';
 						$array_delete['user_settings'][0]['user_uuid'] = $user_uuid;
 
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('user_setting_delete', 'temp');
 
 						$database->delete($array_delete);
@@ -555,7 +555,7 @@
 			$x++;
 
 		//add the user_edit permission
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add("user_setting_add", "temp");
 			$p->add("user_setting_edit", "temp");
 			$p->add("user_edit", "temp");
diff --git a/logout.php b/logout.php
index 176edd78ae..108163ef28 100644
--- a/logout.php
+++ b/logout.php
@@ -89,7 +89,7 @@
 							$array['user_settings'][0]['user_setting_value'] = $referrer;
 							$array['user_settings'][0]['user_setting_enabled'] = 'true';
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('user_setting_add', 'temp');
 						//execute insert
 							$database = new database;
diff --git a/resources/classes/directory.php b/resources/classes/directory.php
index c000e60df3..fc1574aea0 100644
--- a/resources/classes/directory.php
+++ b/resources/classes/directory.php
@@ -179,7 +179,7 @@
 						$array['extensions'][0]['description'] = $description;
 
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('extension_add', 'temp');
 
 					//execute insert
@@ -282,7 +282,7 @@
 				$array['extensions'][0]['description'] = $description;
 
 			//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('extension_edit', 'temp');
 
 			//execute insert
@@ -304,7 +304,7 @@
 					$array['extensions'][0]['extension_uuid'] = $extension_uuid;
 					$array['extensions'][0]['domain_uuid'] = $domain_uuid;
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('extension_delete', 'temp');
 				//execute delete
 					$database = new database;
diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 8d3fd4c643..2875616cdd 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -707,7 +707,7 @@ if (!class_exists('domains')) {
 			//add the missing default settings
 				if (isset($array) && is_array($array) && count($array) > 0) {
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('default_setting_add', 'temp');
 
 					//execute insert
diff --git a/resources/classes/email.php b/resources/classes/email.php
index 18ebc9b64b..81cf026dd3 100644
--- a/resources/classes/email.php
+++ b/resources/classes/email.php
@@ -335,7 +335,7 @@ if (!class_exists('email')) {
 				}
 
 				//add temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add("email_queue_add", 'temp');
 				$p->add("email_queue_attachment_add", 'temp');
 
diff --git a/resources/classes/groups.php b/resources/classes/groups.php
index 430110d914..2bf85c4e63 100644
--- a/resources/classes/groups.php
+++ b/resources/classes/groups.php
@@ -141,7 +141,7 @@ if (!class_exists('groups')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('group_permission_delete', 'temp');
 
 								//execute delete
@@ -193,7 +193,7 @@ if (!class_exists('groups')) {
 							if (is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('user_group_delete', 'temp');
 
 								//execute delete
@@ -437,7 +437,7 @@ if (!class_exists('groups')) {
 					$group_uuids[$array['groups'][$x]['group_name']] = $array['groups'][$x]['group_uuid'];
 
 					//add the temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("group_add", "temp");
 					$p->add("group_edit", "temp");
 
@@ -482,7 +482,7 @@ if (!class_exists('groups')) {
 					unset($group_uuids);
 
 					//add the temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add("group_permission_add", "temp");
 					$p->add("group_permission_edit", "temp");
 
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 3ab7b1372f..194956d409 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -142,7 +142,7 @@ if (!class_exists('menu')) {
 						//delete the checked rows
 							if (is_array($array) && @sizeof($array) != 0) {
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('menu_item_delete', 'temp');
 									$p->add('menu_item_group_delete', 'temp');
 									$p->add('menu_language_delete', 'temp');
@@ -223,7 +223,7 @@ if (!class_exists('menu')) {
 							if (!empty($array) && is_array($array) && @sizeof($array) != 0) {
 
 								//grant temporary permissions
-									$p = new permissions;
+									$p = permissions::new();
 									$p->add('menu_language_delete', 'temp');
 									$p->add('menu_item_group_delete', 'temp');
 
@@ -507,7 +507,7 @@ if (!class_exists('menu')) {
 					}
 					if (is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('menu_item_add', 'temp');
 							$p->add('menu_language_add', 'temp');
 						//execute insert
@@ -572,7 +572,7 @@ if (!class_exists('menu')) {
 
 					if (is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('menu_item_group_add', 'temp');
 						//execute insert
 							$this->database->app_name = 'menu';
@@ -901,7 +901,7 @@ if (!class_exists('menu')) {
 						$array['menus'][0]['menu_description'] = 'Default Menu';
 
 					//grant temporary permissions
-						$p = new permissions;
+						$p = permissions::new();
 						$p->add('menu_add', 'temp');
 
 					//execute insert
@@ -1082,7 +1082,7 @@ if (!class_exists('menu')) {
 						$user_graphic = "<i class='".$this->settings->get('theme', 'body_header_icon_user', 'fa-solid fa-user-circle')."'></i>";
 						//overwrite user graphic with image from session, if exists
 						if ($this->settings->get('theme', 'body_header_user_image', true) == true && !empty($_SESSION['user']['contact_image']) && is_uuid($_SESSION['user']['contact_image'])) {
-							$user_graphic = "<span style=\"display: inline-block; vertical-align: middle; width: 15px; height: 15px; border-radius: 50%; margin-top: -2px; background-image: url('".PROJECT_PATH."/app/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></span>";
+							$user_graphic = "<span style=\"display: inline-block; vertical-align: middle; width: 15px; height: 15px; border-radius: 50%; margin-top: -2px; background-image: url('".PROJECT_PATH."/core/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></span>";
 						}
 						$html .= "		<li class='nav-item'>\n";
 						$html .= "			<a class='nav-link header_user d-block d-sm-none' href='show:usermenu' title=\"".$_SESSION['username']."\" style='border-top: 1px solid ".($this->settings->get('theme', 'menu_sub_background_color') ?? 'rgba(0,0,0,0.90)')."' data-toggle='collapse' data-target='#main_navbar' onclick=\"event.preventDefault(); $('#body_header_user_menu').toggleFadeSlide();\">".($user_graphic ?? null)."<span style='margin-left: 7px;'>".escape($_SESSION['username'])."</span></a>";
@@ -1126,7 +1126,7 @@ if (!class_exists('menu')) {
 					$html .= "<div id='body_header_user_menu'>\n";
 					$html .= "	<div class='row m-0'>\n";
 					if (!empty($_SESSION['user']['contact_image']) && is_uuid($_SESSION['user']['contact_image'])) {
-						$html .= "	<div class='col-5 col-sm-6 p-0' style=\"min-width: 130px; background-image: url('".PROJECT_PATH."/app/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></div>\n";
+						$html .= "	<div class='col-5 col-sm-6 p-0' style=\"min-width: 130px; background-image: url('".PROJECT_PATH."/core/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></div>\n";
 					}
 					else {
 						$html .= "	<div class='col-5 col-sm-6 p-0 pt-1' style=\"min-width: 130px; cursor: help;\" title=\"".$this->text['label-primary-contact-attachment-image']."\"><i class='fa-solid fa-user-circle fa-8x' style='opacity: 0.1;'></i></div>\n";
@@ -1165,30 +1165,29 @@ if (!class_exists('menu')) {
 		public function menu_vertical($menu_array) {
 			//set defaults
 				$menu_side_state = $this->settings->get('theme', 'menu_side_state', 'contracted');
-				$menu_side_state_style = $menu_side_state !== 'expanded' ? 'display: none;' : '';
 				$menu_side_state_class = $menu_side_state !== 'hidden' ? 'hide-sm-up ' : '';
 			//menu brand image and/or text
 				$html = "	<div id='menu_side_control_container'>\n";
-				$html .= "		<div class='menu_side_control_state' style='float: right; $menu_side_state_style'>\n";
+				$html .= "		<div class='menu_side_control_state' style='float: right; ".($menu_side_state != 'expanded' ? "display: none;" : null)."'>\n";
 				if ($this->settings->get('theme', 'menu_brand_type') != 'none') {
-					$html .= "		<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='height: 60px; padding: 19px 16px 8px 16px !important; $menu_side_state_style'><i class='fa-solid fa-bars fa-fw'></i></a>";
+					$html .= "		<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='height: 60px; padding: 19px 16px 8px 16px !important; ".($menu_side_state != 'expanded' ? "display: none;" : null)."'><i class='fa-solid fa-bars fa-fw'></i></a>";
 				}
 				$html .= "		</div>\n";
 				$menu_brand_text = escape($this->settings->get('theme', 'menu_brand_text', 'FusionPBX'));
 				switch ($this->settings->get('theme', 'menu_brand_type', '')) {
 					case 'none':
-						$html .= "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='$menu_side_state_style height: 60px; min-width: ".intval($this->settings->get('theme', 'menu_side_width_contracted', 60))."px;' title=\"".$this->text['theme-label-contract_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 11px;'></i></a>";
-						$html .= "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();' style='$menu_side_state_style height: 60px;' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 11px;'></i></a>";
+						$html .= "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='".($menu_side_state != 'expanded' ? "display: none;" : null)." height: 60px; min-width: ".intval($this->settings->get('theme', 'menu_side_width_contracted', 60))."px;' title=\"".$this->text['theme-label-contract_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 11px;'></i></a>";
+						$html .= "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();' style='".($menu_side_state == 'expanded' ? "display: none;" : null)." height: 60px;' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 11px;'></i></a>";
 						break;
 					case 'text':
-						$html .= "<a class='menu_brand_text' style='$menu_side_state_style' href='".PROJECT_PATH."/'>".escape($menu_brand_text)."</a>\n";
-						$html .= "<a class='menu_side_item_main menu_side_expand' style='height: 60px; padding-top: 19px; $menu_side_state_style' onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
+						$html .= "<a class='menu_brand_text' style='".($menu_side_state != 'expanded' ? "display: none;" : null)."' href='".PROJECT_PATH."/'>".escape($menu_brand_text)."</a>\n";
+						$html .= "<a class='menu_side_item_main menu_side_expand' style='height: 60px; padding-top: 19px; ".($menu_side_state == 'expanded' ? "display: none;" : null)."' onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
 						break;
 					case 'image_text':
 						$menu_brand_image_contracted = $this->settings->get('theme', 'menu_side_brand_image_contracted', PROJECT_PATH.'/themes/default/images/logo_side_contracted.png');
 						$html .= "<a class='menu_brand_image' href='".PROJECT_PATH."/'>";
-						$html .= 	"<img id='menu_brand_image_contracted' style='$menu_side_state_style' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-						$html .= 	"<span id='menu_brand_image_expanded' class='menu_brand_text' style='$menu_side_state_style'>".escape($menu_brand_text)."</span>";
+						$html .= 	"<img id='menu_brand_image_contracted' style='".($menu_side_state == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+						$html .= 	"<span id='menu_brand_image_expanded' class='menu_brand_text' style='".($menu_side_state != 'expanded' ? "display: none;" : null)."'>".escape($menu_brand_text)."</span>";
 						$html .= "</a>\n";
 						break;
 					case 'image':
@@ -1196,8 +1195,8 @@ if (!class_exists('menu')) {
 						$menu_brand_image_contracted = $this->settings->get('theme', 'menu_side_brand_image_contracted', PROJECT_PATH.'/themes/default/images/logo_side_contracted.png');
 						$menu_brand_image_expanded = $this->settings->get('theme', 'menu_side_brand_image_expanded', PROJECT_PATH.'/themes/default/images/logo_side_expanded.png');
 						$html .= "<a class='menu_brand_image' href='".PROJECT_PATH."/'>";
-						$html .= 	"<img id='menu_brand_image_contracted' style='$menu_side_state_style' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
-						$html .= 	"<img id='menu_brand_image_expanded' style='$menu_side_state_style' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
+						$html .= 	"<img id='menu_brand_image_contracted' style='".($menu_side_state == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
+						$html .= 	"<img id='menu_brand_image_expanded' style='".($menu_side_state != 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
 						$html .= "</a>\n";
 						break;
 				}
@@ -1208,12 +1207,12 @@ if (!class_exists('menu')) {
 						$menu_target = ($menu_item_main['menu_item_category'] == 'external') ? '_blank' : '';
 						$html .= "	<a class='menu_side_item_main' ".(!empty($menu_item_main['menu_item_link']) ? "href='".$menu_item_main['menu_item_link']."' target='".$menu_target."'" : "onclick=\"menu_side_expand(); menu_side_item_toggle('".$menu_item_main['menu_item_uuid']."');\"")." title=\"".$menu_item_main['menu_language_title']."\">";
 						if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0 && $this->settings->get('theme', 'menu_side_item_main_sub_icons', true) === true) {
-							$html .= "	<div class='menu_side_item_main_sub_icons' style='float: right; margin-right: -1px; $menu_side_state_style'><i id='sub_arrow_".$menu_item_main['menu_item_uuid']."' class='sub_arrows ".$this->settings->get('theme', 'menu_side_item_main_sub_icon_expand', 'fa-solid fa-chevron-down')." fa-xs'></i></div>\n";
+							$html .= "	<div class='menu_side_item_main_sub_icons' style='float: right; margin-right: -1px; ".($menu_side_state != 'expanded' ? "display: none;" : null)."'><i id='sub_arrow_".$menu_item_main['menu_item_uuid']."' class='sub_arrows ".$this->settings->get('theme', 'menu_side_item_main_sub_icon_expand', 'fa-solid fa-chevron-down')." fa-xs'></i></div>\n";
 						}
 						if (!empty($menu_item_main['menu_item_icon']) && substr($menu_item_main['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon
 							$html .= "<i class='menu_side_item_icon ".$menu_item_main['menu_item_icon']." fa-fw' style='z-index: 99800; margin-right: 8px;'></i>";
 						}
-						$html .= "<span class='menu_side_item_title' style='$menu_side_state_style'>".$menu_item_main['menu_language_title']."</span>";
+						$html .= "<span class='menu_side_item_title' style='".($menu_side_state != 'expanded' ? "display: none;" : null)."'>".$menu_item_main['menu_language_title']."</span>";
 						$html .= "</a>\n";
 						//sub menu items
 							if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0) {
@@ -1229,7 +1228,7 @@ if (!class_exists('menu')) {
 										}
 									}
 									$html .= "		<a class='menu_side_item_sub' ".($menu_item_sub['menu_item_category'] == 'external' ? "target='_blank'" : null)." href='".$menu_item_sub['menu_item_link']."'>";
-									$html .= 			"<span class='menu_side_item_title' style='$menu_side_state_style'>".$menu_item_sub['menu_language_title']."</span>";
+									$html .= 			"<span class='menu_side_item_title' style='".($menu_side_state != 'expanded' ? "display: none;" : null)."'>".$menu_item_sub['menu_language_title']."</span>";
 									$html .= 		$menu_sub_icon."</a>\n";
 								}
 								$html .= "	</div>\n";
@@ -1259,7 +1258,7 @@ if (!class_exists('menu')) {
 				$html .= "<div id='body_header_user_menu'>\n";
 				$html .= "	<div class='row m-0'>\n";
 				if (!empty($_SESSION['user']['contact_image']) && is_uuid($_SESSION['user']['contact_image'])) {
-					$html .= "	<div class='col-5 col-sm-6 p-0' style=\"min-width: 130px; background-image: url('".PROJECT_PATH."/app/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></div>\n";
+					$html .= "	<div class='col-5 col-sm-6 p-0' style=\"min-width: 130px; background-image: url('".PROJECT_PATH."/core/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></div>\n";
 				}
 				else {
 					$html .= "	<div class='col-5 col-sm-6 p-0 pt-1' style=\"min-width: 130px; cursor: help;\" title=\"".$this->text['label-primary-contact-attachment-image']."\"><i class='fa-solid fa-user-circle fa-8x' style='opacity: 0.1;'></i></div>\n";
@@ -1308,7 +1307,7 @@ if (!class_exists('menu')) {
 					//overwrite user graphic with image from session, if exists
 					if ($this->settings->get('theme', 'body_header_user_image', true) === true && !empty($_SESSION['user']['contact_image']) && is_uuid($_SESSION['user']['contact_image'])) {
 						$user_graphic_size = str_replace(['px','%'], '', intval($this->settings->get('theme', 'body_header_user_image_size', 18)));
-						$user_graphic = "<span style=\"display: inline-block; vertical-align: middle; width: ".$user_graphic_size."px; height: ".$user_graphic_size."px; border-radius: 50%; margin-right: 7px; margin-top: ".($user_graphic_size > 18 ? '-'.(ceil(($user_graphic_size - 18) / 2) - 4) : '-4')."px; background-image: url('".PROJECT_PATH."/app/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></span>";
+						$user_graphic = "<span style=\"display: inline-block; vertical-align: middle; width: ".$user_graphic_size."px; height: ".$user_graphic_size."px; border-radius: 50%; margin-right: 7px; margin-top: ".($user_graphic_size > 18 ? '-'.(ceil(($user_graphic_size - 18) / 2) - 4) : '-4')."px; background-image: url('".PROJECT_PATH."/core/contacts/contact_attachment.php?id=".$_SESSION['user']['contact_image']."&action=download&sid=".session_id()."'); background-repeat: no-repeat; background-size: cover; background-position: center;\"></span>";
 					}
 					$html .= "<span style='display: inline-block; padding-right: 20px; font-size: 90%;'>\n";
 					$html .= "	<a href='show:usermenu' title=\"".$_SESSION['username']."\" onclick=\"event.preventDefault(); $('#body_header_user_menu').toggleFadeSlide();\">".($user_graphic ?? null)."<span class='d-none d-sm-inline'>".escape($_SESSION['username'])."</span></a>";
diff --git a/resources/classes/permissions.php b/resources/classes/permissions.php
index 44c6740c03..4c61d748a9 100644
--- a/resources/classes/permissions.php
+++ b/resources/classes/permissions.php
@@ -35,6 +35,7 @@ if (!class_exists('permissions')) {
 		private $user_uuid;
 		private $groups;
 		private $permissions;
+		private static $permission;
 
 		/**
 		 * called when the object is created
@@ -80,7 +81,7 @@ if (!class_exists('permissions')) {
 
 				//get the list of groups assigned to the user
 				if (!empty($this->groups)) {
-					$this->permissions = $this->assigned();
+					$this->assigned();
 				}
 			}
 		}
@@ -99,7 +100,7 @@ if (!class_exists('permissions')) {
 		public function add($permission, $type) {
 			//add the permission if it is not in array
 			if (!$this->exists($permission)) {
-				$_SESSION["permissions"][$permission] = $type;
+				$this->permissions[$permission] = $type;
 			}
 		}
 
@@ -108,15 +109,15 @@ if (!class_exists('permissions')) {
 		 * @var string $permission
 		 */
 		public function delete($permission, $type) {
-			if ($this->exists($permission) && !empty($_SESSION["permissions"][$permission])) {
+			if ($this->exists($permission) && !empty($this->permissions[$permission])) {
 				if ($type === "temp") {
-					if ($_SESSION["permissions"][$permission] === "temp") {
-						unset($_SESSION["permissions"][$permission]);
+					if ($this->permissions[$permission] === "temp") {
+						unset($this->permissions[$permission]);
 					}
 				}
 				else {
-					if ($_SESSION["permissions"][$permission] !== "temp") {
-						unset($_SESSION["permissions"][$permission]);
+					if ($this->permissions[$permission] !== "temp") {
+						unset($this->permissions[$permission]);
 					}
 				}
 			}
@@ -145,8 +146,9 @@ if (!class_exists('permissions')) {
 		 * get the assigned permissions
 		 * @var array $groups
 		 */
-		public function assigned() {
+		private function assigned() {
 			//define the array
+			$permissions = [];
 			$parameter_names = [];
 
 			//return empty array if there are no groups
@@ -170,9 +172,15 @@ if (!class_exists('permissions')) {
 			$sql .= "and group_name in (".implode(", ", $parameter_names).") \n";
 			$sql .= "and permission_assigned = 'true' ";
 			$parameters['domain_uuid'] = $this->domain_uuid;
-			$permissions = $this->database->select($sql, $parameters, 'all');
-			unset($sql, $parameters, $result);
-			return $permissions;
+			$group_permissions = $this->database->select($sql, $parameters, 'all');
+
+			//format the permission array
+			foreach ($group_permissions as $row) {
+				$permissions[$row['permission_name']] = 1;
+			}
+
+			//save permissions to this object
+			$this->permissions = $permissions;
 		}
 
 		/**
@@ -180,22 +188,32 @@ if (!class_exists('permissions')) {
 		 */
 		public function session() {
 			if (!empty($this->permissions)) {
-				foreach ($this->permissions as $row) {
-					$_SESSION['permissions'][$row["permission_name"]] = true;
-					$_SESSION["user"]["permissions"][$row["permission_name"]] = true;
+				foreach ($this->permissions as $permission_name => $row) {
+					$_SESSION['permissions'][$permission_name] = true;
+					$_SESSION["user"]["permissions"][$permission_name] = true;
 				}
 			}
 		}
 
+		/**
+		 * Returns a new permission object
+		 */
+		public static function new($database = null, $domain_uuid = null, $user_uuid = null) {
+			if (self::$permission === null) {
+				self::$permission = new permissions($database, $domain_uuid, $user_uuid);
+			}
+			return self::$permission;
+		}
+
 	}
 }
 
 //examples
 	/*
 	//add the permission
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add($permission);
 	//delete the permission
-		$p = new permissions;
+		$p = permissions::new();
 		$p->delete($permission);
 	*/
diff --git a/resources/classes/settings.php b/resources/classes/settings.php
index acc348636a..b2a85e024a 100644
--- a/resources/classes/settings.php
+++ b/resources/classes/settings.php
@@ -188,7 +188,7 @@ class settings {
 		$record[$table_name][0][$table_prefix.'_setting_description'] = $description;
 
 		//grant temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add($table_prefix.'_setting_add', 'temp');
 		$p->add($table_prefix.'_setting_edit', 'temp');
 
diff --git a/resources/classes/switch_settings.php b/resources/classes/switch_settings.php
index 0843b4a6cb..3457dba41e 100644
--- a/resources/classes/switch_settings.php
+++ b/resources/classes/switch_settings.php
@@ -248,7 +248,7 @@ if (!class_exists('switch_settings')) {
 					}
 					if (is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
-							$p = new permissions;
+							$p = permissions::new();
 							$p->add('default_setting_add', 'temp');
 
 						//execute insert
diff --git a/resources/functions.php b/resources/functions.php
index 4575fb635d..116883b284 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -323,8 +323,9 @@
 	if (!function_exists('permission_exists')) {
 
 		function permission_exists($permission_name) {
+			global $domain_uuid, $user_uuid;
 			$database = database::new();
-			$permission = new permissions($database);
+			$permission = permissions::new($database, $domain_uuid, $user_uuid);
 			return $permission->exists($permission_name);
 		}
 
@@ -722,7 +723,7 @@
 					$array['extension_users'][$x]['extension_uuid'] = $extension_uuid;
 					$array['extension_users'][$x]['user_uuid'] = $row["user_uuid"];
 					//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('extension_user_add', 'temp');
 					//execute insert
 					$database = database::new();
@@ -771,7 +772,7 @@
 				$array['user_groups'][0]['user_uuid'] = $user_uuid;
 
 				//grant temporary permissions
-				$p = new permissions;
+				$p = permissions::new();
 				$p->add('user_add', 'temp');
 				$p->add('user_group_add', 'temp');
 				//execute insert
@@ -2519,5 +2520,3 @@ if (!function_exists('get_memory_details')) {
 		return false;
 	}
 }
-
-?>
diff --git a/resources/header.php b/resources/header.php
index 90b63fd5e1..d044c9b18e 100644
--- a/resources/header.php
+++ b/resources/header.php
@@ -25,7 +25,18 @@
 */
 
 //includes files
-    require_once __DIR__ . "/require.php";
+	require_once __DIR__ . "/require.php";
+
+//start the session
+	ini_set("session.cookie_httponly", true);
+	if (!isset($_SESSION)) { session_start(); }
+
+//set the domains session
+	if (!isset($_SESSION['domains'])) {
+		$domain = new domains();
+		$domain->session();
+		$domain->set();
+	}
 
 //if reloadxml then run the command
 	if (permission_exists('dialplan_edit') && isset($_SESSION["reload_xml"])) {
diff --git a/resources/switch.php b/resources/switch.php
index 5aba89499c..906942b404 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -519,7 +519,7 @@ function dialplan_add($domain_uuid, $dialplan_uuid, $dialplan_name, $dialplan_or
 		$array['dialplans'][0]['dialplan_enabled'] = $dialplan_enabled;
 		$array['dialplans'][0]['dialplan_description'] = $dialplan_description;
 	//grant temporary permissions
-		$p = new permissions;
+		$p = permissions::new();
 		$p->add('dialplan_add', 'temp');
 	//execute insert
 		$database = new database;
diff --git a/resources/templates/provision/cisco/spa192/{$mac}.xml b/resources/templates/provision/cisco/spa192/{$mac}.xml
index 7638a0506f..be860089ad 100644
--- a/resources/templates/provision/cisco/spa192/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa192/{$mac}.xml
@@ -1,107 +1,114 @@
-<!--<?xmlversion="1.0" encoding="UTF-8"?>-->
+<?xml version="1.0"?>
 <flat-profile>
-	
-<!--Parametersfor SystemTab -->
-<!--SystemConfiguration-->
-<Restricted_Access_Domains ua="na"/>
-<IVR_Admin_Passwd ua="na"/>
+<!-- Parameters for System Tab -->
+
+<!-- System Configuration -->
+<Restricted_Access_Domains ua="na"></Restricted_Access_Domains>
+<IVR_Admin_Passwd ua="na"></IVR_Admin_Passwd>
 <Network_Startup_Delay ua="na">3</Network_Startup_Delay>
 
-<!--MiscellaneousSettings-->
+<!-- Miscellaneous Settings -->
 <DNS_Query_TTL_Ignore ua="na">No</DNS_Query_TTL_Ignore>
 
-Parametersfor ProvisioningTab 
-<!--ConfigurationProfile-->
+<!-- Parameters for Provisioning Tab -->
+
+<!-- Account Profile -->
+<User_ID ua="rw"></User_ID>
+<Password ua="rw"/>
+
+<!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
 <Resync_Random_Delay ua="na">2</Resync_Random_Delay>
-<Resync_At__HHmm_ ua="na"/>
+<Resync_At__HHmm_ ua="na"></Resync_At__HHmm_>
 <Resync_At_Random_Delay ua="na">0</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
 <Resync_Error_Retry_Delay ua="na">30</Resync_Error_Retry_Delay>
 <Forced_Resync_Delay ua="na">20</Forced_Resync_Delay>
 <Resync_From_SIP ua="na">Yes</Resync_From_SIP>
 <Resync_After_Upgrade_Attempt ua="na">Yes</Resync_After_Upgrade_Attempt>
-<Resync_Trigger_1 ua="na"/>
-<Resync_Trigger_2 ua="na"/>
+<Resync_Trigger_1 ua="na"></Resync_Trigger_1>
+<Resync_Trigger_2 ua="na"></Resync_Trigger_2>
 <Resync_Fails_On_FNF ua="na">Yes</Resync_Fails_On_FNF>
+<HTTPS_Name_Validate ua="na">Yes</HTTPS_Name_Validate>
 <!--{if isset ($spa_provision_url)}-->
 <Profile_Rule>[--uid {$http_auth_username} --pwd {$http_auth_password}]http://{$domain_name}{$project_path}/app/provision/?mac=$MA</Profile_Rule>
 {else}
 <Profile_Rule>http://{$domain_name}{$project_path}/app/provision/?mac=$MA</Profile_Rule>
 {/if}
-<Profile_Rule_B ua="na"/>
-<Profile_Rule_C ua="na"/>
-<Profile_Rule_D ua="na"/>
-<DHCP_Option_To_Use ua="na"/> <!--Default: 66,160,159,150-->
-<Transport_Protocol ua="na">HTTP</Transport_Protocol> <!--Default: HTTP, options: None/TFTP/HTTP/HTTPS-->
+<Profile_Rule_B ua="na"></Profile_Rule_B>
+<Profile_Rule_C ua="na"></Profile_Rule_C>
+<Profile_Rule_D ua="na"></Profile_Rule_D>
+<DHCP_Option_To_Use ua="na">66,160,159,150</DHCP_Option_To_Use>
+<Transport_Protocol ua="na">https</Transport_Protocol><!--Default: HTTP, options: None/TFTP/HTTP/HTTPS-->
 <Log_Resync_Request_Msg ua="na">$PN $MAC -- Requesting resync $SCHEME://$SERVIP:$PORT$PATH</Log_Resync_Request_Msg>
 <Log_Resync_Success_Msg ua="na">$PN $MAC -- Successful resync $SCHEME://$SERVIP:$PORT$PATH</Log_Resync_Success_Msg>
 <Log_Resync_Failure_Msg ua="na">$PN $MAC -- Resync failed: $ERR</Log_Resync_Failure_Msg>
-<Report_Rule ua="na"/>
-<SP_Default ua="na"/>
+<Report_Rule ua="na"></Report_Rule>
+<SP_Default ua="na"></SP_Default>
 
-<!--FirmwareUpgrade-->
+<!-- Firmware Upgrade -->
 <Upgrade_Enable ua="na">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay ua="na">3600</Upgrade_Error_Retry_Delay>
-<Downgrade_Rev_Limit ua="na"/>
-<Upgrade_Rule ua="na"/>
+<Downgrade_Rev_Limit ua="na"></Downgrade_Rev_Limit>
+<Upgrade_Rule ua="na"></Upgrade_Rule>
 <Log_Upgrade_Request_Msg ua="na">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
-<License_Keys ua="na"/>
-<Recovery_URL ua="na"/>
+<License_Keys ua="na"></License_Keys>
+<Recovery_URL ua="na"></Recovery_URL>
 
-<!--CA Settings-->
-<Custom_CA_URL ua="na"/>
+<!-- CA Settings -->
+<Custom_CA_URL ua="na"></Custom_CA_URL>
 
-<!--GeneralPurposeParameters-->
-<GPP_A ua="na"/>
-<GPP_B ua="na"/>
-<GPP_C ua="na"/>
-<GPP_D ua="na"/>
-<GPP_E ua="na"/>
-<GPP_F ua="na"/>
-<GPP_G ua="na"/>
-<GPP_H ua="na"/>
-<GPP_I ua="na"/>
-<GPP_J ua="na"/>
-<GPP_K ua="na"/>
-<GPP_L ua="na"/>
-<GPP_M ua="na"/>
-<GPP_N ua="na"/>
-<GPP_O ua="na"/>
-<GPP_P ua="na"/>
+<!-- General Purpose Parameters -->
+<GPP_A ua="na"></GPP_A>
+<GPP_B ua="na"></GPP_B>
+<GPP_C ua="na"></GPP_C>
+<GPP_D ua="na"></GPP_D>
+<GPP_E ua="na"></GPP_E>
+<GPP_F ua="na"></GPP_F>
+<GPP_G ua="na"></GPP_G>
+<GPP_H ua="na"></GPP_H>
+<GPP_I ua="na"></GPP_I>
+<GPP_J ua="na"></GPP_J>
+<GPP_K ua="na"></GPP_K>
+<GPP_L ua="na"></GPP_L>
+<GPP_M ua="na"></GPP_M>
+<GPP_N ua="na"></GPP_N>
+<GPP_O ua="na"></GPP_O>
+<GPP_P ua="na"></GPP_P>
 <GPP_SA ua="na"/>
 <GPP_SB ua="na"/>
 <GPP_SC ua="na"/>
 <GPP_SD ua="na"/>
 
-<!--Parametersfor SIP Tab -->
-<!--SIP Parameters-->
+<!-- Parameters for SIP Tab -->
+
+<!-- SIP Parameters -->
 <Max_Forward ua="na">70</Max_Forward>
 <Max_Redirection ua="na">5</Max_Redirection>
 <Max_Auth ua="na">2</Max_Auth>
 <SIP_User_Agent_Name ua="na">$VERSION</SIP_User_Agent_Name>
 <SIP_Server_Name ua="na">$VERSION</SIP_Server_Name>
-<SIP_Reg_User_Agent_Name ua="na"/>
-<SIP_Reg_Starting_Sequence_Number ua="na"/>
-<SIP_Accept_Language ua="na"/>
+<SIP_Reg_User_Agent_Name ua="na"></SIP_Reg_User_Agent_Name>
+<SIP_Reg_Starting_Sequence_Number ua="na"></SIP_Reg_Starting_Sequence_Number>
+<SIP_Accept_Language ua="na"></SIP_Accept_Language>
 <DTMF_Relay_MIME_Type ua="na">application/dtmf-relay</DTMF_Relay_MIME_Type>
 <Hook_Flash_MIME_Type ua="na">application/hook-flash</Hook_Flash_MIME_Type>
-<Remove_Last_Reg ua="na">Yes</Remove_Last_Reg>
+<Remove_Last_Reg ua="na">No</Remove_Last_Reg>
 <Use_Compact_Header ua="na">No</Use_Compact_Header>
 <Escape_Display_Name ua="na">No</Escape_Display_Name>
 <RFC_2543_Call_Hold ua="na">Yes</RFC_2543_Call_Hold>
 <Mark_All_AVT_Packets ua="na">Yes</Mark_All_AVT_Packets>
 <AVT_Packet_Size ua="na">ptime</AVT_Packet_Size>
 <SIP_TCP_Port_Min ua="na">5060</SIP_TCP_Port_Min> <!--Default: 5060, The lowest TCP port number that can be used for SIP sessions-->
-<SIP_TCP_Port_Max ua="na">5090</SIP_TCP_Port_Max> <!--Default: 5080, The highest TCP port number that can be used for SIP sessions-->
+<SIP_TCP_Port_Max ua="na">5080</SIP_TCP_Port_Max> <!--Default: 5080, The highest TCP port number that can be used for SIP sessions-->
 <CTI_Enable ua="na">No</CTI_Enable> <!--Default: No, options: Yes/No-->
 <Keep_Referee_When_REFER_Failed ua="na">No</Keep_Referee_When_REFER_Failed>
 <Caller_ID_Header ua="na">PAID-RPID-FROM</Caller_ID_Header>
 
-<!--SIP TimerValues(sec)-->
+<!-- SIP Timer Values (sec) -->
 <SIP_T1 ua="na">.5</SIP_T1>
 <SIP_T2 ua="na">4</SIP_T2>
 <SIP_T4 ua="na">5</SIP_T4>
@@ -120,15 +127,15 @@ Parametersfor ProvisioningTab
 <Reg_Retry_Long_Random_Delay ua="na">0</Reg_Retry_Long_Random_Delay>
 <Reg_Retry_Intvl_Cap ua="na">0</Reg_Retry_Intvl_Cap>
 
-<!--ResponseStatusCodeHandling-->
-<SIT1_RSC ua="na"/>
-<SIT2_RSC ua="na"/>
-<SIT3_RSC ua="na"/>
-<SIT4_RSC ua="na"/>
-<Try_Backup_RSC ua="na"/>
-<Retry_Reg_RSC ua="na"/>
+<!-- Response Status Code Handling -->
+<SIT1_RSC ua="na"></SIT1_RSC>
+<SIT2_RSC ua="na"></SIT2_RSC>
+<SIT3_RSC ua="na"></SIT3_RSC>
+<SIT4_RSC ua="na"></SIT4_RSC>
+<Try_Backup_RSC ua="na"></Try_Backup_RSC>
+<Retry_Reg_RSC ua="na"></Retry_Reg_RSC>
 
-<!--RTP Parameters-->
+<!-- RTP Parameters -->
 <RTP_Port_Min ua="na">16384</RTP_Port_Min>
 <RTP_Port_Max ua="na">32768</RTP_Port_Max>
 <RTP_Packet_Size ua="na">0.020</RTP_Packet_Size>
@@ -137,11 +144,12 @@ Parametersfor ProvisioningTab
 <RTCP_Tx_Interval ua="na">0</RTCP_Tx_Interval>
 <No_UDP_Checksum ua="na">No</No_UDP_Checksum>
 <Stats_In_BYE ua="na">Yes</Stats_In_BYE>
+<Call_Statistics ua="na">Yes</Call_Statistics>
 
-<!--SDP PayloadTypes-->
+<!-- SDP Payload Types -->
 <NSE_Dynamic_Payload ua="na">100</NSE_Dynamic_Payload>
 <AVT_Dynamic_Payload ua="na">101</AVT_Dynamic_Payload>
-<INFOREQ_Dynamic_Payload ua="na"/>
+<INFOREQ_Dynamic_Payload ua="na"></INFOREQ_Dynamic_Payload>
 <G726r32_Dynamic_Payload ua="na">2</G726r32_Dynamic_Payload>
 <EncapRTP_Dynamic_Payload ua="na">112</EncapRTP_Dynamic_Payload>
 <RTP-Start-Loopback_Dynamic_Payload ua="na">113</RTP-Start-Loopback_Dynamic_Payload>
@@ -154,7 +162,7 @@ Parametersfor ProvisioningTab
 <G729a_Codec_Name ua="na">G729a</G729a_Codec_Name>
 <EncapRTP_Codec_Name ua="na">encaprtp</EncapRTP_Codec_Name>
 
-<!--NAT SupportParameters-->
+<!-- NAT Support Parameters -->
 <Handle_VIA_received ua="na">No</Handle_VIA_received>
 <Handle_VIA_rport ua="na">No</Handle_VIA_rport>
 <Insert_VIA_received ua="na">No</Insert_VIA_received>
@@ -163,28 +171,29 @@ Parametersfor ProvisioningTab
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
 <STUN_Enable ua="na">No</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
-<EXT_IP ua="na"/>
-<EXT_RTP_Port_Min ua="na"/>
+<STUN_Server ua="na"></STUN_Server>
+<EXT_IP ua="na"></EXT_IP>
+<EXT_RTP_Port_Min ua="na"></EXT_RTP_Port_Min>
 <NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 
-<!--Parameters for Line1 Tab -->
-<!--General-->
-<Line_Enable_1_ ua="na">Yes</Line_Enable_1_> <!--Default: Yes, options: Yes/No, To enable this line for service-->
+<!-- Parameters for Line 1 Tab -->
 
-<!--StreamingAudioServer(SAS)-->
+<!-- General -->
+<Line_Enable_1_ ua="na">Yes</Line_Enable_1_>
+
+<!-- Streaming Audio Server (SAS) -->
 <SAS_Enable_1_ ua="na">No</SAS_Enable_1_>
 <SAS_DLG_Refresh_Intvl_1_ ua="na">30</SAS_DLG_Refresh_Intvl_1_>
-<SAS_Inbound_RTP_Sink_1_ ua="na"/>
+<SAS_Inbound_RTP_Sink_1_ ua="na"></SAS_Inbound_RTP_Sink_1_>
 
-<!--NAT Settings-->
+<!-- NAT Settings -->
 <NAT_Mapping_Enable_1_ ua="na">Yes</NAT_Mapping_Enable_1_> <!--Default: No, options: Yes/No, To use externally mapped IP addresses and SIP/RTP ports in SIP messages, select Yes-->
 <NAT_Keep_Alive_Enable_1_ ua="na">Yes</NAT_Keep_Alive_Enable_1_> <!--Default: No, options: Yes/No, To send the configured NAT keep alive message periodically, select Yes-->
 <NAT_Keep_Alive_Msg_1_ ua="na">$NOTIFY</NAT_Keep_Alive_Msg_1_>
 <NAT_Keep_Alive_Dest_1_ ua="na">$PROXY</NAT_Keep_Alive_Dest_1_>
 
-<!--NetworkSettings-->
+<!-- Network Settings -->
 <SIP_ToS_DiffServ_Value_1_ ua="na">0x68</SIP_ToS_DiffServ_Value_1_>
 <SIP_CoS_Value_1_ ua="na">3</SIP_CoS_Value_1_>
 <RTP_ToS_DiffServ_Value_1_ ua="na">0xb8</RTP_ToS_DiffServ_Value_1_>
@@ -192,13 +201,13 @@ Parametersfor ProvisioningTab
 <Network_Jitter_Level_1_ ua="na">high</Network_Jitter_Level_1_> <!--Default: high, Select the appropriate setting: low, medium, high, very high, or extremely high (Set to High for FAX)-->
 <Jitter_Buffer_Adjustment_1_ ua="na">Yes</Jitter_Buffer_Adjustment_1_> <!--Default: Yes, options: Yes/No, To enable or disable this featuree-->
 
-<!--SIP Settings-->
+<!-- SIP Settings -->
 <SIP_Transport_1_ ua="na">UDP</SIP_Transport_1_> <!--Default: UDP, options: UDP/TCP/TLS-->
 <SIP_Port_1_ ua="na">5060</SIP_Port_1_> <!--Default: 5060, Port number of the SIP message listening and transmission port-->
 <SIP_100REL_Enable_1_ ua="na">No</SIP_100REL_Enable_1_>
-<EXT_SIP_Port_1_ ua="na"/>
+<EXT_SIP_Port_1_ ua="na"></EXT_SIP_Port_1_>
 <Auth_Resync-Reboot_1_ ua="na">Yes</Auth_Resync-Reboot_1_>
-<SIP_Proxy-Require_1_ ua="na"/>
+<SIP_Proxy-Require_1_ ua="na"></SIP_Proxy-Require_1_>
 <SIP_Remote-Party-ID_1_ ua="na">Yes</SIP_Remote-Party-ID_1_>
 <SIP_GUID_1_ ua="na">No</SIP_GUID_1_>
 <RTP_Log_Intvl_1_ ua="na">0</RTP_Log_Intvl_1_>
@@ -213,47 +222,54 @@ Parametersfor ProvisioningTab
 <Use_Anonymous_With_RPID_1_ ua="na">Yes</Use_Anonymous_With_RPID_1_>
 <Use_Local_Addr_In_FROM_1_ ua="na">No</Use_Local_Addr_In_FROM_1_>
 <Broadsoft_ALTC_1_ ua="na">No</Broadsoft_ALTC_1_>
+<TLS_Name_Validate_1_ ua="na">Yes</TLS_Name_Validate_1_>
 
-<!--CallFeatureSettings-->
+<!-- Call Feature Settings -->
 <Blind_Attn-Xfer_Enable_1_ ua="na">No</Blind_Attn-Xfer_Enable_1_>
-<MOH_Server_1_ ua="na"/>
+<MOH_Server_1_ ua="na"></MOH_Server_1_>
 <Xfer_When_Hangup_Conf_1_ ua="na">Yes</Xfer_When_Hangup_Conf_1_>
-<Conference_Bridge_URL_1_ ua="na"/>
+<Conference_Bridge_URL_1_ ua="na"></Conference_Bridge_URL_1_>
 <Conference_Bridge_Ports_1_ ua="na">3</Conference_Bridge_Ports_1_>
 <Enable_IP_Dialing_1_ ua="na">No</Enable_IP_Dialing_1_>
-<Emergency_Number_1_ ua="na"/>
-<Mailbox_ID_1_ ua="na"/>
-<Feature_Key_Sync_1_ ua="na">No</Feature_Key_Sync_1_> 
+<Emergency_Number_1_ ua="na"></Emergency_Number_1_>
+<Mailbox_ID_1_ ua="na"></Mailbox_ID_1_>
+<Feature_Key_Sync_1_ ua="na">No</Feature_Key_Sync_1_>
+<Secure_Call_Option_1_ ua="na">Optional</Secure_Call_Option_1_>
 
-<!--Proxyand Registration-->
+<!-- E911 Geolocation Configuration -->
+<Company_UUID_1_ ua="na"></Company_UUID_1_>
+<Primary_Request_URL_1_ ua="na"></Primary_Request_URL_1_>
+<Secondary_Request_URL_1_ ua="na"></Secondary_Request_URL_1_>
+
+<!-- Proxy and Registration -->
 <Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
 <Use_Outbound_Proxy_1_ ua="na">{if isset ($account.1.outbound_proxy_primary)}Yes{else}No{/if}</Use_Outbound_Proxy_1_>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
-<Registrar_Server_1_ ua="na"/>
+<Registrar_Server_1_ ua="na"></Registrar_Server_1_>
 <Register_1_ ua="na">Yes</Register_1_>
 <Make_Call_Without_Reg_1_ ua="na">No</Make_Call_Without_Reg_1_>
 <Register_Expires_1_ ua="na">{$account.1.register_expires}</Register_Expires_1_>
 <Ans_Call_Without_Reg_1_ ua="na">No</Ans_Call_Without_Reg_1_>
-<Use_DNS_SRV_1_ ua="na">Yes</Use_DNS_SRV_1_> <!--Default: No, options: Yes/No, Set to Yes for DNS SRV lookup for Proxy and Outbound Proxy-->
-<DNS_SRV_Auto_Prefix_1_ ua="na">Yes</DNS_SRV_Auto_Prefix_1_> <!--Default: No, options: Yes/No, Set to Yes, prepend the Proxy or Outbound Proxy name with _sip._udp when performing a DNS SRV lookup on that name-->
+<Use_DNS_SRV_1_ ua="na">No</Use_DNS_SRV_1_> <!--Default: No, options: Yes/No, Set to Yes for DNS SRV lookup for Proxy and Outbound Proxy-->
+<DNS_SRV_Auto_Prefix_1_ ua="na">No</DNS_SRV_Auto_Prefix_1_> <!--Default: No, options: Yes/No, Set to Yes, prepend the Proxy or Outbound Proxy name with _sip._udp when performing a DNS SRV lookup on that name-->
 <Proxy_Fallback_Intvl_1_ ua="na">3600</Proxy_Fallback_Intvl_1_>
 <Proxy_Redundancy_Method_1_ ua="na">Normal</Proxy_Redundancy_Method_1_>
-<Mailbox_Subscribe_URL_1_ ua="na"/>
-<Mailbox_Subscribe_Expires_1_ ua="na"/>
+<Mailbox_Subscribe_URL_1_ ua="na"></Mailbox_Subscribe_URL_1_>
+<Mailbox_Subscribe_Expires_1_ ua="na">2147483647</Mailbox_Subscribe_Expires_1_>
 <Auto_Register_When_Failover_1_ ua="na">No</Auto_Register_When_Failover_1_>
 
-<!--SubscriberInformation-->
+<!-- Subscriber Information -->
 <Display_Name_1_ ua="na">{$account.1.display_name}</Display_Name_1_>
 <User_ID_1_ ua="na">{$account.1.user_id}</User_ID_1_>
 <Password_1_ ua="na">{$account.1.password}</Password_1_>
 <Use_Auth_ID_1_ ua="na">No</Use_Auth_ID_1_>
-<Auth_ID_1_ ua="na"/>
-<Resident_Online_Number_1_ ua="na"/>
-<SIP_URI_1_ ua="na"/>
+<Auth_ID_1_ ua="na"></Auth_ID_1_>
+<Resident_Online_Number_1_ ua="na"></Resident_Online_Number_1_>
+<SIP_URI_1_ ua="na"></SIP_URI_1_>
 
-<!--SupplementaryServiceSubscription-->
-<Call_Waiting_Serv_1_ ua="na">{$spa_call_waiting}</Call_Waiting_Serv_1_>
+<!-- Supplementary Service Subscription -->
+<Call_Waiting_Serv_1_ ua="na">$spa_call_waiting}</Call_Waiting_Serv_1_>
 <Block_CID_Serv_1_ ua="na">Yes</Block_CID_Serv_1_>
 <Block_ANC_Serv_1_ ua="na">Yes</Block_ANC_Serv_1_>
 <Dist_Ring_Serv_1_ ua="na">Yes</Dist_Ring_Serv_1_>
@@ -284,11 +300,11 @@ Parametersfor ProvisioningTab
 <Reuse_CID_Number_As_Name_1_ ua="na">Yes</Reuse_CID_Number_As_Name_1_>
 <CONFCID_Serv_1_ ua="na">Yes</CONFCID_Serv_1_>
 
-<!--AudioConfiguration-->
+<!-- Audio Configuration -->
 <Preferred_Codec_1_ ua="na">G711u</Preferred_Codec_1_>
 <Second_Preferred_Codec_1_ ua="na">Unspecified</Second_Preferred_Codec_1_>
 <Third_Preferred_Codec_1_ ua="na">Unspecified</Third_Preferred_Codec_1_>
-<Use_Pref_Codec_Only_1_ ua="na">Yes</Use_Pref_Codec_Only_1_>
+<Use_Pref_Codec_Only_1_ ua="na">No</Use_Pref_Codec_Only_1_>
 <Codec_Negotiation_1_ ua="na">Default</Codec_Negotiation_1_>
 <G729a_Enable_1_ ua="na">Yes</G729a_Enable_1_>
 <Silence_Supp_Enable_1_ ua="na">No</Silence_Supp_Enable_1_>
@@ -302,7 +318,7 @@ Parametersfor ProvisioningTab
 <DTMF_Process_INFO_1_ ua="na">Yes</DTMF_Process_INFO_1_> <!--Default: Yes, options: Yes/No, To enable detection of V21 fax tones, select yes. Otherwise, select no-->
 <FAX_Passthru_Method_1_ ua="na">ReINVITE</FAX_Passthru_Method_1_> <!--Default: ReINVITE, Select the fax passthrough method options: None/NSE/ReINVITE-->
 <DTMF_Process_AVT_1_ ua="na">Yes</DTMF_Process_AVT_1_> <!--Default: Yes, options: Yes/No, To use the DTMF process AVT feature, select yes. Otherwise, select no-->
-<FAX_Process_NSE_1_ ua="na">Yes</FAX_Process_NSE_1_> <!--Default: Yes, options: Yes/No, To use the fax process NSE feature, select yes. Otherwise, select no--> 
+<FAX_Process_NSE_1_ ua="na">Yes</FAX_Process_NSE_1_> <!--Default: Yes, options: Yes/No, To use the fax process NSE feature, select yes. Otherwise, select no-->
 <DTMF_Tx_Method_1_ ua="na">Auto</DTMF_Tx_Method_1_> <!--Default: Auto, options: InBand/AVT/INFO/Auto, Select the method to transmit DTMF signals to the far end-->
 <FAX_Disable_ECAN_1_ ua="na">No</FAX_Disable_ECAN_1_> <!--Default: No, options: Yes/No, If enabled, this feature automatically disables the echo canceller when a fax tone is detected-->
 <DTMF_Tx_Mode_1_ ua="na">Strict</DTMF_Tx_Mode_1_> <!--Default: Strict, options: Normal/Strict, DTMF Detection Tx Mode is available for SIP information and AVT-->
@@ -317,31 +333,32 @@ Parametersfor ProvisioningTab
 <Modem_Line_1_ ua="na">No</Modem_Line_1_>
 <RTP_to_Proxy_in_Remote_Hold_1_ ua="na">No</RTP_to_Proxy_in_Remote_Hold_1_>
 
-<!--DialPlan-->
+<!-- Dial Plan -->
 <Dial_Plan_1_ ua="na">{$spa_dial_plan}</Dial_Plan_1_>
 
-<!--FXS PortPolarityConfiguration-->
+<!-- FXS Port Polarity Configuration -->
 <Idle_Polarity_1_ ua="na">Forward</Idle_Polarity_1_>
 <Caller_Conn_Polarity_1_ ua="na">Forward</Caller_Conn_Polarity_1_>
 <Callee_Conn_Polarity_1_ ua="na">Forward</Callee_Conn_Polarity_1_>
-<Profile_Stamp_1_ ua="na"/>
+<Profile_Stamp_1_ ua="na"></Profile_Stamp_1_>
 
-<!--Parametersfor Line2 Tab -->
-<!--General-->
-<Line_Enable_2_ ua="na">Yes</Line_Enable_2_> <!--Default: Yes, options: Yes/No, To enable this line for service-->
+<!-- Parameters for Line 2 Tab -->
 
-<!--StreamingAudioServer(SAS)-->
+<!-- General -->
+<Line_Enable_2_ ua="na">Yes</Line_Enable_2_><!--Default: Yes, options: Yes/No, To enable this line for service-->
+
+<!-- Streaming Audio Server (SAS) -->
 <SAS_Enable_2_ ua="na">No</SAS_Enable_2_>
 <SAS_DLG_Refresh_Intvl_2_ ua="na">30</SAS_DLG_Refresh_Intvl_2_>
-<SAS_Inbound_RTP_Sink_2_ ua="na"/>
+<SAS_Inbound_RTP_Sink_2_ ua="na"></SAS_Inbound_RTP_Sink_2_>
 
-<!--NAT Settings-->
-<NAT_Mapping_Enable_2_ ua="na">Yes</NAT_Mapping_Enable_2_> <!--Default: No, options: Yes/No, To use externally mapped IP addresses and SIP/RTP ports in SIP messages, select Yes-->
-<NAT_Keep_Alive_Enable_2_ ua="na">Yes</NAT_Keep_Alive_Enable_2_> <!--Default: No, options: Yes/No, To send the configured NAT keep alive message periodically, select Yes-->
+<!-- NAT Settings -->
+<NAT_Mapping_Enable_2_ ua="na">No</NAT_Mapping_Enable_2_><!--Default: No, options: Yes/No, To use externally mapped IP addresses and SIP/RTP ports in SIP messages, select Yes-->
+<NAT_Keep_Alive_Enable_2_ ua="na">No</NAT_Keep_Alive_Enable_2_><!--Default: No, options: Yes/No, To send the configured NAT keep alive message periodically, select Yes-->
 <NAT_Keep_Alive_Msg_2_ ua="na">$NOTIFY</NAT_Keep_Alive_Msg_2_>
 <NAT_Keep_Alive_Dest_2_ ua="na">$PROXY</NAT_Keep_Alive_Dest_2_>
 
-<!--NetworkSettings-->
+<!-- Network Settings -->
 <SIP_ToS_DiffServ_Value_2_ ua="na">0x68</SIP_ToS_DiffServ_Value_2_>
 <SIP_CoS_Value_2_ ua="na">3</SIP_CoS_Value_2_>
 <RTP_ToS_DiffServ_Value_2_ ua="na">0xb8</RTP_ToS_DiffServ_Value_2_>
@@ -349,13 +366,13 @@ Parametersfor ProvisioningTab
 <Network_Jitter_Level_2_ ua="na">high</Network_Jitter_Level_2_>
 <Jitter_Buffer_Adjustment_2_ ua="na">Yes</Jitter_Buffer_Adjustment_2_>
 
-<!--SIP Settings-->
+<!-- SIP Settings -->
 <SIP_Transport_2_ ua="na">UDP</SIP_Transport_2_> <!--Default: UDP, options: UDP/TCP/TLS-->
 <SIP_Port_2_ ua="na">5061</SIP_Port_2_> <!--Default: 5061, Port number of the SIP message listening and transmission port-->
 <SIP_100REL_Enable_2_ ua="na">No</SIP_100REL_Enable_2_>
-<EXT_SIP_Port_2_ ua="na"/>
+<EXT_SIP_Port_2_ ua="na"></EXT_SIP_Port_2_>
 <Auth_Resync-Reboot_2_ ua="na">Yes</Auth_Resync-Reboot_2_>
-<SIP_Proxy-Require_2_ ua="na"/>
+<SIP_Proxy-Require_2_ ua="na"></SIP_Proxy-Require_2_>
 <SIP_Remote-Party-ID_2_ ua="na">Yes</SIP_Remote-Party-ID_2_>
 <SIP_GUID_2_ ua="na">No</SIP_GUID_2_>
 <RTP_Log_Intvl_2_ ua="na">0</RTP_Log_Intvl_2_>
@@ -370,46 +387,53 @@ Parametersfor ProvisioningTab
 <Use_Anonymous_With_RPID_2_ ua="na">Yes</Use_Anonymous_With_RPID_2_>
 <Use_Local_Addr_In_FROM_2_ ua="na">No</Use_Local_Addr_In_FROM_2_>
 <Broadsoft_ALTC_2_ ua="na">No</Broadsoft_ALTC_2_>
+<TLS_Name_Validate_2_ ua="na">Yes</TLS_Name_Validate_2_>
 
-<!--CallFeatureSettings-->
+<!-- Call Feature Settings -->
 <Blind_Attn-Xfer_Enable_2_ ua="na">No</Blind_Attn-Xfer_Enable_2_>
-<MOH_Server_2_ ua="na"/>
+<MOH_Server_2_ ua="na"></MOH_Server_2_>
 <Xfer_When_Hangup_Conf_2_ ua="na">Yes</Xfer_When_Hangup_Conf_2_>
-<Conference_Bridge_URL_2_ ua="na"/>
+<Conference_Bridge_URL_2_ ua="na"></Conference_Bridge_URL_2_>
 <Conference_Bridge_Ports_2_ ua="na">3</Conference_Bridge_Ports_2_>
 <Enable_IP_Dialing_2_ ua="na">No</Enable_IP_Dialing_2_>
-<Emergency_Number_2_ ua="na"/>
-<Mailbox_ID_2_ ua="na"/>
+<Emergency_Number_2_ ua="na"></Emergency_Number_2_>
+<Mailbox_ID_2_ ua="na"></Mailbox_ID_2_>
 <Feature_Key_Sync_2_ ua="na">No</Feature_Key_Sync_2_>
+<Secure_Call_Option_2_ ua="na">Optional</Secure_Call_Option_2_>
 
-<!--Proxyand Registration-->
-<Proxy_2_ ua="na">{$domain_name}</Proxy_2_>
-<Outbound_Proxy_2_ ua="na">{$account.2.outbound_proxy_primary}</Outbound_Proxy_2_>
-<Use_Outbound_Proxy_2_ ua="na">{if isset ($account.2.outbound_proxy_primary)}Yes{else}No{/if}</Use_Outbound_Proxy_2_>
+<!-- E911 Geolocation Configuration -->
+<Company_UUID_2_ ua="na">{$domain_name}</Company_UUID_2_>
+<Primary_Request_URL_2_ ua="na">{$account.2.outbound_proxy_primary}</Primary_Request_URL_2_>
+<Secondary_Request_URL_2_ ua="na">{if isset ($account.2.outbound_proxy_primary)}Yes{else}No{/if}</Secondary_Request_URL_2_>
+
+<!-- Proxy and Registration -->
+<Proxy_2_ ua="na"></Proxy_2_>
+<Outbound_Proxy_2_ ua="na"></Outbound_Proxy_2_>
+<Use_Outbound_Proxy_2_ ua="na">No</Use_Outbound_Proxy_2_>
 <Use_OB_Proxy_In_Dialog_2_ ua="na">Yes</Use_OB_Proxy_In_Dialog_2_>
-<Registrar_Server_2_ ua="na"/>
+<Registrar_Server_2_ ua="na"></Registrar_Server_2_>
 <Register_2_ ua="na">Yes</Register_2_>
 <Make_Call_Without_Reg_2_ ua="na">No</Make_Call_Without_Reg_2_>
 <Register_Expires_2_ ua="na">{$account.2.register_expires}</Register_Expires_2_>
 <Ans_Call_Without_Reg_2_ ua="na">No</Ans_Call_Without_Reg_2_>
-<Use_DNS_SRV_2_ ua="na">Yes</Use_DNS_SRV_2_>  <!--Default: No, options: Yes/No, Set to Yes for DNS SRV lookup for Proxy and Outbound Proxy-->
-<DNS_SRV_Auto_Prefix_2_ ua="na">Yes</DNS_SRV_Auto_Prefix_2_> <!--Default: No, options: Yes/No, Set to Yes, prepend the Proxy or Outbound Proxy name with _sip._udp when performing a DNS SRV lookup on that name-->
+<Use_DNS_SRV_2_ ua="na">No</Use_DNS_SRV_2_> <!--Default: No, options: Yes/No, Set to Yes for DNS SRV lookup for Proxy and Outbound Proxy-->
+<DNS_SRV_Auto_Prefix_2_ ua="na">No</DNS_SRV_Auto_Prefix_2_> <!--Default: No, options: Yes/No, Set to Yes, prepend the Proxy or Outbound Proxy name with _sip._udp when performing a DNS SRV lookup on that name-->
 <Proxy_Fallback_Intvl_2_ ua="na">3600</Proxy_Fallback_Intvl_2_>
 <Proxy_Redundancy_Method_2_ ua="na">Normal</Proxy_Redundancy_Method_2_>
-<Mailbox_Subscribe_URL_2_ ua="na"/>
-<Mailbox_Subscribe_Expires_2_ ua="na"/>
+<Mailbox_Subscribe_URL_2_ ua="na"></Mailbox_Subscribe_URL_2_>
+<Mailbox_Subscribe_Expires_2_ ua="na">2147483647</Mailbox_Subscribe_Expires_2_>
 <Auto_Register_When_Failover_2_ ua="na">No</Auto_Register_When_Failover_2_>
 
-<!--SubscriberInformation-->
+<!-- Subscriber Information -->
 <Display_Name_2_ ua="na">{$account.2.display_name}</Display_Name_2_>
 <User_ID_2_ ua="na">{$account.2.user_id}</User_ID_2_>
 <Password_2_ ua="na">{$account.2.password}</Password_2_>
 <Use_Auth_ID_2_ ua="na">No</Use_Auth_ID_2_>
-<Auth_ID_2_ ua="na"/>
-<Resident_Online_Number_2_ ua="na"/>
-<SIP_URI_2_ ua="na"/>
+<Auth_ID_2_ ua="na"></Auth_ID_2_>
+<Resident_Online_Number_2_ ua="na"></Resident_Online_Number_2_>
+<SIP_URI_2_ ua="na"></SIP_URI_2_>
 
-<!--SupplementaryServiceSubscription-->
+<!-- Supplementary Service Subscription -->
 <Call_Waiting_Serv_2_ ua="na">{$spa_call_waiting}</Call_Waiting_Serv_2_>
 <Block_CID_Serv_2_ ua="na">Yes</Block_CID_Serv_2_>
 <Block_ANC_Serv_2_ ua="na">Yes</Block_ANC_Serv_2_>
@@ -441,11 +465,11 @@ Parametersfor ProvisioningTab
 <Reuse_CID_Number_As_Name_2_ ua="na">Yes</Reuse_CID_Number_As_Name_2_>
 <CONFCID_Serv_2_ ua="na">Yes</CONFCID_Serv_2_>
 
-<!--AudioConfiguration-->
+<!-- Audio Configuration -->
 <Preferred_Codec_2_ ua="na">G711u</Preferred_Codec_2_>
 <Second_Preferred_Codec_2_ ua="na">Unspecified</Second_Preferred_Codec_2_>
 <Third_Preferred_Codec_2_ ua="na">Unspecified</Third_Preferred_Codec_2_>
-<Use_Pref_Codec_Only_2_ ua="na">Yes</Use_Pref_Codec_Only_2_>
+<Use_Pref_Codec_Only_2_ ua="na">No</Use_Pref_Codec_Only_2_>
 <Codec_Negotiation_2_ ua="na">Default</Codec_Negotiation_2_>
 <G729a_Enable_2_ ua="na">Yes</G729a_Enable_2_>
 <Silence_Supp_Enable_2_ ua="na">No</Silence_Supp_Enable_2_>
@@ -474,55 +498,56 @@ Parametersfor ProvisioningTab
 <Modem_Line_2_ ua="na">No</Modem_Line_2_>
 <RTP_to_Proxy_in_Remote_Hold_2_ ua="na">No</RTP_to_Proxy_in_Remote_Hold_2_>
 
-<!--DialPlan-->
+<!-- Dial Plan -->
 <Dial_Plan_2_ ua="na">{$spa_dial_plan}</Dial_Plan_2_>
 
-<!--FXS PortPolarityConfiguration-->
+<!-- FXS Port Polarity Configuration -->
 <Idle_Polarity_2_ ua="na">Forward</Idle_Polarity_2_>
 <Caller_Conn_Polarity_2_ ua="na">Forward</Caller_Conn_Polarity_2_>
 <Callee_Conn_Polarity_2_ ua="na">Forward</Callee_Conn_Polarity_2_>
-<Profile_Stamp_2_ ua="na"/>
+<Profile_Stamp_2_ ua="na"></Profile_Stamp_2_>
 
-<!--Parametersfor User1 Tab -->
-<!--CallForwardSettings-->
-<Cfwd_All_Dest_1_ ua="rw"/>
-<Cfwd_Busy_Dest_1_ ua="rw"/>
-<Cfwd_No_Ans_Dest_1_ ua="rw"/>
+<!-- Parameters for User 1 Tab -->
+
+<!-- Call Forward Settings -->
+<Cfwd_All_Dest_1_ ua="rw"></Cfwd_All_Dest_1_>
+<Cfwd_Busy_Dest_1_ ua="rw"></Cfwd_Busy_Dest_1_>
+<Cfwd_No_Ans_Dest_1_ ua="rw"></Cfwd_No_Ans_Dest_1_>
 <Cfwd_No_Ans_Delay_1_ ua="rw">20</Cfwd_No_Ans_Delay_1_>
 
-<!--SelectiveCallForwardSettings-->
-<Cfwd_Sel1_Caller_1_ ua="rw"/>
-<Cfwd_Sel1_Dest_1_ ua="rw"/>
-<Cfwd_Sel2_Caller_1_ ua="rw"/>
-<Cfwd_Sel2_Dest_1_ ua="rw"/>
-<Cfwd_Sel3_Caller_1_ ua="rw"/>
-<Cfwd_Sel3_Dest_1_ ua="rw"/>
-<Cfwd_Sel4_Caller_1_ ua="rw"/>
-<Cfwd_Sel4_Dest_1_ ua="rw"/>
-<Cfwd_Sel5_Caller_1_ ua="rw"/>
-<Cfwd_Sel5_Dest_1_ ua="rw"/>
-<Cfwd_Sel6_Caller_1_ ua="rw"/>
-<Cfwd_Sel6_Dest_1_ ua="rw"/>
-<Cfwd_Sel7_Caller_1_ ua="rw"/>
-<Cfwd_Sel7_Dest_1_ ua="rw"/>
-<Cfwd_Sel8_Caller_1_ ua="rw"/>
-<Cfwd_Sel8_Dest_1_ ua="rw"/>
-<Cfwd_Last_Caller_1_ ua="rw"/>
-<Cfwd_Last_Dest_1_ ua="rw"/>
-<Block_Last_Caller_1_ ua="rw"/>
-<Accept_Last_Caller_1_ ua="rw"/>
+<!-- Selective Call Forward Settings -->
+<Cfwd_Sel1_Caller_1_ ua="rw"></Cfwd_Sel1_Caller_1_>
+<Cfwd_Sel1_Dest_1_ ua="rw"></Cfwd_Sel1_Dest_1_>
+<Cfwd_Sel2_Caller_1_ ua="rw"></Cfwd_Sel2_Caller_1_>
+<Cfwd_Sel2_Dest_1_ ua="rw"></Cfwd_Sel2_Dest_1_>
+<Cfwd_Sel3_Caller_1_ ua="rw"></Cfwd_Sel3_Caller_1_>
+<Cfwd_Sel3_Dest_1_ ua="rw"></Cfwd_Sel3_Dest_1_>
+<Cfwd_Sel4_Caller_1_ ua="rw"></Cfwd_Sel4_Caller_1_>
+<Cfwd_Sel4_Dest_1_ ua="rw"></Cfwd_Sel4_Dest_1_>
+<Cfwd_Sel5_Caller_1_ ua="rw"></Cfwd_Sel5_Caller_1_>
+<Cfwd_Sel5_Dest_1_ ua="rw"></Cfwd_Sel5_Dest_1_>
+<Cfwd_Sel6_Caller_1_ ua="rw"></Cfwd_Sel6_Caller_1_>
+<Cfwd_Sel6_Dest_1_ ua="rw"></Cfwd_Sel6_Dest_1_>
+<Cfwd_Sel7_Caller_1_ ua="rw"></Cfwd_Sel7_Caller_1_>
+<Cfwd_Sel7_Dest_1_ ua="rw"></Cfwd_Sel7_Dest_1_>
+<Cfwd_Sel8_Caller_1_ ua="rw"></Cfwd_Sel8_Caller_1_>
+<Cfwd_Sel8_Dest_1_ ua="rw"></Cfwd_Sel8_Dest_1_>
+<Cfwd_Last_Caller_1_ ua="rw"></Cfwd_Last_Caller_1_>
+<Cfwd_Last_Dest_1_ ua="rw"></Cfwd_Last_Dest_1_>
+<Block_Last_Caller_1_ ua="rw"></Block_Last_Caller_1_>
+<Accept_Last_Caller_1_ ua="rw"></Accept_Last_Caller_1_>
 
-<!--SpeedDialSettings-->
-<Speed_Dial_2_1_ ua="rw"/>
-<Speed_Dial_3_1_ ua="rw"/>
-<Speed_Dial_4_1_ ua="rw"/>
-<Speed_Dial_5_1_ ua="rw"/>
-<Speed_Dial_6_1_ ua="rw"/>
-<Speed_Dial_7_1_ ua="rw"/>
-<Speed_Dial_8_1_ ua="rw"/>
-<Speed_Dial_9_1_ ua="rw"/>
+<!-- Speed Dial Settings -->
+<Speed_Dial_2_1_ ua="rw"></Speed_Dial_2_1_>
+<Speed_Dial_3_1_ ua="rw"></Speed_Dial_3_1_>
+<Speed_Dial_4_1_ ua="rw"></Speed_Dial_4_1_>
+<Speed_Dial_5_1_ ua="rw"></Speed_Dial_5_1_>
+<Speed_Dial_6_1_ ua="rw"></Speed_Dial_6_1_>
+<Speed_Dial_7_1_ ua="rw"></Speed_Dial_7_1_>
+<Speed_Dial_8_1_ ua="rw"></Speed_Dial_8_1_>
+<Speed_Dial_9_1_ ua="rw"></Speed_Dial_9_1_>
 
-<!--SupplementaryServiceSettings-->
+<!-- Supplementary Service Settings -->
 <CW_Setting_1_ ua="rw">Yes</CW_Setting_1_>
 <Block_CID_Setting_1_ ua="rw">No</Block_CID_Setting_1_>
 <Block_ANC_Setting_1_ ua="rw">No</Block_ANC_Setting_1_>
@@ -537,17 +562,17 @@ Parametersfor ProvisioningTab
 <Media_Loopback_Type_1_ ua="na">media</Media_Loopback_Type_1_>
 <CONFCID_Setting_1_ ua="rw">Yes</CONFCID_Setting_1_>
 
-<!--DistinctiveRingSettings-->
-<Ring1_Caller_1_ ua="rw"/>
-<Ring2_Caller_1_ ua="rw"/>
-<Ring3_Caller_1_ ua="rw"/>
-<Ring4_Caller_1_ ua="rw"/>
-<Ring5_Caller_1_ ua="rw"/>
-<Ring6_Caller_1_ ua="rw"/>
-<Ring7_Caller_1_ ua="rw"/>
-<Ring8_Caller_1_ ua="rw"/>
+<!-- Distinctive Ring Settings -->
+<Ring1_Caller_1_ ua="rw"></Ring1_Caller_1_>
+<Ring2_Caller_1_ ua="rw"></Ring2_Caller_1_>
+<Ring3_Caller_1_ ua="rw"></Ring3_Caller_1_>
+<Ring4_Caller_1_ ua="rw"></Ring4_Caller_1_>
+<Ring5_Caller_1_ ua="rw"></Ring5_Caller_1_>
+<Ring6_Caller_1_ ua="rw"></Ring6_Caller_1_>
+<Ring7_Caller_1_ ua="rw"></Ring7_Caller_1_>
+<Ring8_Caller_1_ ua="rw"></Ring8_Caller_1_>
 
-<!--RingSettings-->
+<!-- Ring Settings -->
 <Default_Ring_1_ ua="rw">1</Default_Ring_1_>
 <Default_CWT_1_ ua="rw">1</Default_CWT_1_>
 <Hold_Reminder_Ring_1_ ua="rw">8</Hold_Reminder_Ring_1_>
@@ -558,46 +583,47 @@ Parametersfor ProvisioningTab
 <VMWI_Ring_Splash_Len_1_ ua="rw">0</VMWI_Ring_Splash_Len_1_>
 <Ring_On_No_New_VM_1_ ua="na">No</Ring_On_No_New_VM_1_>
 
-<!--Parametersfor User2 Tab -->
-<!--CallForwardSettings-->
-<Cfwd_All_Dest_2_ ua="rw"/>
-<Cfwd_Busy_Dest_2_ ua="rw"/>
-<Cfwd_No_Ans_Dest_2_ ua="rw"/>
+<!-- Parameters for User 2 Tab -->
+
+<!-- Call Forward Settings -->
+<Cfwd_All_Dest_2_ ua="rw"></Cfwd_All_Dest_2_>
+<Cfwd_Busy_Dest_2_ ua="rw"></Cfwd_Busy_Dest_2_>
+<Cfwd_No_Ans_Dest_2_ ua="rw"></Cfwd_No_Ans_Dest_2_>
 <Cfwd_No_Ans_Delay_2_ ua="rw">20</Cfwd_No_Ans_Delay_2_>
 
-<!--SelectiveCallForwardSettings-->
-<Cfwd_Sel1_Caller_2_ ua="rw"/>
-<Cfwd_Sel1_Dest_2_ ua="rw"/>
-<Cfwd_Sel2_Caller_2_ ua="rw"/>
-<Cfwd_Sel2_Dest_2_ ua="rw"/>
-<Cfwd_Sel3_Caller_2_ ua="rw"/>
-<Cfwd_Sel3_Dest_2_ ua="rw"/>
-<Cfwd_Sel4_Caller_2_ ua="rw"/>
-<Cfwd_Sel4_Dest_2_ ua="rw"/>
-<Cfwd_Sel5_Caller_2_ ua="rw"/>
-<Cfwd_Sel5_Dest_2_ ua="rw"/>
-<Cfwd_Sel6_Caller_2_ ua="rw"/>
-<Cfwd_Sel6_Dest_2_ ua="rw"/>
-<Cfwd_Sel7_Caller_2_ ua="rw"/>
-<Cfwd_Sel7_Dest_2_ ua="rw"/>
-<Cfwd_Sel8_Caller_2_ ua="rw"/>
-<Cfwd_Sel8_Dest_2_ ua="rw"/>
-<Cfwd_Last_Caller_2_ ua="rw"/>
-<Cfwd_Last_Dest_2_ ua="rw"/>
-<Block_Last_Caller_2_ ua="rw"/>
-<Accept_Last_Caller_2_ ua="rw"/>
+<!-- Selective Call Forward Settings -->
+<Cfwd_Sel1_Caller_2_ ua="rw"></Cfwd_Sel1_Caller_2_>
+<Cfwd_Sel1_Dest_2_ ua="rw"></Cfwd_Sel1_Dest_2_>
+<Cfwd_Sel2_Caller_2_ ua="rw"></Cfwd_Sel2_Caller_2_>
+<Cfwd_Sel2_Dest_2_ ua="rw"></Cfwd_Sel2_Dest_2_>
+<Cfwd_Sel3_Caller_2_ ua="rw"></Cfwd_Sel3_Caller_2_>
+<Cfwd_Sel3_Dest_2_ ua="rw"></Cfwd_Sel3_Dest_2_>
+<Cfwd_Sel4_Caller_2_ ua="rw"></Cfwd_Sel4_Caller_2_>
+<Cfwd_Sel4_Dest_2_ ua="rw"></Cfwd_Sel4_Dest_2_>
+<Cfwd_Sel5_Caller_2_ ua="rw"></Cfwd_Sel5_Caller_2_>
+<Cfwd_Sel5_Dest_2_ ua="rw"></Cfwd_Sel5_Dest_2_>
+<Cfwd_Sel6_Caller_2_ ua="rw"></Cfwd_Sel6_Caller_2_>
+<Cfwd_Sel6_Dest_2_ ua="rw"></Cfwd_Sel6_Dest_2_>
+<Cfwd_Sel7_Caller_2_ ua="rw"></Cfwd_Sel7_Caller_2_>
+<Cfwd_Sel7_Dest_2_ ua="rw"></Cfwd_Sel7_Dest_2_>
+<Cfwd_Sel8_Caller_2_ ua="rw"></Cfwd_Sel8_Caller_2_>
+<Cfwd_Sel8_Dest_2_ ua="rw"></Cfwd_Sel8_Dest_2_>
+<Cfwd_Last_Caller_2_ ua="rw"></Cfwd_Last_Caller_2_>
+<Cfwd_Last_Dest_2_ ua="rw"></Cfwd_Last_Dest_2_>
+<Block_Last_Caller_2_ ua="rw"></Block_Last_Caller_2_>
+<Accept_Last_Caller_2_ ua="rw"></Accept_Last_Caller_2_>
 
-<!--SpeedDialSettings-->
-<Speed_Dial_2_2_ ua="rw"/>
-<Speed_Dial_3_2_ ua="rw"/>
-<Speed_Dial_4_2_ ua="rw"/>
-<Speed_Dial_5_2_ ua="rw"/>
-<Speed_Dial_6_2_ ua="rw"/>
-<Speed_Dial_7_2_ ua="rw"/>
-<Speed_Dial_8_2_ ua="rw"/>
-<Speed_Dial_9_2_ ua="rw"/>
+<!-- Speed Dial Settings -->
+<Speed_Dial_2_2_ ua="rw"></Speed_Dial_2_2_>
+<Speed_Dial_3_2_ ua="rw"></Speed_Dial_3_2_>
+<Speed_Dial_4_2_ ua="rw"></Speed_Dial_4_2_>
+<Speed_Dial_5_2_ ua="rw"></Speed_Dial_5_2_>
+<Speed_Dial_6_2_ ua="rw"></Speed_Dial_6_2_>
+<Speed_Dial_7_2_ ua="rw"></Speed_Dial_7_2_>
+<Speed_Dial_8_2_ ua="rw"></Speed_Dial_8_2_>
+<Speed_Dial_9_2_ ua="rw"></Speed_Dial_9_2_>
 
-<!--SupplementaryServiceSettings-->
+<!-- Supplementary Service Settings -->
 <CW_Setting_2_ ua="rw">Yes</CW_Setting_2_>
 <Block_CID_Setting_2_ ua="rw">No</Block_CID_Setting_2_>
 <Block_ANC_Setting_2_ ua="rw">No</Block_ANC_Setting_2_>
@@ -612,17 +638,17 @@ Parametersfor ProvisioningTab
 <Media_Loopback_Type_2_ ua="na">media</Media_Loopback_Type_2_>
 <CONFCID_Setting_2_ ua="rw">Yes</CONFCID_Setting_2_>
 
-<!--DistinctiveRingSettings-->
-<Ring1_Caller_2_ ua="rw"/>
-<Ring2_Caller_2_ ua="rw"/>
-<Ring3_Caller_2_ ua="rw"/>
-<Ring4_Caller_2_ ua="rw"/>
-<Ring5_Caller_2_ ua="rw"/>
-<Ring6_Caller_2_ ua="rw"/>
-<Ring7_Caller_2_ ua="rw"/>
-<Ring8_Caller_2_ ua="rw"/>
+<!-- Distinctive Ring Settings -->
+<Ring1_Caller_2_ ua="rw"></Ring1_Caller_2_>
+<Ring2_Caller_2_ ua="rw"></Ring2_Caller_2_>
+<Ring3_Caller_2_ ua="rw"></Ring3_Caller_2_>
+<Ring4_Caller_2_ ua="rw"></Ring4_Caller_2_>
+<Ring5_Caller_2_ ua="rw"></Ring5_Caller_2_>
+<Ring6_Caller_2_ ua="rw"></Ring6_Caller_2_>
+<Ring7_Caller_2_ ua="rw"></Ring7_Caller_2_>
+<Ring8_Caller_2_ ua="rw"></Ring8_Caller_2_>
 
-<!--RingSettings-->
+<!-- Ring Settings -->
 <Default_Ring_2_ ua="rw">1</Default_Ring_2_>
 <Default_CWT_2_ ua="rw">1</Default_CWT_2_>
 <Hold_Reminder_Ring_2_ ua="rw">8</Hold_Reminder_Ring_2_>
@@ -633,8 +659,9 @@ Parametersfor ProvisioningTab
 <VMWI_Ring_Splash_Len_2_ ua="rw">0</VMWI_Ring_Splash_Len_2_>
 <Ring_On_No_New_VM_2_ ua="na">No</Ring_On_No_New_VM_2_>
 
-<!--Parametersfor RegionalTab -->
-<!--CallProgressTones-->
+<!-- Parameters for Regional Tab -->
+
+<!-- Call Progress Tones -->
 <Dial_Tone ua="na">350@-19,440@-19;10(*/0/1+2)</Dial_Tone>
 <Second_Dial_Tone ua="na">420@-19,520@-19;10(*/0/1+2)</Second_Dial_Tone>
 <Outside_Dial_Tone ua="na">420@-16;10(*/0/1)</Outside_Dial_Tone>
@@ -655,9 +682,9 @@ Parametersfor ProvisioningTab
 <Conference_Tone ua="na">350@-19;20(.1/.1/1,.1/9.7/1)</Conference_Tone>
 <Secure_Call_Indication_Tone ua="na">397@-19,507@-19;15(0/2/0,.2/.1/1,.1/2.1/2)</Secure_Call_Indication_Tone>
 <Feature_Invocation_Tone ua="na">350@-16;*(.1/.1/1)</Feature_Invocation_Tone>
-<Call_Remind_Tone ua="na"/>
+<Call_Remind_Tone ua="na"></Call_Remind_Tone>
 
-<!--DistinctiveRingPatterns-->
+<!-- Distinctive Ring Patterns -->
 <Ring1_Cadence ua="na">60(2/4)</Ring1_Cadence>
 <Ring2_Cadence ua="na">60(.8/.4,.8/4)</Ring2_Cadence>
 <Ring3_Cadence ua="na">60(.4/.2,.4/.2,.8/4)</Ring3_Cadence>
@@ -667,17 +694,17 @@ Parametersfor ProvisioningTab
 <Ring7_Cadence ua="na">60(.4/.2,.4/.2,.4/4)</Ring7_Cadence>
 <Ring8_Cadence ua="na">60(0.25/9.75)</Ring8_Cadence>
 
-<!--DistinctiveCallWaitingTonePatterns-->
+<!-- Distinctive Call Waiting Tone Patterns -->
 <CWT1_Cadence ua="na">*(.3/9.7)</CWT1_Cadence>
-<CWT2_Cadence ua="na">30(.1/.1,.1/9.7)</CWT2_Cadence>
-<CWT3_Cadence ua="na">30(.1/.1,.1/.1,.1/9.7)</CWT3_Cadence>
+<CWT2_Cadence ua="na">30(.1/.1, .1/9.7)</CWT2_Cadence>
+<CWT3_Cadence ua="na">30(.1/.1, .1/.1, .1/9.7)</CWT3_Cadence>
 <CWT4_Cadence ua="na">30(.1/.1,.3/.1,.1/9.3)</CWT4_Cadence>
 <CWT5_Cadence ua="na">1(.5/.5)</CWT5_Cadence>
 <CWT6_Cadence ua="na">30(.1/.1,.3/.2,.3/9.1)</CWT6_Cadence>
 <CWT7_Cadence ua="na">30(.3/.1,.3/.1,.1/9.1)</CWT7_Cadence>
 <CWT8_Cadence ua="na">2.3(.3/2)</CWT8_Cadence>
 
-<!--DistinctiveRing/CWTPatternNames-->
+<!-- Distinctive Ring/CWT Pattern Names -->
 <Ring1_Name ua="na">Bellcore-r1</Ring1_Name>
 <Ring2_Name ua="na">Bellcore-r2</Ring2_Name>
 <Ring3_Name ua="na">Bellcore-r3</Ring3_Name>
@@ -687,14 +714,14 @@ Parametersfor ProvisioningTab
 <Ring7_Name ua="na">Bellcore-r7</Ring7_Name>
 <Ring8_Name ua="na">Bellcore-r8</Ring8_Name>
 
-<!--Ringand CallWaitingToneSpec-->
+<!-- Ring and Call Waiting Tone Spec -->
 <Ring_Waveform ua="na">Trapezoid</Ring_Waveform>
 <Ring_Frequency ua="na">20</Ring_Frequency>
 <Ring_Voltage ua="na">85</Ring_Voltage>
 <CWT_Frequency ua="na">440@-10</CWT_Frequency>
 <Synchronized_Ring ua="na">No</Synchronized_Ring>
 
-<!--ControlTimerValues(sec)-->
+<!-- Control Timer Values (sec) -->
 <Hook_Flash_Timer_Min ua="na">.1</Hook_Flash_Timer_Min>
 <Hook_Flash_Timer_Max ua="na">.9</Hook_Flash_Timer_Max>
 <Callee_On_Hook_Delay ua="na">0</Callee_On_Hook_Delay>
@@ -708,7 +735,7 @@ Parametersfor ProvisioningTab
 <CPC_Delay ua="na">2</CPC_Delay>
 <CPC_Duration ua="na">.5</CPC_Duration>
 
-<!--VerticalServiceActivationCodes-->
+<!-- Vertical Service Activation Codes -->
 <Call_Return_Code ua="na">*69</Call_Return_Code>
 <Call_Redial_Code ua="na">*07</Call_Redial_Code>
 <Blind_Transfer_Code ua="na">*98</Blind_Transfer_Code>
@@ -751,19 +778,19 @@ Parametersfor ProvisioningTab
 <Secure_No_Call_Act_Code ua="na">*17</Secure_No_Call_Act_Code>
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
-<Conference_Act_Code ua="na"/>
-<Attn-Xfer_Act_Code ua="na"/>
+<Conference_Act_Code ua="na"></Conference_Act_Code>
+<Attn-Xfer_Act_Code ua="na"></Attn-Xfer_Act_Code>
 <Modem_Line_Toggle_Code ua="na">*99</Modem_Line_Toggle_Code>
 <FAX_Line_Toggle_Code ua="na">#99</FAX_Line_Toggle_Code>
 <Media_Loopback_Code ua="na">*03</Media_Loopback_Code>
-<Referral_Services_Codes ua="na"/>
-<Feature_Dial_Services_Codes ua="na"/>
+<Referral_Services_Codes ua="na"></Referral_Services_Codes>
+<Feature_Dial_Services_Codes ua="na"></Feature_Dial_Services_Codes>
 
-<!--VerticalServiceAnnouncementCodes-->
-<Service_Annc_Base_Number ua="na"/>
-<Service_Annc_Extension_Codes ua="na"/>
+<!-- Vertical Service Announcement Codes -->
+<Service_Annc_Base_Number ua="na"></Service_Annc_Base_Number>
+<Service_Annc_Extension_Codes ua="na"></Service_Annc_Extension_Codes>
 
-<!--OutboundCallCodecSelectionCodes-->
+<!-- Outbound Call Codec Selection Codes -->
 <Prefer_G711u_Code ua="na">*017110</Prefer_G711u_Code>
 <Force_G711u_Code ua="na">*027110</Force_G711u_Code>
 <Prefer_G711a_Code ua="na">*017111</Prefer_G711a_Code>
@@ -773,7 +800,7 @@ Parametersfor ProvisioningTab
 <Prefer_G729a_Code ua="na">*01729</Prefer_G729a_Code>
 <Force_G729a_Code ua="na">*02729</Force_G729a_Code>
 
-<!--Miscellaneous-->
+<!-- Miscellaneous -->
 <FXS_Port_Impedance ua="na">600</FXS_Port_Impedance>
 <FXS_Port_Input_Gain ua="na">-3</FXS_Port_Input_Gain>
 <FXS_Port_Output_Gain ua="na">-3</FXS_Port_Output_Gain>
@@ -786,75 +813,77 @@ Parametersfor ProvisioningTab
 <Caller_ID_FSK_Standard ua="na">bell 202</Caller_ID_FSK_Standard>
 <Feature_Invocation_Method ua="na">Default</Feature_Invocation_Method>
 
-<!--DMZ Settings-->
-<!--MiscellaneousSettings-->
-<!--SystemReservedPortsRange-->
+<!-- DMZ Settings -->
+
+<!-- Miscellaneous Settings -->
+
+<!-- System Reserved Ports Range -->
 <Protect_IVR_FactoryReset ua="na">No</Protect_IVR_FactoryReset>
 <Max_Session ua="na">2</Max_Session>
 <router-configuration>
 <WAN_Basic_Setting>
-<WAN_Stack_Mode>0</WAN_Stack_Mode> <!--options: 0:IPv4Only, 1:IPv6Only, 2:Dual-->
-<WAN_Signal_Preference>0</WAN_Signal_Preference> <!--options: 0:IPv4, 1:IPv6-->
-<WAN_Media_Preference>0</WAN_Media_Preference> <!--options: 0:IPv4, 1:IPv6-->
+<WAN_Stack_Mode>0</WAN_Stack_Mode> <!-- options: 0:IPv4 Only, 1:IPv6 Only, 2:Dual -->
+<WAN_Signal_Preference>0</WAN_Signal_Preference> <!-- options: 0:IPv4, 1:IPv6 -->
+<WAN_Media_Preference>0</WAN_Media_Preference> <!-- options: 0:IPv4, 1:IPv6 -->
 </WAN_Basic_Setting>
 <WAN_Interface>
-<WAN_Connection_Type>dh</WAN_Connection_Type> <!--options: dh/st/pp-->
+<WAN_Connection_Type>dh</WAN_Connection_Type> <!-- options: dh/st/pp -->
 <WAN_DHCP_MTU_Mode>0</WAN_DHCP_MTU_Mode>
 <WAN_DHCP_MTU_Size>0</WAN_DHCP_MTU_Size>
 <WAN_Static_IP_NET>0.0.0.0:0.0.0.0:0.0.0.0</WAN_Static_IP_NET>
 <WAN_Static_MTU_Mode>0</WAN_Static_MTU_Mode>
 <WAN_Static_MTU_Size>0</WAN_Static_MTU_Size>
-<WAN_PPPoE_User_Name/>
-<!--<WAN_PPPoE_Password></WAN_PPPoE_Password>-->
-<WAN_PPPoE_Service_Name/>
+<WAN_PPPoE_User_Name></WAN_PPPoE_User_Name>
+<!-- <WAN_PPPoE_Password></WAN_PPPoE_Password> -->
+<WAN_PPPoE_Service_Name></WAN_PPPoE_Service_Name>
 <WAN_PPPoE_Keep_Alive>0:5:30</WAN_PPPoE_Keep_Alive>
 <WAN_PPPoE_MTU_Mode>0</WAN_PPPoE_MTU_Mode>
 <WAN_PPPoE_MTU_Size>0</WAN_PPPoE_MTU_Size>
 </WAN_Interface>
 <WAN_IP6_Setting>
 <WAN_IP6_Allow_AutoConfig>1</WAN_IP6_Allow_AutoConfig>
-<WAN_IP6_Connection_Type>0</WAN_IP6_Connection_Type> <!--options: 0:DHCPv6, 1:Static, 2:PPPoEv6-->
-<WAN_Static_IP6_Address/>
+<WAN_IP6_Connection_Type>0</WAN_IP6_Connection_Type> <!-- options: 0:DHCPv6, 1:Static, 2:PPPoEv6 -->
+<WAN_Static_IP6_Address></WAN_Static_IP6_Address>
 <WAN_Static_IP6_Prefix_Length>64</WAN_Static_IP6_Prefix_Length>
-<WAN_Static_IP6_Gatway/>
+<WAN_Static_IP6_Gatway></WAN_Static_IP6_Gatway>
 </WAN_IP6_Setting>
 <PHY_Port_Setting>
 <Flow_Control>1</Flow_Control>
-<Speed_Duplex>auto</Speed_Duplex> <!--options: auto/10h/10f/100h/100f-->
+<Speed_Duplex>auto</Speed_Duplex> <!-- options: auto/10h/10f/100h/100f -->
 </PHY_Port_Setting>
 <MAC_Address_Clone>
 <MAC_Address_Clone_Enabled>0</MAC_Address_Clone_Enabled>
-<MAC_Address_Clone_Address/>
+<MAC_Address_Clone_Address>00:00:00:00:00:00</MAC_Address_Clone_Address>
 </MAC_Address_Clone>
 <Internet_Option>
 <Host_Name>ATA192-MPP</Host_Name>
-<Domain_Name/>
-<DNS_Order>2</DNS_Order> <!--options: 0:Manual, 1:Manual-DHCP, 2:DHCP-Manual-->
-<DNS/>
-<DNS6_Order>2</DNS6_Order> <!--options: 0:Manual, 1:Manual-DHCP, 2:DHCP-Manual-->
-<DNS6/>
+<Domain_Name></Domain_Name>
+<DNS_Order>2</DNS_Order> <!-- options: 0:Manual, 1:Manual-DHCP, 2:DHCP-Manual -->
+<DNS></DNS>
+<DNS6_Order>2</DNS6_Order> <!-- options: 0:Manual, 1:Manual-DHCP, 2:DHCP-Manual -->
+<DNS6></DNS6>
 </Internet_Option>
 <DHCP_Server_Pool>
 <Rule>
 <DHCP_Server>1</DHCP_Server>
 <Local_IP>192.168.15.1</Local_IP>
-<Subnet_Mask>255.255.255.0</Subnet_Mask> <!--options:255.255.255.0/128/192/224/240/248/252-->
-<DHCP_Client_Table/>
-<Option_66>0</Option_66> <!--options: 0:None, 2:RemoteTFTPServer, 3:ManualTFTPServer-->
+<Subnet_Mask>255.255.255.0</Subnet_Mask> <!-- options: 255.255.255.0/128/192/224/240/248/252 -->
+<DHCP_Client_Table></DHCP_Client_Table>
+<Option_66>0</Option_66> <!-- options: 0:None, 2:Remote TFTP Server, 3:Manual TFTP Server -->
 <TFTP_IP>0.0.0.0</TFTP_IP>
-<Option_67/>
-<Option_159/>
-<Option_160/>
+<Option_67></Option_67>
+<Option_159></Option_159>
+<Option_160></Option_160>
 <DNS_Proxy>1</DNS_Proxy> <!--options: 0:Disabled, 1:Enabled-->
 <Starting_IP>192.168.15.100</Starting_IP>
 <Max_DHCP_User>50</Max_DHCP_User>
 <Client_Lease_Time>0</Client_Lease_Time>
-<Static_DNS>8.8.4.4</Static_DNS>
+<Static_DNS>1.1.1.1</Static_DNS>
 <Default_Gateway>192.168.15.1</Default_Gateway>
 </Rule>
 </DHCP_Server_Pool>
 <LAN_IP6_Setting>
-<LAN_IP6_Address_Assign_Type>0</LAN_IP6_Address_Assign_Type> <!--options: 0:SLAAC, 1:DHCPV6-->
+<LAN_IP6_Address_Assign_Type>0</LAN_IP6_Address_Assign_Type> <!-- options: 0:SLAAC, 1:DHCPV6 -->
 <LAN_DHCP6_Delegation_Enable>0</LAN_DHCP6_Delegation_Enable>
 <LAN_IP6_Prefix>2001::</LAN_IP6_Prefix>
 </LAN_IP6_Setting>
@@ -868,10 +897,10 @@ Parametersfor ProvisioningTab
 <LAYER2_LOGGING_ENABLE>0</LAYER2_LOGGING_ENABLE> <!--options: 0:Disabled, 1:Enabled-->
 </CLDP_Setting>
 <Single_Port_Forwarding>
-<Single_Port_Forwarding_Index/>
+<Single_Port_Forwarding_Index></Single_Port_Forwarding_Index>
 </Single_Port_Forwarding>
 <Port_Range_Forwarding>
-<Port_Range_Forwarding_Index/>
+<Port_Range_Forwarding_Index></Port_Range_Forwarding_Index>
 </Port_Range_Forwarding>
 <SNMP>
 <SNMP_Enabled>0</SNMP_Enabled>
@@ -882,24 +911,27 @@ Parametersfor ProvisioningTab
 <Set_Community>private</Set_Community>
 <SNMPV3>0</SNMPV3>
 <RW_User>v3rwuser</RW_User>
-<Auth_Protocol>MD5</Auth_Protocol> <!--options: MD5/SHA-->
-<!--<Auth_Password></Auth_Password>-->
-<Privacy_Protocol>DES</Privacy_Protocol> <!--options: None/DES/AES-->
-<!--<Privacy_Password></Privacy_Password>-->
+<Auth_Protocol>MD5</Auth_Protocol> <!-- options: MD5/SHA -->
+<!-- <Auth_Password></Auth_Password> -->
+<Privacy_Protocol>DES</Privacy_Protocol> <!-- options: None/DES/AES -->
+<!-- <Privacy_Password></Privacy_Password> -->
 <TRAP_IP_Address>192.168.15.100</TRAP_IP_Address>
 <TRAP_Port>162</TRAP_Port>
-<TRAP_SNMP_Version>v1</TRAP_SNMP_Version> <!--options: v1/v2c/v3-->
+<TRAP_SNMP_Version>v1</TRAP_SNMP_Version> <!-- options: v1/v2c/v3 -->
 </SNMP>
 <Time_Setup>
 <Time_Zone>{$spa_time_zone}</Time_Zone>
 <Auto_Adjust_Clock>1</Auto_Adjust_Clock>
-<Time_Server_Mode>auto</Time_Server_Mode> <!--options: auto/manual-->
-<Time_Server>0.ca.pool.ntp.org</Time_Server>
+<Time_Server_Mode>auto</Time_Server_Mode> <!-- options: auto/manual -->
+<Time_Server>0.ciscosb.pool.ntp.org</Time_Server>
 <Resync_Timer>3600</Resync_Timer>
 <Auto_Recovery_System_Time>0</Auto_Recovery_System_Time>
-<Time_Mode>1</Time_Mode> <!--options: 0:Manual, 1:Auto-->
+<Time_Mode>1</Time_Mode> <!-- options: 0:Manual, 1:Auto -->
 </Time_Setup>
-<QoS_Bandwidth_Control/>
+<QoS_Bandwidth_Control></QoS_Bandwidth_Control>
+<HTTP_Proxy>
+<Proxy_Mode>Off</Proxy_Mode> <!-- options: Off, Auto, Manual -->
+</HTTP_Proxy>
 <Software_DMZ>
 <Rule1>
 <Status>0</Status>
@@ -909,7 +941,7 @@ Parametersfor ProvisioningTab
 </Software_DMZ>
 <Bonjour_Enable>1</Bonjour_Enable>
 <Reset_Button_Enable>1</Reset_Button_Enable>
-<Router_Mode>1</Router_Mode> <!--options: 0:Bridge, 1:NAT-->
+<Router_Mode>{$spa_router_mode}</Router_Mode> <!--options: 0:Bridge, 1:NAT-->
 <Monitor_WAN_Port_Only>0</Monitor_WAN_Port_Only>
 <VPN_Passthrough>
 <IPSec_Passthrough>1</IPSec_Passthrough>
@@ -929,37 +961,38 @@ Parametersfor ProvisioningTab
 </Web_Management>
 <TR_069>
 <TR_069_Status>0</TR_069_Status>
-<TR_069_ACS_URL/>
-<TR_069_ACS_Username/> 
-<!--<TR_069_ACS_Password></TR_069_ACS_Password>-->
-<TR_069_Connection_Request_URL/>
-<TR_069_Connection_Request_Username/> 
-<!--<TR_069_Connection_Request_Password></TR_069_Connection_Request_Password>-->
+<TR_069_ACS_URL></TR_069_ACS_URL>
+<TR_069_ACS_Username></TR_069_ACS_Username>
+<!-- <TR_069_ACS_Password></TR_069_ACS_Password> -->
+<TR_069_Connection_Request_URL></TR_069_Connection_Request_URL>
+<TR_069_Connection_Request_Username></TR_069_Connection_Request_Username>
+<!-- <TR_069_Connection_Request_Password></TR_069_Connection_Request_Password> -->
 <TR_069_Periodic_Inform_Interval>86400</TR_069_Periodic_Inform_Interval>
 <TR_069_Periodic_Inform_Enable>1</TR_069_Periodic_Inform_Enable>
 <TR_069_Loopback_Binding>0</TR_069_Loopback_Binding>
 </TR_069>
 <Log_Configuration>
-<Log_Module>0</Log_Module> <!--options: 0:Default, 1:Preset, 2:Telephony, 3:SIP, 4:UI, 5:Network, 6:Media, 7:System, 8:Web, 9:NTP, 10:CDP/LLDP, 11:Security-->
-<RAM_Log_Size>200</RAM_Log_Size>
+<Log_Module>0</Log_Module> <!-- options: 0:Default, 1:Preset, 2:Telephony, 3:SIP, 4:UI, 5:Network, 6:Media, 7:System, 8:Web, 9:NTP, 10:CDP/LLDP, 11:Security, 12:CSSD_RTP, 13:CSSD_FAX, 14:CSSD_ANY -->
+<RAM_Log_Size>512</RAM_Log_Size>
 <Syslog_Server_IP></Syslog_Server_IP> <!--options: null, IPv4 address of debug log server-->
-<Syslog_Server_IP6/>
+<Syslog_Server_IP6></Syslog_Server_IP6>
 <Syslog_Server_Port>514</Syslog_Server_Port>
-<Event_Log_Server></Event_Log_Server> <!--options: null, Address of event log server, supports IPv4, IPv6, and FQDN-->
+<Event_Log_Server></Event_Log_Server>
 <Event_Log_Port>514</Event_Log_Port>
-<Event_Log_Flag>15</Event_Log_Flag> <!--options: 0:Disable, 1:DEV, 2:SYS, 4:CFG ,8:REG, Default:15(DEV+SYS+CFG+REG)-->
-<PRT_Upload_Url/>
-<PRT_Upload_Method>0</PRT_Upload_Method> <!--options: 0:POST, 1:PUT-->
+<Event_Log_Flag>15</Event_Log_Flag> <!-- options: 0:Disable, 1:DEV, 2:SYS, 4:CFG, 8:REG, Default:15(DEV+SYS+CFG+REG) -->
+<PRT_Upload_Url></PRT_Upload_Url>
+<PRT_Upload_Method>0</PRT_Upload_Method> <!-- options: 0:POST, 1:PUT -->
 <PRT_Max_Timer>0</PRT_Max_Timer>
+<PRT_Name></PRT_Name>
 </Log_Configuration>
-<Web_Login_Admin_Name>admin</Web_Login_Admin_Name> 
-<!--<Web_Login_Admin_Password>Un1ty2580!</Web_Login_Admin_Password>--> <!--Set device admin password--> 
+<Web_Login_Admin_Name>admin</Web_Login_Admin_Name>
+<!-- <Web_Login_Admin_Password></Web_Login_Admin_Password> -->
 <Web_Login_Guest_Name>cisco</Web_Login_Guest_Name>
-<!--<Web_Login_Guest_Password>MyCisco</Web_Login_Guest_Password>--> <!--Set device user password--> 
+<!-- <Web_Login_Guest_Password></Web_Login_Guest_Password> -->
 <SSH>
 <SSH_ACCESS>0</SSH_ACCESS> <!--options: 0:Disabled, 1:Enabled-->
-<SSH_User_ID/> <!--options: 0~50-->
-<!--<SSH_Password></SSH_Password>-->
+<SSH_User_ID></SSH_User_ID> <!--options: 0~50-->
+<!-- <SSH_Password></SSH_Password> -->
 </SSH>
 </router-configuration>
 </flat-profile>
diff --git a/resources/templates/provision/yealink/cp965/${mac}.cfg b/resources/templates/provision/yealink/cp965/{$mac}.cfg
similarity index 100%
rename from resources/templates/provision/yealink/cp965/${mac}.cfg
rename to resources/templates/provision/yealink/cp965/{$mac}.cfg
diff --git a/secure/fax_to_email.php b/secure/fax_to_email.php
index 3825711ee1..a4a3525ddd 100644
--- a/secure/fax_to_email.php
+++ b/secure/fax_to_email.php
@@ -428,7 +428,7 @@ if (!function_exists('fax_split_dtmf')) {
 			$array['fax_queue'][0]['fax_accountcode'] = $fax_accountcode;
 
 			//add temporary permisison
-			$p = new permissions;
+			$p = permissions::new();
 			$p->add('fax_queue_add', 'temp');
 
 			//save the data
diff --git a/secure/v_mailto.php b/secure/v_mailto.php
index 55687f657f..29b557e519 100644
--- a/secure/v_mailto.php
+++ b/secure/v_mailto.php
@@ -132,7 +132,7 @@
 					$array['email_logs'][0]['email'] = str_replace("'", "''", $msg);
 
 				//grant temporary permissions
-					$p = new permissions;
+					$p = permissions::new();
 					$p->add('email_log_add', 'temp');
 
 				//execute insert
diff --git a/themes/default/css.php b/themes/default/css.php
index 1efe733e68..0be2dc295c 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -3,7 +3,7 @@
 //includes files
 require_once dirname(__DIR__, 2) . "/resources/require.php";
 
-ob_start('ob_gzhandler');
+//ob_start('ob_gzhandler');
 header('Content-type: text/css; charset: UTF-8');
 header('Cache-Control: must-revalidate');
 header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
@@ -2339,7 +2339,7 @@ else { //default: white
 		vertical-align: middle;
 		color: <?=$form_table_field_text_color?>;
 		font-family: <?=$form_table_field_text_font?>;
-		font-size: <?$form_table_field_text_size?>;
+		font-size: <?=$form_table_field_text_size?>;
 		}
 
 	/* form: heading/row format */
@@ -2443,7 +2443,7 @@ else { //default: white
 		background: <?=$table_row_background_color_medium?>;
 		color: <?=$table_row_text_color?>;
 		font-family: <?=$table_row_text_font?>;
-		font-size: <?$table_row_text_size?>;
+		font-size: <?=$table_row_text_size?>;
 		text-align: left;
 		padding: 4px 7px;
 		}
@@ -2467,7 +2467,7 @@ else { //default: white
 		font-size: 10pt;
 		display: block;
 		color: <?=$message_default_color?>;
-		background: <?-$message_default_background_color?>;
+		background: <?=$message_default_background_color?>;
 		box-shadow: inset 0px 7px 8px -10px <?=$message_default_color?>;
 		opacity: 0;
 		<?php
@@ -2926,7 +2926,7 @@ else { //default: white
 	th.hud_heading {
 		text-align: left;
 		font-size: <?=$dashboard_detail_heading_text_size?>;
-		font-family: <?=$table_heading_text_font?>
+		font-family: <?=$table_heading_text_font?>;
 		color: <?=$table_heading_text_color?>;
 		padding-top: 3px;
 		<?php