diff --git a/usr/local/www/easyrule.inc b/usr/local/www/easyrule.inc
index 4c7d26dfbd..1747654ae2 100644
--- a/usr/local/www/easyrule.inc
+++ b/usr/local/www/easyrule.inc
@@ -27,10 +27,13 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	
+	pfSense_MODULE:	filter
+*/
 
 $blockaliasname = 'EasyRuleBlockHosts';
 
-
 function easyrule_find_rule_interface($int) {
 	global $config;
 	/* Borrowed from firewall_rules.php */
diff --git a/usr/local/www/easyrule.php b/usr/local/www/easyrule.php
index 090056bd85..02197b9908 100644
--- a/usr/local/www/easyrule.php
+++ b/usr/local/www/easyrule.php
@@ -27,6 +27,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	filter
+*/
 
 $pgtitle = "Status : EasyRule";
 require_once("guiconfig.inc");
diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index e820dac2a1..3b62901edf 100644
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -26,6 +26,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	shell
+*/
 
 $pgtitle = array(gettext("Diagnostics"), gettext("Edit file"));
 require("guiconfig.inc");
diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php
index c6f878800d..8f3ee4ff58 100755
--- a/usr/local/www/exec.php
+++ b/usr/local/www/exec.php
@@ -27,6 +27,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	shell
+*/
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-command
@@ -35,7 +38,6 @@
 ##|*MATCH=exec.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (($_POST['submit'] == "Download") && file_exists($_POST['dlPath'])) {
@@ -236,7 +238,6 @@ if (!isBlank($_POST['txtPHPCommand'])) {
    puts("</pre>");
 }
 
-
 ?>
 <div id="niftyOutter">
 <form action="exec.php" method="POST" enctype="multipart/form-data" name="frmExecPlus" onSubmit="return frmExecPlus_onSubmit( this );">
diff --git a/usr/local/www/exec_raw.php b/usr/local/www/exec_raw.php
index 93213be296..bebacb3839 100755
--- a/usr/local/www/exec_raw.php
+++ b/usr/local/www/exec_raw.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	shell
+*/
 
 ##|+PRIV
 ##|*IDENT=page-hidden-execraw
@@ -36,8 +39,6 @@
 ##|*MATCH=exec_raw.php*
 ##|-PRIV
 
-
-
 header("Content-Type: text/plain");
 include("guiconfig.inc");
 
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 384b8b03c4..1911443a46 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -2,9 +2,13 @@
 <script src="/javascript/sorttable.js"></script>
 
 <?php
+/*
+	pfSense_MODULE:	header
+*/
 
 require_once("globals.inc");
 require_once("functions.inc");
+
 /* $Id$ */
 
 function return_ext_menu($section) {
diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc
index 867bb581d5..913771c5a9 100755
--- a/usr/local/www/fend.inc
+++ b/usr/local/www/fend.inc
@@ -1,3 +1,7 @@
+<!--
+	pfSense_MODULE:	footer
+-->
+
 		</div> <!-- Right DIV -->
 	
 	</div> <!-- Content DIV -->
diff --git a/usr/local/www/filebrowser/browser.js b/usr/local/www/filebrowser/browser.js
index 751b89e555..f25f9f56a9 100644
--- a/usr/local/www/filebrowser/browser.js
+++ b/usr/local/www/filebrowser/browser.js
@@ -1,3 +1,7 @@
+/*
+	pfSense_MODULE:	shell
+*/
+
 Event.observe(
 	window, "load",
 	function() {
diff --git a/usr/local/www/filebrowser/browser.php b/usr/local/www/filebrowser/browser.php
index 59a7e11ac0..a1eaa04016 100644
--- a/usr/local/www/filebrowser/browser.php
+++ b/usr/local/www/filebrowser/browser.php
@@ -1,4 +1,7 @@
 <?php
+/*
+	pfSense_MODULE:	shell
+*/
 // Fetch a list of directories and files inside a given directory
 function get_content($dir) {
 	$dirs  = array();
diff --git a/usr/local/www/filter_log.inc b/usr/local/www/filter_log.inc
index 5c54dbd365..3dc00c8896 100644
--- a/usr/local/www/filter_log.inc
+++ b/usr/local/www/filter_log.inc
@@ -29,6 +29,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/sbin/fifolog_reader	/usr/bin/tail	/usr/sbin/clog
+	pfSense_MODULE:	filter
+*/
 
 /* format filter logs */
 function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "") {
@@ -288,4 +292,4 @@ function handle_ajax($nentries, $tail = 50) {
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/filterparser.php b/usr/local/www/filterparser.php
index 2ca79fe755..d432419e76 100644
--- a/usr/local/www/filterparser.php
+++ b/usr/local/www/filterparser.php
@@ -35,6 +35,10 @@
 	clog /var/log/filter.log | tail -50 | /usr/local/www/filterparser.php
 	clog -f /var/log/filter.log | /usr/local/www/filterparser.php
 */
+/*
+	pfSense_MODULE:	logs
+*/
+
 include_once("functions.inc");
 include_once("filter_log.inc");
 
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index 3b8676e782..d5c104354e 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -30,6 +30,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	aliases
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-aliases
@@ -38,7 +41,6 @@
 ##|*MATCH=firewall_aliases.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['aliases']['alias']))
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index d99ae7137b..487aea509d 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -31,6 +31,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/bin/rm	/bin/mkdir	/usr/bin/fetch
+	pfSense_MODULE:	aliases
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-alias-edit
@@ -39,7 +43,6 @@
 ##|*MATCH=firewall_aliases_edit.php*
 ##|-PRIV
 
-
 $pgtitle = array("Firewall","Aliases","Edit");
 
 require("guiconfig.inc");
@@ -206,7 +209,7 @@ if ($_POST) {
 				$fda = fopen("{$g['tmp_path']}/tmpfetch","w");
 				fwrite($fda, "/usr/bin/fetch -q -o \"{$temp_filename}/aliases\" \"" . $_POST['address' . $x] . "\"");
 				fclose($fda);
-				mwexec("mkdir -p {$temp_filename}");
+				mwexec("/bin/mkdir -p {$temp_filename}");
 				mwexec("/usr/bin/fetch -q -o \"{$temp_filename}/aliases\" \"" . $_POST['address' . $x] . "\"");
 				/* if the item is tar gzipped then extract */
 				if(stristr($_POST['address' . $x], ".tgz"))
@@ -675,4 +678,5 @@ function process_alias_tgz($temp_filename) {
 	}
 	fclose($fd);
 }
-?>
+
+?>
\ No newline at end of file
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index 705e267d8a..66a318be45 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -26,6 +26,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	filter
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-alias-import
@@ -34,7 +37,6 @@
 ##|*MATCH=firewall_aliases_import.php*
 ##|-PRIV
 
-
 $pgtitle = array("Firewall","Aliases","Import");
 
 require("guiconfig.inc");
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 274a3f2a76..d8210a84e2 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -30,6 +30,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-portforward
@@ -38,7 +41,6 @@
 ##|*MATCH=firewall_nat.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['nat']['rule']))
diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
index 29f7585f7b..1aecbb8663 100755
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-1-1
@@ -36,7 +39,6 @@
 ##|*MATCH=firewall_nat_1to1.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['nat']['onetoone'])) {
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index eaa14a9c33..8398a0f3e9 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-1-1-edit
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index 6c9174375a..3e607c0cf3 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-portforward-edit
@@ -36,7 +39,6 @@
 ##|*MATCH=firewall_nat_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['nat']['rule'])) {
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index fc7d14b0eb..c5681db85a 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -30,6 +30,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-outbound
@@ -38,7 +41,6 @@
 ##|*MATCH=firewall_nat_out.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['nat']['advancedoutbound']['rule']))
@@ -46,7 +48,6 @@ if (!is_array($config['nat']['advancedoutbound']['rule']))
 
 $a_out = &$config['nat']['advancedoutbound']['rule'];
 
-
 if ($_POST['apply']) {
 	write_config();
 
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index abab75cfb8..a94a53e685 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -30,6 +30,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	nat
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-outbound-edit
@@ -38,7 +41,6 @@
 ##|*MATCH=firewall_nat_out_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['nat']['advancedoutbound']['rule']))
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index cc3fdf0915..331b60771e 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -30,6 +30,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	filter
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-rules
@@ -38,7 +41,6 @@
 ##|*MATCH=firewall_rules.php*
 ##|-PRIV
 
-
 $pgtitle = array("Firewall", "Rules");
 require("guiconfig.inc");
 
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index fd492cf818..9471e12113 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -30,6 +30,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	filter
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-rules-edit
diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php
index 46bef20a58..1648d7e7b4 100644
--- a/usr/local/www/firewall_schedule.php
+++ b/usr/local/www/firewall_schedule.php
@@ -29,7 +29,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-
+/*
+	pfSense_MODULE: schedules
+*/
 ##|+PRIV
 ##|*IDENT=page-firewall-schedules
 ##|*NAME=Firewall: Schedules page
diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index 6e628ecdce..1e15246f0c 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -29,6 +29,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	schedules
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-schedules-edit
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 545070ea4e..2310462298 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall
+	pfSense_MODULE:	shaper
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-trafficshaper
@@ -35,11 +39,11 @@
 ##|*MATCH=firewall_shaper.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
-        mwexec("killall -9 pfctl php");
+	/* XXX: Huh, why are we killing php? */
+	mwexec("killall -9 pfctl php");
 	exit;
 }
 
@@ -272,9 +276,9 @@ if ($_GET) {
 					$savemsg = $retval;
 
  		/* reset rrd queues */
-                system("rm -f /var/db/rrd/*queuedrops.rrd");
-                system("rm -f /var/db/rrd/*queues.rrd");
-			enable_rrd_graphing();
+		system("rm -f /var/db/rrd/*queuedrops.rrd");
+		system("rm -f /var/db/rrd/*queues.rrd");
+		enable_rrd_graphing();
 
 		clear_subsystem_dirty('shaper');
 			
diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index 773458c530..f402ca82bf 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -26,6 +26,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall
+	pfSense_MODULE:	shaper
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-trafficshaper-layer7
@@ -48,7 +52,6 @@ read_dummynet_config();
 $avail_behaviours_limiter = get_dummynet_name_list();
 $show_proto_form = false;
 
-
 //More variables
 $pgtitle = array("Firewall","Traffic Shaper", "Layer7");
 
@@ -63,8 +66,10 @@ $default_layer7shaper_msg .= "</td></tr>";
 read_layer7_config();
 
 if($_GET['reset'] <> "") {
-        mwexec("killall -9 pfctl php");
-	mwexec("killall -9 ipfw-classifyd"); //kill all ipfw-classifyd processes
+	/* XXX: Huh!? Why are we killing php here? */
+	mwexec("killall -9 pfctl php");
+	// kill all ipfw-classifyd processes
+	mwexec("killall -9 ipfw-classifyd"); 
 	exit;
 }
 
@@ -141,8 +146,8 @@ else if ($_POST) {
 		if(sizeof($dupes) == 0 && !$input_errors) {
 			$l7r->wconfig();
 			write_config();
-			mark_subsystem_dirty('shaper');
-
+			mark_subsystem_dirty('shaper');
+
 			read_layer7_config();
 		}
 		else {
@@ -168,14 +173,14 @@ else if ($_POST) {
 		$retval = 0;
 		$retval = filter_configure();
 		$savemsg = get_std_save_message($retval);
-
+
 		if(stristr($retval, "error") <> true)
 			$savemsg = get_std_save_message($retval);
 		else
 			$savemsg = $retval;
 
-		clear_subsystem_dirty('shaper');
-
+		clear_subsystem_dirty('shaper');
+
 		if($container) {
 			$output_form .= $container->build_form();
 		} else {
@@ -185,7 +190,7 @@ else if ($_POST) {
 	} else if ($_POST['delete']) {
 		$container->delete_l7c();
 		write_config();
-		mark_subsystem_dirty('shaper');
+		mark_subsystem_dirty('shaper');
 		unset($container);
 		
 		header("Location: firewall_shaper_layer7.php");
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index dc62a291d7..990ed39c1a 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall
+	pfSense_MODULE:	shaper
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-trafficshaper-queues
@@ -35,7 +39,6 @@
 ##|*MATCH=firewall_shaper_queues.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 42f263e675..3a27bb563b 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -28,6 +28,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall
+	pfSense_MODULE:	shaper
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-trafficshaper-limiter
@@ -36,11 +40,11 @@
 ##|*MATCH=firewall_shaper_vinterface.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
-        mwexec("killall -9 pfctl php");
+	/* XXX: Huh, why are we killing php? */
+	mwexec("/usr/bin/killall -9 pfctl php");
 	exit;
 }
 
diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index e1a5532a5b..69c3dd270f 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall
+	pfSense_MODULE:	shaper
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-trafficshaper-wizard
@@ -35,11 +39,11 @@
 ##|*MATCH=firewall_shaper_wizards.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
-        mwexec("killall -9 pfctl php");
+	/* XXX: Huh, why are we killing php? */
+	mwexec("/usr/bin/killall -9 pfctl php");
 	exit;
 }
 
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 2f51a7d847..e69ab4ab73 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -36,6 +36,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-virtualipaddresses
@@ -44,7 +48,6 @@
 ##|*MATCH=firewall_virtual_ip.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['virtualip']['vip'])) {
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index a98cc30de9..f04f2970ab 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -37,6 +37,10 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-firewall-virtualipaddress-edit
@@ -45,7 +49,6 @@
 ##|*MATCH=firewall_virtual_ip_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 if (!is_array($config['virtualip']['vip'])) {
         $config['virtualip']['vip'] = array();
diff --git a/usr/local/www/getstats.php b/usr/local/www/getstats.php
index 88752ad906..7687981029 100644
--- a/usr/local/www/getstats.php
+++ b/usr/local/www/getstats.php
@@ -25,6 +25,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	ajax
+*/
 
 ##|+PRIV
 ##|*IDENT=page-getstats
@@ -35,6 +38,7 @@
 
 require_once("guiconfig.inc");
 include_once("includes/functions.inc.php");
+
 echo get_stats();
 
 ?>
\ No newline at end of file
diff --git a/usr/local/www/graph.php b/usr/local/www/graph.php
index 2cf4a91445..fa521d8b70 100755
--- a/usr/local/www/graph.php
+++ b/usr/local/www/graph.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	graph
+*/
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-interfacetraffic
diff --git a/usr/local/www/graph_cpu.php b/usr/local/www/graph_cpu.php
index 8a7822e666..2dce113c10 100644
--- a/usr/local/www/graph_cpu.php
+++ b/usr/local/www/graph_cpu.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	graph
+*/
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-cpuutilization
diff --git a/usr/local/www/gui.css b/usr/local/www/gui.css
index 22b12180a2..a4d6453531 100755
--- a/usr/local/www/gui.css
+++ b/usr/local/www/gui.css
@@ -1,3 +1,7 @@
+/*
+	pfSense_MODULE:	base
+*/
+
 html,body {
 	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
 	font-size: 11px;
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index ebb1e35b6a..a608f8418d 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -29,6 +29,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	base
+*/
 
 /* Include authentication routines */
 /* THIS MUST BE ABOVE ALL OTHER CODE */
diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php
index 2c0a99a966..b6fdbd01a9 100755
--- a/usr/local/www/halt.php
+++ b/usr/local/www/halt.php
@@ -31,6 +31,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	header
+*/
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-haltsystem
@@ -39,7 +42,6 @@
 ##|*MATCH=halt.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if ($_POST) {
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index 47fcd1979b..aceae684cd 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -1,4 +1,8 @@
 <?php
+/*
+	pfSense_MODULE:	header
+*/
+
 /* 
  *   if user has selected a custom template, use it.
  *   otherwise default to pfsense tempalte
diff --git a/usr/local/www/headjs.php b/usr/local/www/headjs.php
index caf3d8736e..063d9bc201 100644
--- a/usr/local/www/headjs.php
+++ b/usr/local/www/headjs.php
@@ -23,6 +23,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	header
+*/
 
 ##|+PRIV
 ##|*IDENT=page-requiredforjavascript
@@ -31,7 +34,6 @@
 ##|*MATCH=headjs.php*
 ##|-PRIV
 
-
 function getHeadJS() {
   global $_SERVER, $HTTP_SERVER_VARS, $g, $use_loader_tab_gif;
 
@@ -161,4 +163,4 @@ function getHeadJS() {
   return $headjs;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/ifstats.php b/usr/local/www/ifstats.php
index 4b90a711b1..e6e35b7c18 100644
--- a/usr/local/www/ifstats.php
+++ b/usr/local/www/ifstats.php
@@ -28,6 +28,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES: /usr/bin/netstat
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-xmlrpcinterfacestats
@@ -74,4 +78,4 @@
 
 	echo "$timing|" . $ifinfo['inbytes'] . "|" . $ifinfo['outbytes'] . "\n";
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index b8d8a97e73..509ebffcb9 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -1,4 +1,7 @@
 <?
+/*
+	pfSense_MODULE:	ajax
+*/
 
 if(Connection_Aborted()) {
 	exit;
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index ac2dc6818e..3d62259d7b 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -30,6 +30,10 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-system-login/logout
@@ -38,7 +42,6 @@
 ##|*MATCH=index.php*
 ##|-PRIV
 
-
 	## Load Essential Includes
 	require_once('guiconfig.inc');
 	require_once('notices.inc');
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 0312974eb8..32b5cbe0f0 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -32,6 +32,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/sbin/arp
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index eb122743e0..1fa6070ed6 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -28,6 +28,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/bin/rm
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-assignnetworkports
@@ -292,7 +296,7 @@ if ($_GET['act'] == "add") {
 	}
 	
         /* XXX: Do not remove this. */
-        mwexec("rm -f /tmp/config.cache");
+        mwexec("/bin/rm -f /tmp/config.cache");
 
 	write_config();
 
diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php
index 8f5406ea04..98cf698671 100644
--- a/usr/local/www/interfaces_bridge.php
+++ b/usr/local/www/interfaces_bridge.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/bin/rm
+	pfSense_MODULE:	interfaces_assign
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-bridge
diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php
index 8eef90964d..0a51800fe8 100644
--- a/usr/local/www/interfaces_bridge_edit.php
+++ b/usr/local/www/interfaces_bridge_edit.php
@@ -27,6 +27,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-bridge-edit
diff --git a/usr/local/www/interfaces_gif.php b/usr/local/www/interfaces_gif.php
index 1407a6c935..90c6d6b956 100644
--- a/usr/local/www/interfaces_gif.php
+++ b/usr/local/www/interfaces_gif.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-gif
@@ -35,7 +39,6 @@
 ##|*MATCH=interfaces_gif.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['gifs']['gif']))
@@ -70,7 +73,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = array("Interfaces","gif");
 include("head.inc");
 
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index 04ccfe5a48..ba7f7aa999 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -27,6 +27,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-gif-edit
@@ -35,7 +38,6 @@
 ##|*MATCH=interfaces_gif_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['gifs']['gif']))
diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php
index 8b188e8658..9aca049e42 100644
--- a/usr/local/www/interfaces_gre.php
+++ b/usr/local/www/interfaces_gre.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-gre
@@ -35,7 +39,6 @@
 ##|*MATCH=interfaces_gre.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['gres']['gre']))
@@ -70,7 +73,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = array("Interfaces","GRE");
 include("head.inc");
 
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php
index de4ca9b3c5..5fee315a1a 100644
--- a/usr/local/www/interfaces_gre_edit.php
+++ b/usr/local/www/interfaces_gre_edit.php
@@ -27,6 +27,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-gre-edit
@@ -35,7 +38,6 @@
 ##|*MATCH=interfaces_gre_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['gres']['gre']))
diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php
index 2cec361020..98f45672b3 100755
--- a/usr/local/www/interfaces_groups.php
+++ b/usr/local/www/interfaces_groups.php
@@ -25,6 +25,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-groups
@@ -33,7 +37,6 @@
 ##|*MATCH=interfaces_groups.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['ifgroups']['ifgroupentry']))
diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php
index a612aff334..0414d9b4ba 100755
--- a/usr/local/www/interfaces_groups_edit.php
+++ b/usr/local/www/interfaces_groups_edit.php
@@ -25,6 +25,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfacess-groups
@@ -33,7 +37,6 @@
 ##|*MATCH=interfaces_groups_edit.php*
 ##|-PRIV
 
-
 $pgtitle = array("Interfaces","Groups", "Edit");
 
 require("guiconfig.inc");
diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php
index 840f1c6710..ffb4d2e72b 100644
--- a/usr/local/www/interfaces_lagg.php
+++ b/usr/local/www/interfaces_lagg.php
@@ -27,6 +27,17 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
+
+##|+PRIV
+##|*IDENT=page-interfacess-lagg
+##|*NAME=Interfaces: LAGG: page
+##|*DESCR=Edit Interface LAGG
+##|*MATCH=interfaces_lagg.php*
+##|-PRIV
 
 require("guiconfig.inc");
 
@@ -62,7 +73,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = array("Interfaces","LAGG");
 include("head.inc");
 
diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php
index f3a5567a2a..8b67ab61b7 100644
--- a/usr/local/www/interfaces_lagg_edit.php
+++ b/usr/local/www/interfaces_lagg_edit.php
@@ -27,6 +27,16 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
+
+##|+PRIV
+##|*IDENT=page-interfacess-lagg
+##|*NAME=Interfaces: LAGG: Edit page
+##|*DESCR=Edit Interface LAGG
+##|*MATCH=interfaces_lagg_edit.php*
+##|-PRIV
 
 require("guiconfig.inc");
 
diff --git a/usr/local/www/interfaces_ppp.php b/usr/local/www/interfaces_ppp.php
index c698cb6354..7429ae0948 100644
--- a/usr/local/www/interfaces_ppp.php
+++ b/usr/local/www/interfaces_ppp.php
@@ -30,6 +30,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/bin/kill	/sbin/ifconfig	
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-ppp
@@ -38,7 +42,6 @@
 ##|*MATCH=interfaces_ppp.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['ppps']['ppp']))
@@ -70,7 +73,7 @@ if ($_GET['act'] == "del") {
                         	$i++;
                 	if (file_exists("/var/run/ppp{$i}.pid")) {
                         	$pid = trim(file_get_contents("/var/run/ppp{$i}.pid"));
-                        	mwexec("kill {$pid}");
+                        	mwexec("/bin/kill {$pid}");
                 	}
         	}
 
@@ -84,7 +87,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = "Interfaces: PPP";
 include("head.inc");
 
diff --git a/usr/local/www/interfaces_ppp_edit.php b/usr/local/www/interfaces_ppp_edit.php
index 7731e26e3d..d30a3f9fa9 100644
--- a/usr/local/www/interfaces_ppp_edit.php
+++ b/usr/local/www/interfaces_ppp_edit.php
@@ -30,6 +30,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-ppp-edit
@@ -38,7 +41,6 @@
 ##|*MATCH=interfaces_ppp_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['ppps']['ppp']))
@@ -46,7 +48,6 @@ if (!is_array($config['ppps']['ppp']))
 
 $a_ppps = &$config['ppps']['ppp'];
 
-
 $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php
index 7d134dae77..b285fd9858 100755
--- a/usr/local/www/interfaces_qinq.php
+++ b/usr/local/www/interfaces_qinq.php
@@ -26,6 +26,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/sbin/ngctl	
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-qinq
@@ -34,7 +38,6 @@
 ##|*MATCH=interfaces_qinq.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['qinqs']['qinqentry']))
@@ -78,7 +81,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = array("Interfaces","QinQ");
 include("head.inc");
 
diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php
index bb13c62b27..8e6a900ce1 100755
--- a/usr/local/www/interfaces_qinq_edit.php
+++ b/usr/local/www/interfaces_qinq_edit.php
@@ -24,6 +24,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/usr/sbin/ngctl	
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfacess-qinq
@@ -32,7 +36,6 @@
 ##|*MATCH=interfaces_qinq_edit.php*
 ##|-PRIV
 
-
 $pgtitle = array("Interfaces","QinQ", "Edit");
 
 require("guiconfig.inc");
diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php
index 7b9569d127..5c71fab95d 100755
--- a/usr/local/www/interfaces_vlan.php
+++ b/usr/local/www/interfaces_vlan.php
@@ -28,6 +28,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-vlan
@@ -36,7 +40,6 @@
 ##|*MATCH=interfaces_vlan.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['vlans']['vlan']))
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index b656293916..db676f7706 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-vlan-edit
@@ -36,7 +39,6 @@
 ##|*MATCH=interfaces_vlan_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['vlans']['vlan']))
diff --git a/usr/local/www/interfaces_wlan_scan.php b/usr/local/www/interfaces_wlan_scan.php
index 80af0524e6..4024df1721 100755
--- a/usr/local/www/interfaces_wlan_scan.php
+++ b/usr/local/www/interfaces_wlan_scan.php
@@ -30,6 +30,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
+	pfSense_MODULE:	interfaces
+*/
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-scanwireless
@@ -38,17 +42,17 @@
 ##|*MATCH=interfaces_wlan_scan.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
-
 $pgtitle = array("Interfaces","Scan Wireless");
 include("head.inc");
 
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
+<?php 
+
+include("fbegin.inc");
 
 $interface = escapeshellarg($_GET['interface']);
 
@@ -60,5 +64,6 @@ echo $scan_nodes;
 echo "</PRE>";
 
 <?php include("fend.inc"); ?>
+
 </body>
 </html>
diff --git a/usr/local/www/license.php b/usr/local/www/license.php
index 9df9db0fd0..2a83d00b80 100755
--- a/usr/local/www/license.php
+++ b/usr/local/www/license.php
@@ -24,6 +24,9 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-system-license
diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php
index 83da721776..2285f32fce 100755
--- a/usr/local/www/load_balancer_monitor.php
+++ b/usr/local/www/load_balancer_monitor.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-monitor
diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php
index 4cea8d3f72..596472ee6f 100755
--- a/usr/local/www/load_balancer_monitor_edit.php
+++ b/usr/local/www/load_balancer_monitor_edit.php
@@ -28,6 +28,9 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-monitor-edit
@@ -37,6 +40,7 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+
 if (!is_array($config['load_balancer']['monitor_type'])) {
 	$config['load_balancer']['monitor_type'] = array();
 }
diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php
index 962d4c79e6..98181d7fd4 100755
--- a/usr/local/www/load_balancer_pool.php
+++ b/usr/local/www/load_balancer_pool.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-loadbalancer-pool
@@ -36,7 +39,6 @@
 ##|*MATCH=load_balancer_pool.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
 
 if (!is_array($config['load_balancer']['lbpool'])) {
diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php
index 0cb24ad805..7cc5d1f2d9 100755
--- a/usr/local/www/load_balancer_pool_edit.php
+++ b/usr/local/www/load_balancer_pool_edit.php
@@ -28,6 +28,9 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-loadbalancer-pool-edit
@@ -36,8 +39,8 @@
 ##|*MATCH=load_balancer_pool_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
+
 if (!is_array($config['load_balancer']['lbpool'])) {
 	$config['load_balancer']['lbpool'] = array();
 }
diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php
index 6ce157c648..181a2dc8c1 100755
--- a/usr/local/www/load_balancer_relay_action.php
+++ b/usr/local/www/load_balancer_relay_action.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-relay-action
diff --git a/usr/local/www/load_balancer_relay_action_edit.php b/usr/local/www/load_balancer_relay_action_edit.php
index e8a37856cb..e7e387cf83 100755
--- a/usr/local/www/load_balancer_relay_action_edit.php
+++ b/usr/local/www/load_balancer_relay_action_edit.php
@@ -28,6 +28,9 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-relay-action-edit
diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php
index 15f73c8722..49b6441cfb 100755
--- a/usr/local/www/load_balancer_relay_protocol.php
+++ b/usr/local/www/load_balancer_relay_protocol.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-relay-protocol
diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php
index 6637715b86..556cd44da1 100755
--- a/usr/local/www/load_balancer_relay_protocol_edit.php
+++ b/usr/local/www/load_balancer_relay_protocol_edit.php
@@ -28,6 +28,9 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-relay-protocol-edit
@@ -37,6 +40,7 @@
 ##|-PRIV
 
 require("guiconfig.inc");
+
 if (!is_array($config['load_balancer']['lbprotocol'])) {
 	$config['load_balancer']['lbprotocol'] = array();
 }
diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
index 279d86941e..ca40423fa7 100755
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -28,6 +28,9 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-virtualservers
@@ -36,7 +39,6 @@
 ##|*MATCH=load_balancer_virtual_server.php*
 ##|-PRIV
 
-
 require_once("guiconfig.inc");
 require_once("vslb.inc");
 
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index 8523286e26..8f3f728ec0 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -28,6 +28,9 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+/*
+	pfSense_MODULE:	routing
+*/
 
 ##|+PRIV
 ##|*IDENT=page-loadbalancer-virtualserver-edit
@@ -36,8 +39,8 @@
 ##|*MATCH=load_balancer_virtual_server_edit.php*
 ##|-PRIV
 
-
 require("guiconfig.inc");
+
 if (!is_array($config['load_balancer']['virtual_server'])) {
         $config['load_balancer']['virtual_server'] = array();
 }