70 files changed, 159 insertions, 622 deletions

diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index 3aa1b85..aec2e1b 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -1036,3 +1036,7 @@
 /var/mail/_relayd
 /var/mail/unbound
 /usr/local/www/d3pie
+/usr/local/www/bootstrap
+/usr/local/www/jquery
+/usr/local/www/sortable
+/usr/local/www/font-awesome
diff --git a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings-white.png b/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484..0000000
--- a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings-white.png
+++ /dev/null
diff --git a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.css b/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.css
deleted file mode 100644
index 25f4d90..0000000
--- a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.css
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
-manual-cp-man strikes again
-
-http://getbootstrap.com/2.3.2/assets/css/bootstrap.css
-*/
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("/bootstrap/glyphicons/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("/bootstrap/glyphicons/glyphicons-halflings-white.png");
-}
-
-.icon-glass {
-  background-position: 0      0;
-}
-
-.icon-music {
-  background-position: -24px 0;
-}
-
-.icon-search {
-  background-position: -48px 0;
-}
-
-.icon-envelope {
-  background-position: -72px 0;
-}
-
-.icon-heart {
-  background-position: -96px 0;
-}
-
-.icon-star {
-  background-position: -120px 0;
-}
-
-.icon-star-empty {
-  background-position: -144px 0;
-}
-
-.icon-user {
-  background-position: -168px 0;
-}
-
-.icon-film {
-  background-position: -192px 0;
-}
-
-.icon-th-large {
-  background-position: -216px 0;
-}
-
-.icon-th {
-  background-position: -240px 0;
-}
-
-.icon-th-list {
-  background-position: -264px 0;
-}
-
-.icon-ok {
-  background-position: -288px 0;
-}
-
-.icon-remove {
-  background-position: -312px 0;
-}
-
-.icon-zoom-in {
-  background-position: -336px 0;
-}
-
-.icon-zoom-out {
-  background-position: -360px 0;
-}
-
-.icon-off {
-  background-position: -384px 0;
-}
-
-.icon-signal {
-  background-position: -408px 0;
-}
-
-.icon-cog {
-  background-position: -432px 0;
-}
-
-.icon-trash {
-  background-position: -456px 0;
-}
-
-.icon-home {
-  background-position: 0 -24px;
-}
-
-.icon-file {
-  background-position: -24px -24px;
-}
-
-.icon-time {
-  background-position: -48px -24px;
-}
-
-.icon-road {
-  background-position: -72px -24px;
-}
-
-.icon-download-alt {
-  background-position: -96px -24px;
-}
-
-.icon-download {
-  background-position: -120px -24px;
-}
-
-.icon-upload {
-  background-position: -144px -24px;
-}
-
-.icon-inbox {
-  background-position: -168px -24px;
-}
-
-.icon-play-circle {
-  background-position: -192px -24px;
-}
-
-.icon-repeat {
-  background-position: -216px -24px;
-}
-
-.icon-refresh {
-  background-position: -240px -24px;
-}
-
-.icon-list-alt {
-  background-position: -264px -24px;
-}
-
-.icon-lock {
-  background-position: -287px -24px;
-}
-
-.icon-flag {
-  background-position: -312px -24px;
-}
-
-.icon-headphones {
-  background-position: -336px -24px;
-}
-
-.icon-volume-off {
-  background-position: -360px -24px;
-}
-
-.icon-volume-down {
-  background-position: -384px -24px;
-}
-
-.icon-volume-up {
-  background-position: -408px -24px;
-}
-
-.icon-qrcode {
-  background-position: -432px -24px;
-}
-
-.icon-barcode {
-  background-position: -456px -24px;
-}
-
-.icon-tag {
-  background-position: 0 -48px;
-}
-
-.icon-tags {
-  background-position: -25px -48px;
-}
-
-.icon-book {
-  background-position: -48px -48px;
-}
-
-.icon-bookmark {
-  background-position: -72px -48px;
-}
-
-.icon-print {
-  background-position: -96px -48px;
-}
-
-.icon-camera {
-  background-position: -120px -48px;
-}
-
-.icon-font {
-  background-position: -144px -48px;
-}
-
-.icon-bold {
-  background-position: -167px -48px;
-}
-
-.icon-italic {
-  background-position: -192px -48px;
-}
-
-.icon-text-height {
-  background-position: -216px -48px;
-}
-
-.icon-text-width {
-  background-position: -240px -48px;
-}
-
-.icon-align-left {
-  background-position: -264px -48px;
-}
-
-.icon-align-center {
-  background-position: -288px -48px;
-}
-
-.icon-align-right {
-  background-position: -312px -48px;
-}
-
-.icon-align-justify {
-  background-position: -336px -48px;
-}
-
-.icon-list {
-  background-position: -360px -48px;
-}
-
-.icon-indent-left {
-  background-position: -384px -48px;
-}
-
-.icon-indent-right {
-  background-position: -408px -48px;
-}
-
-.icon-facetime-video {
-  background-position: -432px -48px;
-}
-
-.icon-picture {
-  background-position: -456px -48px;
-}
-
-.icon-pencil {
-  background-position: 0 -72px;
-}
-
-.icon-map-marker {
-  background-position: -24px -72px;
-}
-
-.icon-adjust {
-  background-position: -48px -72px;
-}
-
-.icon-tint {
-  background-position: -72px -72px;
-}
-
-.icon-edit {
-  background-position: -96px -72px;
-}
-
-.icon-share {
-  background-position: -120px -72px;
-}
-
-.icon-check {
-  background-position: -144px -72px;
-}
-
-.icon-move {
-  background-position: -168px -72px;
-}
-
-.icon-step-backward {
-  background-position: -192px -72px;
-}
-
-.icon-fast-backward {
-  background-position: -216px -72px;
-}
-
-.icon-backward {
-  background-position: -240px -72px;
-}
-
-.icon-play {
-  background-position: -264px -72px;
-}
-
-.icon-pause {
-  background-position: -288px -72px;
-}
-
-.icon-stop {
-  background-position: -312px -72px;
-}
-
-.icon-forward {
-  background-position: -336px -72px;
-}
-
-.icon-fast-forward {
-  background-position: -360px -72px;
-}
-
-.icon-step-forward {
-  background-position: -384px -72px;
-}
-
-.icon-eject {
-  background-position: -408px -72px;
-}
-
-.icon-chevron-left {
-  background-position: -432px -72px;
-}
-
-.icon-chevron-right {
-  background-position: -456px -72px;
-}
-
-.icon-plus-sign {
-  background-position: 0 -96px;
-}
-
-.icon-minus-sign {
-  background-position: -24px -96px;
-}
-
-.icon-remove-sign {
-  background-position: -48px -96px;
-}
-
-.icon-ok-sign {
-  background-position: -72px -96px;
-}
-
-.icon-question-sign {
-  background-position: -96px -96px;
-}
-
-.icon-info-sign {
-  background-position: -120px -96px;
-}
-
-.icon-screenshot {
-  background-position: -144px -96px;
-}
-
-.icon-remove-circle {
-  background-position: -168px -96px;
-}
-
-.icon-ok-circle {
-  background-position: -192px -96px;
-}
-
-.icon-ban-circle {
-  background-position: -216px -96px;
-}
-
-.icon-arrow-left {
-  background-position: -240px -96px;
-}
-
-.icon-arrow-right {
-  background-position: -264px -96px;
-}
-
-.icon-arrow-up {
-  background-position: -289px -96px;
-}
-
-.icon-arrow-down {
-  background-position: -312px -96px;
-}
-
-.icon-share-alt {
-  background-position: -336px -96px;
-}
-
-.icon-resize-full {
-  background-position: -360px -96px;
-}
-
-.icon-resize-small {
-  background-position: -384px -96px;
-}
-
-.icon-plus {
-  background-position: -408px -96px;
-}
-
-.icon-minus {
-  background-position: -433px -96px;
-}
-
-.icon-asterisk {
-  background-position: -456px -96px;
-}
-
-.icon-exclamation-sign {
-  background-position: 0 -120px;
-}
-
-.icon-gift {
-  background-position: -24px -120px;
-}
-
-.icon-leaf {
-  background-position: -48px -120px;
-}
-
-.icon-fire {
-  background-position: -72px -120px;
-}
-
-.icon-eye-open {
-  background-position: -96px -120px;
-}
-
-.icon-eye-close {
-  background-position: -120px -120px;
-}
-
-.icon-warning-sign {
-  background-position: -144px -120px;
-}
-
-.icon-plane {
-  background-position: -168px -120px;
-}
-
-.icon-calendar {
-  background-position: -192px -120px;
-}
-
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
-}
-
-.icon-comment {
-  background-position: -240px -120px;
-}
-
-.icon-magnet {
-  background-position: -264px -120px;
-}
-
-.icon-chevron-up {
-  background-position: -288px -120px;
-}
-
-.icon-chevron-down {
-  background-position: -313px -119px;
-}
-
-.icon-retweet {
-  background-position: -336px -120px;
-}
-
-.icon-shopping-cart {
-  background-position: -360px -120px;
-}
-
-.icon-folder-close {
-  width: 16px;
-  background-position: -384px -120px;
-}
-
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
-}
-
-.icon-resize-vertical {
-  background-position: -432px -119px;
-}
-
-.icon-resize-horizontal {
-  background-position: -456px -118px;
-}
-
-.icon-hdd {
-  background-position: 0 -144px;
-}
-
-.icon-bullhorn {
-  background-position: -24px -144px;
-}
-
-.icon-bell {
-  background-position: -48px -144px;
-}
-
-.icon-certificate {
-  background-position: -72px -144px;
-}
-
-.icon-thumbs-up {
-  background-position: -96px -144px;
-}
-
-.icon-thumbs-down {
-  background-position: -120px -144px;
-}
-
-.icon-hand-right {
-  background-position: -144px -144px;
-}
-
-.icon-hand-left {
-  background-position: -168px -144px;
-}
-
-.icon-hand-up {
-  background-position: -192px -144px;
-}
-
-.icon-hand-down {
-  background-position: -216px -144px;
-}
-
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
-}
-
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
-}
-
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
-}
-
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
-}
-
-.icon-globe {
-  background-position: -336px -144px;
-}
-
-.icon-wrench {
-  background-position: -360px -144px;
-}
-
-.icon-tasks {
-  background-position: -384px -144px;
-}
-
-.icon-filter {
-  background-position: -408px -144px;
-}
-
-.icon-briefcase {
-  background-position: -432px -144px;
-}
-
-.icon-fullscreen {
-  background-position: -456px -144px;
-}
-
diff --git a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.png b/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.png
deleted file mode 100644
index a996999..0000000
--- a/src/usr/local/www/bootstrap/glyphicons/glyphicons-halflings.png
+++ /dev/null
diff --git a/src/usr/local/www/bootstrap/fonts/LICENSE.txt b/src/usr/local/www/css/fonts/LICENSE.txt
index d645695..d645695 100644
--- a/src/usr/local/www/bootstrap/fonts/LICENSE.txt
+++ b/src/usr/local/www/css/fonts/LICENSE.txt
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Black.ttf b/src/usr/local/www/css/fonts/Roboto-Black.ttf
index fbde625..fbde625 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Black.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Black.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-BlackItalic.ttf b/src/usr/local/www/css/fonts/Roboto-BlackItalic.ttf
index 60f7782..60f7782 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-BlackItalic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-BlackItalic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Bold.ttf b/src/usr/local/www/css/fonts/Roboto-Bold.ttf
index a355c27..a355c27 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Bold.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Bold.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-BoldItalic.ttf b/src/usr/local/www/css/fonts/Roboto-BoldItalic.ttf
index 3c9a7a3..3c9a7a3 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-BoldItalic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-BoldItalic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Italic.ttf b/src/usr/local/www/css/fonts/Roboto-Italic.ttf
index ff6046d..ff6046d 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Italic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Italic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Light.ttf b/src/usr/local/www/css/fonts/Roboto-Light.ttf
index 94c6bcc..94c6bcc 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Light.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Light.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-LightItalic.ttf b/src/usr/local/www/css/fonts/Roboto-LightItalic.ttf
index 04cc002..04cc002 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-LightItalic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-LightItalic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Medium.ttf b/src/usr/local/www/css/fonts/Roboto-Medium.ttf
index 39c63d7..39c63d7 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Medium.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Medium.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-MediumItalic.ttf b/src/usr/local/www/css/fonts/Roboto-MediumItalic.ttf
index dc743f0..dc743f0 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-MediumItalic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-MediumItalic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Regular.ttf b/src/usr/local/www/css/fonts/Roboto-Regular.ttf
index 8c082c8..8c082c8 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Regular.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Regular.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-Thin.ttf b/src/usr/local/www/css/fonts/Roboto-Thin.ttf
index d695550..d695550 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-Thin.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-Thin.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/Roboto-ThinItalic.ttf b/src/usr/local/www/css/fonts/Roboto-ThinItalic.ttf
index 07172ff..07172ff 100644
--- a/src/usr/local/www/bootstrap/fonts/Roboto-ThinItalic.ttf
+++ b/src/usr/local/www/css/fonts/Roboto-ThinItalic.ttf
diff --git a/src/usr/local/www/bootstrap/fonts/roboto.css b/src/usr/local/www/css/fonts/roboto.css
index 4e88d82..4e88d82 100644
--- a/src/usr/local/www/bootstrap/fonts/roboto.css
+++ b/src/usr/local/www/css/fonts/roboto.css
diff --git a/src/usr/local/www/bootstrap/css/pfSense-BETA.css b/src/usr/local/www/css/pfSense-BETA.css
index 7047033..7047033 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-BETA.css
+++ b/src/usr/local/www/css/pfSense-BETA.css
diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark-BETA.css b/src/usr/local/www/css/pfSense-dark-BETA.css
index 46f9283..46f9283 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-dark-BETA.css
+++ b/src/usr/local/www/css/pfSense-dark-BETA.css
diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/css/pfSense-dark.css
index 2bce22d..2bce22d 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-dark.css
+++ b/src/usr/local/www/css/pfSense-dark.css
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/css/pfSense.css
index 1c2a0b1..060e139 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/css/pfSense.css
@@ -1,5 +1,5 @@
-@import url("/bootstrap/css/bootstrap.min.css");
-@import url("/bootstrap/fonts/roboto.css");
+@import url("/vendor/bootstrap/css/bootstrap.min.css");
+@import url("/css/fonts/roboto.css");
 
 html {
     position: relative;
diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc
index be2ed15..dc693f9 100644
--- a/src/usr/local/www/foot.inc
+++ b/src/usr/local/www/foot.inc
@@ -18,12 +18,12 @@
 		</div>
 	</footer>
 
-	<script src="/jquery/jquery-1.12.0.min.js"></script>
-	<script src="/jquery/jquery-ui-1.11.4.min.js"></script>
-	<script src="/bootstrap/js/bootstrap.min.js"></script>
-	<script src="/jquery/pfSense.js"></script>
-	<script src="/jquery/pfSenseHelpers.js"></script>
-	<script src="/sortable/sortable.js"></script>
+	<script src="/vendor/jquery/jquery-1.12.0.min.js"></script>
+	<script src="/vendor/jquery/jquery-ui-1.11.4.min.js"></script>
+	<script src="/vendor/bootstrap/js/bootstrap.min.js"></script>
+	<script src="/js/pfSense.js"></script>
+	<script src="/js/pfSenseHelpers.js"></script>
+	<script src="/vendor/sortable/sortable.js"></script>
 
 	<script type="text/javascript">
 	//<![CDATA[
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 2dcd21a..50b8522 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -66,11 +66,11 @@ if (isset($config['system']['webgui']['pagenamefirst'])) {
 	$tabtitle = htmlspecialchars($config['system']['hostname'] . "." . $config['system']['domain']) . " - " . $pagetitle;
 }
 
-$cssfile = "/bootstrap/css/pfSense.css";
+$cssfile = "/css/pfSense.css";
 
 if (isset($config['system']['webgui']['webguicss'])) {
-	if (file_exists("/usr/local/www/bootstrap/css/" . $config['system']['webgui']['webguicss'])) {
-		$cssfile = "/bootstrap/css/" . $config['system']['webgui']['webguicss'];
+	if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) {
+		$cssfile = "/css/" . $config['system']['webgui']['webguicss'];
 	}
 }
 
@@ -85,8 +85,8 @@ if (!isset($config['system']['webgui']['dashboardcolumns'])) {
 <head>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="<?=$cssfile?>" />
-	<link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css">
-	<link rel="stylesheet" href="/sortable/sortable-theme-bootstrap.css">
+	<link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="/vendor/sortable/sortable-theme-bootstrap.css">
 	<title><?=$tabtitle?></title>
 	<script type="text/javascript">
 	//<![CDATA[
diff --git a/src/usr/local/www/jquery/pfSense.js b/src/usr/local/www/js/pfSense.js
index 3ca74c4..3ca74c4 100644
--- a/src/usr/local/www/jquery/pfSense.js
+++ b/src/usr/local/www/js/pfSense.js
diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js
index 9e90e5d..9e90e5d 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/js/pfSenseHelpers.js
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 29e4a6c..ae1377b 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -490,12 +490,10 @@ $section->addInput(new Form_Select(
 $form->add($section);
 
 $csslist = array();
-$css = glob("/usr/local/www/bootstrap/css/*.css");
+$css = glob("/usr/local/www/css/*.css");
 foreach ($css as $file) {
 	$file = basename($file);
-	if (substr($file, 0, 9) !== 'bootstrap') {
-		$csslist[$file] = pathinfo($file, PATHINFO_FILENAME);
-	}
+	$csslist[$file] = pathinfo($file, PATHINFO_FILENAME);
 }
 
 asort($csslist);
@@ -511,7 +509,7 @@ $section->addInput(new Form_Select(
 	'Theme',
 	$pconfig['webguicss'],
 	$csslist
-))->setHelp('Choose an alternative css file (if installed) to change the appearance of the webConfigurator. css files are located in /usr/local/www/bootstrap/css');
+))->setHelp('Choose an alternative css file (if installed) to change the appearance of the webConfigurator. css files are located in /usr/local/www/css/');
 
 $section->addInput(new Form_Select(
 	'webguifixedmenu',
diff --git a/src/usr/local/www/system_usermanager_settings_test.php b/src/usr/local/www/system_usermanager_settings_test.php
new file mode 100644
index 0000000..aba0738
--- /dev/null
+++ b/src/usr/local/www/system_usermanager_settings_test.php
@@ -0,0 +1,139 @@
+<?php
+/*
+	system_usermanager_settings_test.php
+*/
+/* ====================================================================
+ *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
+ *	Copyright (c)  2014 Silvio Giunge <desenvolvimento@bluepex.com>
+ *
+ *	Redistribution and use in source and binary forms, with or without modification,
+ *	are permitted provided that the following conditions are met:
+ *
+ *	1. Redistributions of source code must retain the above copyright notice,
+ *		this list of conditions and the following disclaimer.
+ *
+ *	2. Redistributions in binary form must reproduce the above copyright
+ *		notice, this list of conditions and the following disclaimer in
+ *		the documentation and/or other materials provided with the
+ *		distribution.
+ *
+ *	3. All advertising materials mentioning features or use of this software
+ *		must display the following acknowledgment:
+ *		"This product includes software developed by the pfSense Project
+ *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
+ *
+ *	4. The names "pfSense" and "pfSense Project" must not be used to
+ *		 endorse or promote products derived from this software without
+ *		 prior written permission. For written permission, please contact
+ *		 coreteam@pfsense.org.
+ *
+ *	5. Products derived from this software may not be called "pfSense"
+ *		nor may "pfSense" appear in their names without prior written
+ *		permission of the Electric Sheep Fencing, LLC.
+ *
+ *	6. Redistributions of any form whatsoever must retain the following
+ *		acknowledgment:
+ *
+ *	"This product includes software developed by the pfSense Project
+ *	for use in the pfSense software distribution (http://www.pfsense.org/).
+ *
+ *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
+ *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
+ *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ *	OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	====================================================================
+ *
+ */
+
+##|+PRIV
+##|*IDENT=page-system-usermanager-settings-testldap
+##|*NAME=System: User Manager: Settings: Test LDAP
+##|*DESCR=Allow access to the 'System: User Manager: Settings: Test LDAP' page.
+##|*MATCH=system_usermanager_settings_test.php*
+##|-PRIV
+
+require("guiconfig.inc");
+require_once("auth.inc");
+
+if (isset($config['system']['authserver'][0]['host'])) {
+	$auth_server = $config['system']['authserver'][0]['host'];
+	$authserver = $_GET['authserver'];
+	$authcfg = auth_get_authserver($authserver);
+}
+
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+	<link rel="stylesheet" href="/css/pfSense.css" />
+	<link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css" />
+	<title><?=gettext("Test Authentication server"); ?></title>
+</head>
+<body id="system_usermanager_settings_test" class="no-menu">
+	<div id="jumbotron">
+		<div class="container">
+			<div class="col-sm-offset-3 col-sm-6 col-xs-12">
+				<pre>
+<?php
+
+if (!$authcfg) {
+	printf(gettext("Could not find settings for %s%s"), htmlspecialchars($authserver), "<p/>");
+} else {
+	echo "<b>" . sprintf(gettext("Testing %s LDAP settings... One moment please..."), $g['product_name']) . "</b>";
+
+	echo "<table>";
+
+	echo "<tr><td>" . sprintf(gettext("Attempting connection to %s%s%s"), "<td><center>", htmlspecialchars($auth_server), "</center></td>");
+	if (ldap_test_connection($authcfg)) {
+		echo "<td><span class=\"text-center text-success\">" . gettext("OK") . "</span></td></tr>";
+
+		echo "<tr><td>" . sprintf(gettext("Attempting bind to %s%s%s"), "<td><center>", htmlspecialchars($auth_server), "</center></td>");
+		if (ldap_test_bind($authcfg)) {
+			echo "<td><span class=\"text-center text-success\">" . gettext("OK") . "</span></td></tr>";
+
+			echo "<tr><td>" . sprintf(gettext("Attempting to fetch Organizational Units from %s%s%s"), "<td><center>", htmlspecialchars($auth_server), "</center></td>");
+			$ous = ldap_get_user_ous(true, $authcfg);
+			if (count($ous)>1) {
+				echo "<td><span class=\"text-center text-success\">" . gettext("OK") . "</span></td></tr>";
+				echo "</table>";
+				if (is_array($ous)) {
+					echo "<br/>";
+					echo "<b>" . gettext("Organization units found") . "</b>";
+					echo "<table width='100%'>";
+					foreach ($ous as $ou) {
+						echo "<tr><td onmouseover=\"this.style.backgroundColor='#ffffff';\" onmouseout=\"this.style.backgroundColor='#dddddd';\">" . $ou . "</td></tr>";
+					}
+				}
+			} else {
+				echo "<td><span class=\"text-alert\">" . gettext("failed") . "</span></td></tr>";
+			}
+
+			echo "</table><p/>";
+
+		} else {
+			echo "<td><span class=\"text-alert\">" . gettext("failed") . "</span></td></tr>";
+			echo "</table><p/>";
+		}
+	} else {
+		echo "<td><span class=\"text-alert\">" . gettext("failed") . "</span></td></tr>";
+		echo "</table><p/>";
+	}
+}
+
+?>
+				</pre>
+
+				<a href="javascript:window.close();" class="btn btn-info"><i class="fa fa-undo icon-embed-btn"></i><?=gettext("Return")?></a>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/usr/local/www/bootstrap/css/bootstrap.min.css b/src/usr/local/www/vendor/bootstrap/css/bootstrap.min.css
index cd1c616..cd1c616 100644
--- a/src/usr/local/www/bootstrap/css/bootstrap.min.css
+++ b/src/usr/local/www/vendor/bootstrap/css/bootstrap.min.css
diff --git a/src/usr/local/www/bootstrap/js/bootstrap.min.js b/src/usr/local/www/vendor/bootstrap/js/bootstrap.min.js
index c8f82e5..c8f82e5 100644
--- a/src/usr/local/www/bootstrap/js/bootstrap.min.js
+++ b/src/usr/local/www/vendor/bootstrap/js/bootstrap.min.js
diff --git a/src/usr/local/www/font-awesome/HELP-US-OUT.txt b/src/usr/local/www/vendor/font-awesome/HELP-US-OUT.txt
index cfd9d9f..cfd9d9f 100644
--- a/src/usr/local/www/font-awesome/HELP-US-OUT.txt
+++ b/src/usr/local/www/vendor/font-awesome/HELP-US-OUT.txt
diff --git a/src/usr/local/www/font-awesome/css/font-awesome.css b/src/usr/local/www/vendor/font-awesome/css/font-awesome.css
index b2a5fe2..b2a5fe2 100644
--- a/src/usr/local/www/font-awesome/css/font-awesome.css
+++ b/src/usr/local/www/vendor/font-awesome/css/font-awesome.css
diff --git a/src/usr/local/www/font-awesome/css/font-awesome.min.css b/src/usr/local/www/vendor/font-awesome/css/font-awesome.min.css
index d0603cb..d0603cb 100644
--- a/src/usr/local/www/font-awesome/css/font-awesome.min.css
+++ b/src/usr/local/www/vendor/font-awesome/css/font-awesome.min.css
diff --git a/src/usr/local/www/font-awesome/fonts/FontAwesome.otf b/src/usr/local/www/vendor/font-awesome/fonts/FontAwesome.otf
index 3ed7f8b..3ed7f8b 100644
--- a/src/usr/local/www/font-awesome/fonts/FontAwesome.otf
+++ b/src/usr/local/www/vendor/font-awesome/fonts/FontAwesome.otf
diff --git a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.eot b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.eot
index 9b6afae..9b6afae 100644
--- a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.eot
+++ b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.svg b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.svg
index d05688e..d05688e 100644
--- a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.svg
+++ b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.ttf b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.ttf
index 26dea79..26dea79 100644
--- a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.ttf
+++ b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.woff b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.woff
index dc35ce3..dc35ce3 100644
--- a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.woff
+++ b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.woff2 b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.woff2
index 500e517..500e517 100644
--- a/src/usr/local/www/font-awesome/fonts/fontawesome-webfont.woff2
+++ b/src/usr/local/www/vendor/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/src/usr/local/www/font-awesome/less/animated.less b/src/usr/local/www/vendor/font-awesome/less/animated.less
index 66ad52a..66ad52a 100644
--- a/src/usr/local/www/font-awesome/less/animated.less
+++ b/src/usr/local/www/vendor/font-awesome/less/animated.less
diff --git a/src/usr/local/www/font-awesome/less/bordered-pulled.less b/src/usr/local/www/vendor/font-awesome/less/bordered-pulled.less
index f1c8ad7..f1c8ad7 100644
--- a/src/usr/local/www/font-awesome/less/bordered-pulled.less
+++ b/src/usr/local/www/vendor/font-awesome/less/bordered-pulled.less
diff --git a/src/usr/local/www/font-awesome/less/core.less b/src/usr/local/www/vendor/font-awesome/less/core.less
index c577ac8..c577ac8 100644
--- a/src/usr/local/www/font-awesome/less/core.less
+++ b/src/usr/local/www/vendor/font-awesome/less/core.less
diff --git a/src/usr/local/www/font-awesome/less/fixed-width.less b/src/usr/local/www/vendor/font-awesome/less/fixed-width.less
index 110289f..110289f 100644
--- a/src/usr/local/www/font-awesome/less/fixed-width.less
+++ b/src/usr/local/www/vendor/font-awesome/less/fixed-width.less
diff --git a/src/usr/local/www/font-awesome/less/font-awesome.less b/src/usr/local/www/vendor/font-awesome/less/font-awesome.less
index c35d3ee..c35d3ee 100644
--- a/src/usr/local/www/font-awesome/less/font-awesome.less
+++ b/src/usr/local/www/vendor/font-awesome/less/font-awesome.less
diff --git a/src/usr/local/www/font-awesome/less/icons.less b/src/usr/local/www/vendor/font-awesome/less/icons.less
index ca60abd..ca60abd 100644
--- a/src/usr/local/www/font-awesome/less/icons.less
+++ b/src/usr/local/www/vendor/font-awesome/less/icons.less
diff --git a/src/usr/local/www/font-awesome/less/larger.less b/src/usr/local/www/vendor/font-awesome/less/larger.less
index c9d6467..c9d6467 100644
--- a/src/usr/local/www/font-awesome/less/larger.less
+++ b/src/usr/local/www/vendor/font-awesome/less/larger.less
diff --git a/src/usr/local/www/font-awesome/less/list.less b/src/usr/local/www/vendor/font-awesome/less/list.less
index 0b44038..0b44038 100644
--- a/src/usr/local/www/font-awesome/less/list.less
+++ b/src/usr/local/www/vendor/font-awesome/less/list.less
diff --git a/src/usr/local/www/font-awesome/less/mixins.less b/src/usr/local/www/vendor/font-awesome/less/mixins.less
index d5a43a1..d5a43a1 100644
--- a/src/usr/local/www/font-awesome/less/mixins.less
+++ b/src/usr/local/www/vendor/font-awesome/less/mixins.less
diff --git a/src/usr/local/www/font-awesome/less/path.less b/src/usr/local/www/vendor/font-awesome/less/path.less
index 9211e66..9211e66 100644
--- a/src/usr/local/www/font-awesome/less/path.less
+++ b/src/usr/local/www/vendor/font-awesome/less/path.less
diff --git a/src/usr/local/www/font-awesome/less/rotated-flipped.less b/src/usr/local/www/vendor/font-awesome/less/rotated-flipped.less
index f6ba814..f6ba814 100644
--- a/src/usr/local/www/font-awesome/less/rotated-flipped.less
+++ b/src/usr/local/www/vendor/font-awesome/less/rotated-flipped.less
diff --git a/src/usr/local/www/font-awesome/less/stacked.less b/src/usr/local/www/vendor/font-awesome/less/stacked.less
index fc53fb0..fc53fb0 100644
--- a/src/usr/local/www/font-awesome/less/stacked.less
+++ b/src/usr/local/www/vendor/font-awesome/less/stacked.less
diff --git a/src/usr/local/www/font-awesome/less/variables.less b/src/usr/local/www/vendor/font-awesome/less/variables.less
index 37c4b80..37c4b80 100644
--- a/src/usr/local/www/font-awesome/less/variables.less
+++ b/src/usr/local/www/vendor/font-awesome/less/variables.less
diff --git a/src/usr/local/www/font-awesome/scss/_animated.scss b/src/usr/local/www/vendor/font-awesome/scss/_animated.scss
index 8a020db..8a020db 100644
--- a/src/usr/local/www/font-awesome/scss/_animated.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_animated.scss
diff --git a/src/usr/local/www/font-awesome/scss/_bordered-pulled.scss b/src/usr/local/www/vendor/font-awesome/scss/_bordered-pulled.scss
index d4b85a0..d4b85a0 100644
--- a/src/usr/local/www/font-awesome/scss/_bordered-pulled.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_bordered-pulled.scss
diff --git a/src/usr/local/www/font-awesome/scss/_core.scss b/src/usr/local/www/vendor/font-awesome/scss/_core.scss
index 7425ef8..7425ef8 100644
--- a/src/usr/local/www/font-awesome/scss/_core.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_core.scss
diff --git a/src/usr/local/www/font-awesome/scss/_fixed-width.scss b/src/usr/local/www/vendor/font-awesome/scss/_fixed-width.scss
index b221c98..b221c98 100644
--- a/src/usr/local/www/font-awesome/scss/_fixed-width.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_fixed-width.scss
diff --git a/src/usr/local/www/font-awesome/scss/_icons.scss b/src/usr/local/www/vendor/font-awesome/scss/_icons.scss
index 6f93759..6f93759 100644
--- a/src/usr/local/www/font-awesome/scss/_icons.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_icons.scss
diff --git a/src/usr/local/www/font-awesome/scss/_larger.scss b/src/usr/local/www/vendor/font-awesome/scss/_larger.scss
index 41e9a81..41e9a81 100644
--- a/src/usr/local/www/font-awesome/scss/_larger.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_larger.scss
diff --git a/src/usr/local/www/font-awesome/scss/_list.scss b/src/usr/local/www/vendor/font-awesome/scss/_list.scss
index 7d1e4d5..7d1e4d5 100644
--- a/src/usr/local/www/font-awesome/scss/_list.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_list.scss
diff --git a/src/usr/local/www/font-awesome/scss/_mixins.scss b/src/usr/local/www/vendor/font-awesome/scss/_mixins.scss
index f96719b..f96719b 100644
--- a/src/usr/local/www/font-awesome/scss/_mixins.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_mixins.scss
diff --git a/src/usr/local/www/font-awesome/scss/_path.scss b/src/usr/local/www/vendor/font-awesome/scss/_path.scss
index bb457c2..bb457c2 100644
--- a/src/usr/local/www/font-awesome/scss/_path.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_path.scss
diff --git a/src/usr/local/www/font-awesome/scss/_rotated-flipped.scss b/src/usr/local/www/vendor/font-awesome/scss/_rotated-flipped.scss
index a3558fd..a3558fd 100644
--- a/src/usr/local/www/font-awesome/scss/_rotated-flipped.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_rotated-flipped.scss
diff --git a/src/usr/local/www/font-awesome/scss/_stacked.scss b/src/usr/local/www/vendor/font-awesome/scss/_stacked.scss
index aef7403..aef7403 100644
--- a/src/usr/local/www/font-awesome/scss/_stacked.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_stacked.scss
diff --git a/src/usr/local/www/font-awesome/scss/_variables.scss b/src/usr/local/www/vendor/font-awesome/scss/_variables.scss
index 0a47110..0a47110 100644
--- a/src/usr/local/www/font-awesome/scss/_variables.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/_variables.scss
diff --git a/src/usr/local/www/font-awesome/scss/font-awesome.scss b/src/usr/local/www/vendor/font-awesome/scss/font-awesome.scss
index f4668a5..f4668a5 100644
--- a/src/usr/local/www/font-awesome/scss/font-awesome.scss
+++ b/src/usr/local/www/vendor/font-awesome/scss/font-awesome.scss
diff --git a/src/usr/local/www/jquery/jquery-1.12.0.min.js b/src/usr/local/www/vendor/jquery/jquery-1.12.0.min.js
index 6c60672..6c60672 100644
--- a/src/usr/local/www/jquery/jquery-1.12.0.min.js
+++ b/src/usr/local/www/vendor/jquery/jquery-1.12.0.min.js
diff --git a/src/usr/local/www/jquery/jquery-ui-1.11.4.min.js b/src/usr/local/www/vendor/jquery/jquery-ui-1.11.4.min.js
index 5824d12..5824d12 100644
--- a/src/usr/local/www/jquery/jquery-ui-1.11.4.min.js
+++ b/src/usr/local/www/vendor/jquery/jquery-ui-1.11.4.min.js
diff --git a/src/usr/local/www/sortable/LICENSE b/src/usr/local/www/vendor/sortable/LICENSE
index e19dfc9..e19dfc9 100644
--- a/src/usr/local/www/sortable/LICENSE
+++ b/src/usr/local/www/vendor/sortable/LICENSE
diff --git a/src/usr/local/www/sortable/sortable-theme-bootstrap.css b/src/usr/local/www/vendor/sortable/sortable-theme-bootstrap.css
index 99cf6c9..99cf6c9 100644
--- a/src/usr/local/www/sortable/sortable-theme-bootstrap.css
+++ b/src/usr/local/www/vendor/sortable/sortable-theme-bootstrap.css
diff --git a/src/usr/local/www/sortable/sortable.js b/src/usr/local/www/vendor/sortable/sortable.js
index 031d6f7..031d6f7 100644
--- a/src/usr/local/www/sortable/sortable.js
+++ b/src/usr/local/www/vendor/sortable/sortable.js