diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php
index 1cf50ad392..634141f8ed 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -477,7 +477,7 @@
 			unset($sql, $parameters, $result, $row);
 		}
 	}
-	
+
 //add the pre-defined follow me destinations
 	for ($n = 0; $n <= (((!empty($_SESSION['follow_me']['max_destinations']['numeric'])) ? $_SESSION['follow_me']['max_destinations']['numeric'] : 5) - 1); $n++) {
 		if (empty($destinations[$n]['uuid'])) { $destinations[$n]['uuid'] =  null; }
@@ -523,7 +523,7 @@
 			echo "		source: extensions\n";
 			echo "	});\n";
 		}
-	
+
 		echo "});\n";
 		echo "</script>\n";
 	}
@@ -558,14 +558,38 @@
 	echo "	<strong>".$text['label-call_forward']."</strong>\n";
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
-	$on_click = "$('#tr_follow_me_settings').slideUp('fast'); ";
-	$on_click .= "document.getElementById('dnd_disabled').checked=true; ";
-	$on_click .= "document.getElementById('forward_all_destination').focus(); ";
-	$on_click2 = "(document.getElementById('follow_me_enabled').checked) ? $('#tr_follow_me_settings').slideDown('fast') : '' ";
-	echo "	<label for='forward_all_disabled'><input type='radio' name='forward_all_enabled' id='forward_all_disabled' onclick=\"$on_click2\" value='false' ".(($forward_all_enabled == "false" || $forward_all_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='forward_all_enabled'><input type='radio' name='forward_all_enabled' id='forward_all_enabled' onclick=\"$on_click\" value='true' ".(($forward_all_enabled == "true") ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
-	unset($on_click);
-	echo "&nbsp;&nbsp;&nbsp;";
+
+	if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+		echo "<label class='switch'>\n";
+		echo "	<input type='checkbox' id='forward_all_enabled' name='forward_all_enabled' value='true' ".(!empty($forward_all_enabled) && $forward_all_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_forward_all(this);'>\n";
+		echo "	<span class='slider'></span>\n";
+		echo "</label>\n";
+		echo "<script>\n";
+		echo "function changed_forward_all(el) {\n";
+		echo "	if (el.checked) {\n";
+		echo "		$('#div_follow_me_settings').slideUp('fast');\n";
+		echo "		document.getElementById('follow_me_enabled').checked = false;\n";
+		echo "		document.getElementById('dnd_enabled').checked = false;\n";
+		echo "		document.getElementById('forward_all_destination').focus();\n";
+		echo "	}\n";
+		echo "	else {\n";
+		echo "		if (document.getElementById('follow_me_enabled').checked) { $('#div_follow_me_settings').slideDown('fast'); }\n";
+		echo "	}\n";
+		echo "}\n";
+		echo "</script>\n";
+	}
+	else {
+		$on_click = "$('#div_follow_me_settings').slideUp('fast'); ";
+		$on_click .= "document.getElementById('dnd_disabled').checked=true; ";
+		$on_click .= "document.getElementById('forward_all_destination').focus(); ";
+		$on_click2 = "(document.getElementById('follow_me_enabled').checked) ? $('#div_follow_me_settings').slideDown('fast') : '' ";
+		echo "	<label for='forward_all_disabled'><input type='radio' name='forward_all_enabled' id='forward_all_disabled' onclick=\"$on_click2\" value='false' ".(($forward_all_enabled == "false" || $forward_all_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+		echo "	<label for='forward_all_enabled'><input type='radio' name='forward_all_enabled' id='forward_all_enabled' onclick=\"$on_click\" value='true' ".(($forward_all_enabled == "true") ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
+		unset($on_click);
+		echo "&nbsp;&nbsp;";
+	}
+
+	echo "&nbsp;";
 	echo "	<input class='formfld' type='text' name='forward_all_destination' id='forward_all_destination' maxlength='255' placeholder=\"".$text['label-destination']."\" value=\"".escape($forward_all_destination)."\">\n";
 	echo "	<br />".$text['description-call_forward']."\n";
 	echo "</td>\n";
@@ -576,12 +600,29 @@
 	echo "	".$text['label-on-busy']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	$on_click = "document.getElementById('dnd_disabled').checked=true;";
-	$on_click .= "document.getElementById('forward_busy_destination').focus();";
-	echo "	<label for='forward_busy_disabled'><input type='radio' name='forward_busy_enabled' id='forward_busy_disabled' onclick=\"\" value='false' ".(($forward_busy_enabled == "false" || $forward_busy_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='forward_busy_enabled'><input type='radio' name='forward_busy_enabled' id='forward_busy_enabled' onclick=\"$on_click\" value='true' ".(($forward_busy_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
-	unset($on_click);
-	echo "&nbsp;&nbsp;&nbsp;";
+	if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+		echo "<label class='switch'>\n";
+		echo "	<input type='checkbox' id='forward_busy_enabled' name='forward_busy_enabled' value='true' ".(!empty($forward_busy_enabled) && $forward_busy_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_forward_on_busy(this);'>\n";
+		echo "	<span class='slider'></span>\n";
+		echo "</label>\n";
+		echo "<script>\n";
+		echo "function changed_forward_on_busy(el) {\n";
+		echo "	if (el.checked) {\n";
+		echo "		document.getElementById('dnd_enabled').checked = false;\n";
+		echo "		document.getElementById('forward_busy_destination').focus();\n";
+		echo "	}\n";
+		echo "}\n";
+		echo "</script>\n";
+	}
+	else {
+		$on_click = "document.getElementById('dnd_disabled').checked=true;";
+		$on_click .= "document.getElementById('forward_busy_destination').focus();";
+		echo "	<label for='forward_busy_disabled'><input type='radio' name='forward_busy_enabled' id='forward_busy_disabled' onclick=\"\" value='false' ".(($forward_busy_enabled == "false" || $forward_busy_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+		echo "	<label for='forward_busy_enabled'><input type='radio' name='forward_busy_enabled' id='forward_busy_enabled' onclick=\"$on_click\" value='true' ".(($forward_busy_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
+		unset($on_click);
+		echo "&nbsp;&nbsp;";
+	}
+	echo "&nbsp;";
 	echo "	<input class='formfld' type='text' name='forward_busy_destination' id='forward_busy_destination' maxlength='255' placeholder=\"".$text['label-destination']."\" value=\"".escape($forward_busy_destination)."\">\n";
 	echo "	<br />".$text['description-on-busy']."\n";
 	echo "</td>\n";
@@ -592,12 +633,29 @@
 	echo "	".$text['label-no_answer']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	$on_click = "document.getElementById('dnd_disabled').checked=true;";
-	$on_click .= "document.getElementById('forward_no_answer_destination').focus();";
-	echo "	<label for='forward_no_answer_disabled'><input type='radio' name='forward_no_answer_enabled' id='forward_no_answer_disabled' onclick=\"\" value='false' ".(($forward_no_answer_enabled == "false" || $forward_no_answer_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='forward_no_answer_enabled'><input type='radio' name='forward_no_answer_enabled' id='forward_no_answer_enabled' onclick=\"$on_click\" value='true' ".(($forward_no_answer_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
-	unset($on_click);
-	echo "&nbsp;&nbsp;&nbsp;";
+	if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+		echo "<label class='switch'>\n";
+		echo "	<input type='checkbox' id='forward_no_answer_enabled' name='forward_no_answer_enabled' value='true' ".(!empty($forward_no_answer_enabled) && $forward_no_answer_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_forward_no_answer(this);'>\n";
+		echo "	<span class='slider'></span>\n";
+		echo "</label>\n";
+		echo "<script>\n";
+		echo "function changed_forward_no_answer(el) {\n";
+		echo "	if (el.checked) {\n";
+		echo "		document.getElementById('dnd_enabled').checked = false;\n";
+		echo "		document.getElementById('forward_no_answer_destination').focus();\n";
+		echo "	}\n";
+		echo "}\n";
+		echo "</script>\n";
+	}
+	else {
+		$on_click = "document.getElementById('dnd_disabled').checked=true;";
+		$on_click .= "document.getElementById('forward_no_answer_destination').focus();";
+		echo "	<label for='forward_no_answer_disabled'><input type='radio' name='forward_no_answer_enabled' id='forward_no_answer_disabled' onclick=\"\" value='false' ".(($forward_no_answer_enabled == "false" || $forward_no_answer_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+		echo "	<label for='forward_no_answer_enabled'><input type='radio' name='forward_no_answer_enabled' id='forward_no_answer_enabled' onclick=\"$on_click\" value='true' ".(($forward_no_answer_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
+		unset($on_click);
+		echo "&nbsp;&nbsp;";
+	}
+	echo "&nbsp;";
 	echo "	<input class='formfld' type='text' name='forward_no_answer_destination' id='forward_no_answer_destination' maxlength='255' placeholder=\"".$text['label-destination']."\" value=\"".escape($forward_no_answer_destination)."\">\n";
 	echo "	<br />".$text['description-no_answer']."\n";
 	echo "</td>\n";
@@ -608,122 +666,171 @@
 	echo "	".$text['label-not_registered']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	$on_click = "document.getElementById('forward_user_not_registered_destination').focus();";
-	echo "	<label for='forward_user_not_registered_disabled'><input type='radio' name='forward_user_not_registered_enabled' id='forward_user_not_registered_disabled' onclick=\"\" value='false' ".(($forward_user_not_registered_enabled == "false" || $forward_user_not_registered_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='forward_user_not_registered_enabled'><input type='radio' name='forward_user_not_registered_enabled' id='forward_user_not_registered_enabled' onclick=\"$on_click\" value='true' ".(($forward_user_not_registered_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
-	unset($on_click);
-	echo "&nbsp;&nbsp;&nbsp;";
+	if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+		echo "<label class='switch'>\n";
+		echo "	<input type='checkbox' id='forward_user_not_registered_enabled' name='forward_user_not_registered_enabled' value='true' ".(!empty($forward_user_not_registered_enabled) && $forward_user_not_registered_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_forward_not_registered(this);'>\n";
+		echo "	<span class='slider'></span>\n";
+		echo "</label>\n";
+		echo "<script>\n";
+		echo "function changed_forward_not_registered(el) {\n";
+		echo "	if (el.checked) {\n";
+		echo "		document.getElementById('forward_user_not_registered_destination').focus();\n";
+		echo "	}\n";
+		echo "}\n";
+		echo "</script>\n";
+	}
+	else {
+		$on_click = "document.getElementById('forward_user_not_registered_destination').focus();";
+		echo "	<label for='forward_user_not_registered_disabled'><input type='radio' name='forward_user_not_registered_enabled' id='forward_user_not_registered_disabled' onclick=\"\" value='false' ".(($forward_user_not_registered_enabled == "false" || $forward_user_not_registered_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+		echo "	<label for='forward_user_not_registered_enabled'><input type='radio' name='forward_user_not_registered_enabled' id='forward_user_not_registered_enabled' onclick=\"$on_click\" value='true' ".(($forward_user_not_registered_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
+		unset($on_click);
+		echo "&nbsp;&nbsp;";
+	}
+	echo "&nbsp;";
 	echo "	<input class='formfld' type='text' name='forward_user_not_registered_destination' id='forward_user_not_registered_destination' maxlength='255' placeholder=\"".$text['label-destination']."\" value=\"".escape($forward_user_not_registered_destination)."\">\n";
 	echo "	<br />".$text['description-not_registered']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr><td colspan='2'><br /></td></tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	<strong>".$text['label-follow_me']."</strong>\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	$on_click = "document.getElementById('forward_all_disabled').checked=true; ";
-	$on_click .= "document.getElementById('dnd_disabled').checked=true; ";
-	echo "	<label for='follow_me_disabled'><input type='radio' name='follow_me_enabled' id='follow_me_disabled' onclick=\"$('#tr_follow_me_settings').slideUp('fast');\" value='false' ".((!empty($follow_me_enabled) && $follow_me_enabled == "false" || empty($follow_me_enabled)) ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='follow_me_enabled'><input type='radio' name='follow_me_enabled' id='follow_me_enabled' onclick=\"$('#tr_follow_me_settings').slideDown('fast'); $on_click\" value='true' ".((!empty($follow_me_enabled) && $follow_me_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
-	unset($on_click);
-	echo "</td>\n";
-	echo "</tr>\n";
 	echo "</table>\n";
 
-	if (!empty($follow_me_enabled) && $follow_me_enabled == "true" && $dnd_enabled  != "true" && $forward_all_enabled != "true") { $style = ''; } else { $style = 'display: none;'; }
-	echo "<div id='tr_follow_me_settings' style='$style'>\n";
-
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-destinations']."\n";
-	echo "</td>\n";
-	echo "<td width='70%' class='vtable' align='left'>\n";
-
-	echo "	<table border='0' cellpadding='2' cellspacing='0'>\n";
-	echo "		<tr>\n";
-	echo "			<td class='vtable'>".$text['label-destination_number']."</td>\n";
-	echo "			<td class='vtable'>".$text['label-destination_delay']."</td>\n";
-	echo "			<td class='vtable'>".$text['label-destination_timeout']."</td>\n";
-	if (permission_exists('follow_me_prompt')) {
-		echo "		<td class='vtable'>".$text['label-destination_prompt']."</td>\n";
-	}
-	echo "		</tr>\n";
-
-	//output destinations
-	$on_click = "";
-	foreach ($destinations as $n => $destination) {
-		echo "		<input type='hidden' name='destinations[".$n."][uuid]' value='".((!empty($destination['uuid'])) ? $destination['uuid'] : uuid())."'>\n";
-		echo "		<tr>\n";
-		echo "			<td><input class='formfld' style='min-width: 135px;' type='text' name='destinations[".$n."][destination]' id='destination_".$n."' maxlength='255' value=\"".escape($destination['destination'])."\"></td>\n";
-		echo "			<td>\n";
-								destination_select('destinations['.$n.'][delay]', $destination['delay'], '0');
-		echo "			</td>\n";
-		echo "			<td>\n";
-								destination_select('destinations['.$n.'][timeout]', $destination['timeout'], ((!empty($_SESSION['follow_me']['timeout']['numeric'])) ? $_SESSION['follow_me']['timeout']['numeric'] : 30));
-		echo "			</td>\n";
-		if (permission_exists('follow_me_prompt')) {
-			echo "		<td>\n";
-			echo "			<select class='formfld' style='width: 90px;' name='destinations[".$n."][prompt]'>\n";
-			echo "				<option value=''></option>\n";
-			echo "				<option value='1' ".(($destination['prompt']) ? "selected='selected'" : null).">".$text['label-destination_prompt_confirm']."</option>\n";
-			//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
-			echo "			</select>\n";
-			echo "		</td>\n";
+		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+		echo "<tr>\n";
+		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	<strong>".$text['label-follow_me']."</strong>\n";
+		echo "</td>\n";
+		echo "<td width='70%' class='vtable' align='left'>\n";
+		if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+			echo "<label class='switch'>\n";
+			echo "	<input type='checkbox' id='follow_me_enabled' name='follow_me_enabled' value='true' ".(!empty($follow_me_enabled) && $follow_me_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_follow_me(this);'>\n";
+			echo "	<span class='slider'></span>\n";
+			echo "</label>\n";
+			echo "<script>\n";
+			echo "function changed_follow_me(el) {\n";
+			echo "	if (el.checked) {\n";
+			echo "		$('#div_follow_me_settings').slideDown('fast');\n";
+			echo "		document.getElementById('forward_all_enabled').checked = false;\n";
+			echo "		document.getElementById('dnd_enabled').checked = false;\n";
+			echo "	}\n";
+			echo "	else {\n";
+			echo "		$('#div_follow_me_settings').slideUp('fast');\n";
+			echo "	}\n";
+			echo "}\n";
+			echo "</script>\n";
+		}
+		else {
+			$on_click = "document.getElementById('forward_all_disabled').checked=true; ";
+			$on_click .= "document.getElementById('dnd_disabled').checked=true; ";
+			echo "	<label for='follow_me_disabled'><input type='radio' name='follow_me_enabled' id='follow_me_disabled' onclick=\"$('#div_follow_me_settings').slideUp('fast');\" value='false' ".((!empty($follow_me_enabled) && $follow_me_enabled == "false" || empty($follow_me_enabled)) ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+			echo "	<label for='follow_me_enabled'><input type='radio' name='follow_me_enabled' id='follow_me_enabled' onclick=\"$('#div_follow_me_settings').slideDown('fast'); $on_click\" value='true' ".((!empty($follow_me_enabled) && $follow_me_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
+			unset($on_click);
 		}
-		echo "		</tr>\n";
-	}
-
-	echo "	</table>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	if (permission_exists('follow_me_ignore_busy')) {
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' align='left' nowrap='nowrap'>";
-		echo 				$text['label-ignore_busy'];
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left'>\n";
-		echo "				<label for='follow_me_ignore_busy_false'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy_false' value='false' onclick=\"\" ".(empty($follow_me_ignore_busy) || $follow_me_ignore_busy == "false" ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-		echo "				<label for='follow_me_ignore_busy_true'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy_true' value='true' onclick=\"".$on_click."\" ".(!empty($follow_me_ignore_busy) && $follow_me_ignore_busy == "true" ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
-		echo "				<br />\n";
-		echo 				$text['description-ignore_busy']."\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-	}
-
-	if (permission_exists('follow_me_cid_name_prefix')) {
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-cid-name-prefix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "  <input class='formfld' type='text' name='cid_name_prefix' maxlength='255' value='".escape($cid_name_prefix)."'>\n";
-		echo "<br />\n";
-		echo $text['description-cid-name-prefix']."\n";
 		echo "</td>\n";
 		echo "</tr>\n";
-	}
+		echo "</table>\n";
 
-	if (permission_exists('follow_me_cid_number_prefix')) {
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-cid-number-prefix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "  <input class='formfld' type='text' name='cid_number_prefix' maxlength='255' value='".escape($cid_number_prefix)."'>\n";
-		echo "<br />\n";
-		echo $text['description-cid-number-prefix']."\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-	}
+		if (!empty($follow_me_enabled) && $follow_me_enabled == "true" && $dnd_enabled  != "true" && $forward_all_enabled != "true") { $style = ''; } else { $style = 'display: none;'; }
+		echo "<div id='div_follow_me_settings' style='$style'>\n";
 
-	echo "</table>\n";
-	echo "</div>\n";
+			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+			echo "<tr>\n";
+			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+			echo "	".$text['label-destinations']."\n";
+			echo "</td>\n";
+			echo "<td width='70%' class='vtable' align='left'>\n";
+
+			echo "	<table border='0' cellpadding='2' cellspacing='0'>\n";
+			echo "		<tr>\n";
+			echo "			<td class='vtable'>".$text['label-destination_number']."</td>\n";
+			echo "			<td class='vtable'>".$text['label-destination_delay']."</td>\n";
+			echo "			<td class='vtable'>".$text['label-destination_timeout']."</td>\n";
+			if (permission_exists('follow_me_prompt')) {
+				echo "		<td class='vtable'>".$text['label-destination_prompt']."</td>\n";
+			}
+			echo "		</tr>\n";
+
+			//output destinations
+			$on_click = "";
+			foreach ($destinations as $n => $destination) {
+				echo "		<input type='hidden' name='destinations[".$n."][uuid]' value='".((!empty($destination['uuid'])) ? $destination['uuid'] : uuid())."'>\n";
+				echo "		<tr>\n";
+				echo "			<td><input class='formfld' style='min-width: 135px;' type='text' name='destinations[".$n."][destination]' id='destination_".$n."' maxlength='255' value=\"".escape($destination['destination'])."\"></td>\n";
+				echo "			<td>\n";
+										destination_select('destinations['.$n.'][delay]', $destination['delay'], '0');
+				echo "			</td>\n";
+				echo "			<td>\n";
+										destination_select('destinations['.$n.'][timeout]', $destination['timeout'], ((!empty($_SESSION['follow_me']['timeout']['numeric'])) ? $_SESSION['follow_me']['timeout']['numeric'] : 30));
+				echo "			</td>\n";
+				if (permission_exists('follow_me_prompt')) {
+					echo "		<td>\n";
+					echo "			<select class='formfld' style='width: 90px;' name='destinations[".$n."][prompt]'>\n";
+					echo "				<option value=''></option>\n";
+					echo "				<option value='1' ".(($destination['prompt']) ? "selected='selected'" : null).">".$text['label-destination_prompt_confirm']."</option>\n";
+					//echo "			<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
+					echo "			</select>\n";
+					echo "		</td>\n";
+				}
+				echo "		</tr>\n";
+			}
+
+			echo "	</table>\n";
+			echo "</td>\n";
+			echo "</tr>\n";
+
+			if (permission_exists('follow_me_ignore_busy')) {
+				echo "		<tr>\n";
+				echo "			<td class='vncell' valign='top' align='left' nowrap='nowrap'>";
+				echo 				$text['label-ignore_busy'];
+				echo "			</td>\n";
+				echo "			<td class='vtable' align='left'>\n";
+				if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+					echo "			<label class='switch'>\n";
+					echo "				<input type='checkbox' id='follow_me_ignore_busy' name='follow_me_ignore_busy' value='true' ".(!empty($follow_me_ignore_busy) && $follow_me_ignore_busy == 'true' ? "checked='checked'" : null).">\n";
+					echo "				<span class='slider'></span>\n";
+					echo "			</label>\n";
+
+				}
+				else {
+					echo "			<label for='follow_me_ignore_busy_false'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy_false' value='false' onclick=\"\" ".(empty($follow_me_ignore_busy) || $follow_me_ignore_busy == "false" ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+					echo "			<label for='follow_me_ignore_busy_true'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy_true' value='true' onclick=\"".$on_click."\" ".(!empty($follow_me_ignore_busy) && $follow_me_ignore_busy == "true" ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
+				}
+				echo "				<br />\n";
+				echo 				$text['description-ignore_busy']."\n";
+				echo "			</td>\n";
+				echo "		</tr>\n";
+			}
+
+			if (permission_exists('follow_me_cid_name_prefix')) {
+				echo "<tr>\n";
+				echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+				echo "	".$text['label-cid-name-prefix']."\n";
+				echo "</td>\n";
+				echo "<td class='vtable' align='left'>\n";
+				echo "  <input class='formfld' type='text' name='cid_name_prefix' maxlength='255' value='".escape($cid_name_prefix)."'>\n";
+				echo "<br />\n";
+				echo $text['description-cid-name-prefix']."\n";
+				echo "</td>\n";
+				echo "</tr>\n";
+			}
+
+			if (permission_exists('follow_me_cid_number_prefix')) {
+				echo "<tr>\n";
+				echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+				echo "	".$text['label-cid-number-prefix']."\n";
+				echo "</td>\n";
+				echo "<td class='vtable' align='left'>\n";
+				echo "  <input class='formfld' type='text' name='cid_number_prefix' maxlength='255' value='".escape($cid_number_prefix)."'>\n";
+				echo "<br />\n";
+				echo $text['description-cid-number-prefix']."\n";
+				echo "</td>\n";
+				echo "</tr>\n";
+			}
+
+			// echo "<tr><td colspan='2'><br /></td></tr>\n";
+			echo "</table>\n";
+
+		echo "</div>\n";
 
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr><td colspan='2'><br /></td></tr>\n";
@@ -732,11 +839,25 @@
 	echo "	<strong>".$text['label-dnd']."</strong>\n";
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
-	$on_click = "document.getElementById('forward_all_disabled').checked=true;";
-	$on_click .= "$('#tr_follow_me_settings').slideUp('fast'); ";
-	$on_click2 .= "(document.getElementById('follow_me_enabled').checked) ? $('#tr_follow_me_settings').slideDown('fast') : '' ";
-	echo "	<label for='dnd_disabled'><input type='radio' name='dnd_enabled' id='dnd_disabled' value='false' onclick=\"$on_click2\" ".(($dnd_enabled == "false" || $dnd_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
-	echo "	<label for='dnd_enabled'><input type='radio' name='dnd_enabled' id='dnd_enabled' value='true' onclick=\"$on_click\" ".(($dnd_enabled == "true") ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
+	if (substr($settings->get('theme', 'input_toggle_style'), 0, 6) == 'switch') {
+		echo "<label class='switch'>\n";
+		echo "	<input type='checkbox' id='dnd_enabled' name='dnd_enabled' value='true' ".(!empty($dnd_enabled) && $dnd_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_do_not_disturb(this);'>\n";
+		echo "	<span class='slider'></span>\n";
+		echo "</label>\n";
+		echo "<script>\n";
+		echo "function changed_do_not_disturb(el) {\n";
+		echo "	if (el.checked) {\n";
+		echo "		document.getElementById('forward_all_enabled').checked = false;\n";
+		echo "	}\n";
+		echo "}\n";
+		echo "</script>\n";
+	}
+	else {
+		$on_click = "document.getElementById('forward_all_disabled').checked=true;";
+		$on_click2 = "if (document.getElementById('follow_me_enabled').checked) { $('#div_follow_me_settings').slideDown('fast'); }";
+		echo "	<label for='dnd_disabled'><input type='radio' name='dnd_enabled' id='dnd_disabled' value='false' onclick=\"$on_click2\" ".(($dnd_enabled == "false" || $dnd_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+		echo "	<label for='dnd_enabled'><input type='radio' name='dnd_enabled' id='dnd_enabled' value='true' onclick=\"$on_click\" ".(($dnd_enabled == "true") ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
+	}
 	echo "	<br />\n";
 	echo "</td>\n";
 	echo "</tr>\n";