27 files changed, 2050 insertions, 1960 deletions

diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index f0db9880..2aec417c 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -616,10 +616,12 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress {
+
 	background-image: none;
 	background-color: #27666D;
 
 	.bar {
+
 		.box-shadow(none);
 		background-image: none;
 		background-color: @yellow;
@@ -644,7 +646,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-danger.progress-striped .bar {
-  #gradient > .striped(#AD1D28);
+	#gradient > .striped(#AD1D28);
 }
 
 .progress-success .bar {
@@ -653,7 +655,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-success.progress-striped .bar {
-  #gradient > .striped(@green);
+	#gradient > .striped(@green);
 }
 
 .progress-info .bar {
@@ -662,45 +664,47 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .progress-info.progress-striped .bar {
-  #gradient > .striped(@blue);
+	#gradient > .striped(@blue);
 }
 
 .modal {
-	.border-radius(0);
-}
-
-.modal-header {
-	background-color: @navbarBackground;
-	color: @white;
-}
 
-.modal-body {
-	
-	color: @grayDark;
+	.border-radius(0);
 
-	h1, h2, h3, h4, h5, h6,
-	legend {
-		color: @red;
+	&-header {
+		background-color: @navbarBackground;
+		color: @white;
 	}
 
-	label,
-	.input-file {
+	&-body {
+		
 		color: @grayDark;
-	}
 
-	.help-block,
-	.help-inline {
-		color: @grayLight;
-	}
+		h1, h2, h3, h4, h5, h6,
+		legend {
+			color: @red;
+		}
+
+		label,
+		.input-file {
+			color: @grayDark;
+		}
+
+		.help-block,
+		.help-inline {
+			color: @grayLight;
+		}
 
-	textarea,
-	input,
-	.uneditable-input {
-		border: 1px solid @grayLight;
+		textarea,
+		input,
+		.uneditable-input {
+			border: 1px solid @grayLight;
+		}
 	}
 }
 
 .popover {
+	
 	padding: 0;
 	.border-radius(0);
 	color: @grayDark;
@@ -709,4 +713,7 @@ input, textarea, .search-query, .uneditable-input,
 		.border-radius(0);
 		color: @white;
 	}
-}
\ No newline at end of file
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less
index 8c6fb019..837d8b8c 100755
--- a/cerulean/bootswatch.less
+++ b/cerulean/bootswatch.less
@@ -3,11 +3,14 @@
 // Version: 2.1.0
 // -----------------------------------------------------
 
-// IMPORTS
+// TYPOGRAPHY
 // -----------------------------------------------------
 
 @import url(https://fonts.googleapis.com/css?family=Telex);
 
+// SCAFFOLDING
+// -----------------------------------------------------
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -111,6 +114,9 @@ div.subnav {
 	}
 }
 
+// NAV
+// -----------------------------------------------------
+
 // BUTTONS
 // -----------------------------------------------------
 
@@ -148,10 +154,24 @@ div.subnav {
   .buttonBackground(lighten(@btnInverseBackground, 5%), @btnInverseBackground);
 }
 
-// ICONS
+// TABLES
+// -----------------------------------------------------
+
+// FORMS
+// -----------------------------------------------------
+
+// DROPDOWNS
+// -----------------------------------------------------
+
+// ALERTS, LABELS, BADGES
+// -----------------------------------------------------
+
+// MISC
 // -----------------------------------------------------
 
-// Make icons gray
 i[class^="icon-"]{
 	opacity: 0.8;
 }
+
+// MEDIA QUERIES
+// -----------------------------------------------------
diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
index a31b1b1a..c398ae03 100644
--- a/cyborg/bootstrap.css
+++ b/cyborg/bootstrap.css
@@ -4759,8 +4759,15 @@ textarea,
   font-family: 'Droid Sans', sans-serif;
   color: #999999;
 }
-.jumbotron h1 {
-  font-weight: normal !important;
+code,
+pre {
+  background-color: #eeeeee;
+}
+blockquote {
+  border-left: 5px solid #33b5e5;
+}
+blockquote.pull-right {
+  border-right: 5px solid #33b5e5;
 }
 html {
   min-height: 100%;
@@ -4891,15 +4898,6 @@ body {
 .navbar-inverse .nav .active > a {
   border-bottom-color: transparent;
 }
-.dropdown-menu {
-  background-color: #191A1A;
-  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
-  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
-}
-.dropdown-menu li > a:hover {
-  background-color: #33b5e5;
-}
 div.subnav {
   position: static;
   background-color: #020202;
@@ -4943,32 +4941,6 @@ div.subnav .nav .open .dropdown-menu li > a:hover {
   border-bottom: 0;
   background: #33b5e5;
 }
-@media (max-width: 768px) {
-  div.subnav .nav > li + li > a,
-  div.subnav .nav > li:first-child > a {
-    border-top: 1px solid #222;
-    border-left: 1px solid #222;
-  }
-  .subnav .nav > li + li > a:hover,
-  .subnav .nav > li:first-child > a:hover {
-    border-bottom: 0;
-    background-color: #33b5e5;
-  }
-}
-.nav-list li > a {
-  text-shadow: none;
-}
-.nav-list li > a:hover {
-  background-color: #33b5e5;
-  color: #ffffff;
-}
-.nav-list .nav-header {
-  text-shadow: none;
-}
-.nav-list .divider {
-  background-color: transparent;
-  border-bottom: 1px solid #222;
-}
 .nav-tabs {
   border-bottom: 1px solid #222;
 }
@@ -4996,6 +4968,20 @@ div.subnav .nav .open .dropdown-menu li > a:hover {
 .nav-pills .dropdown-menu li > a:hover {
   border: none;
 }
+.nav-list li > a {
+  text-shadow: none;
+}
+.nav-list li > a:hover {
+  background-color: #33b5e5;
+  color: #ffffff;
+}
+.nav-list .nav-header {
+  text-shadow: none;
+}
+.nav-list .divider {
+  background-color: transparent;
+  border-bottom: 1px solid #222;
+}
 .nav-stacked li > a {
   border: 1px solid #222 !important;
 }
@@ -5295,6 +5281,9 @@ input,
 textarea,
 select {
   border-width: 2px;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
 }
 legend,
 label {
@@ -5341,26 +5330,6 @@ select:focus {
 .form-actions {
   border-top: 1px solid #222;
 }
-.modal {
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-  border-top: solid 1px #353535;
-  background-color: #282828;
-}
-.modal-header {
-  border-bottom: 1px solid #222;
-}
-.modal-footer {
-  background-color: #282828;
-  border-top: 1px solid #222;
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
 .table {
   -webkit-border-radius: 1px;
   -moz-border-radius: 1px;
@@ -5378,42 +5347,28 @@ select:focus {
   background-color: #33b5e5;
   color: #ffffff;
 }
-.well,
-.hero-unit,
-.prettyprint,
-input,
-textarea,
-select {
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-}
-code,
-pre {
-  background-color: #eeeeee;
-}
-.well,
-.hero-unit {
-  border-top: solid 1px #353535;
+.dropdown-menu {
+  background-color: #191A1A;
   -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
   -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
 }
-blockquote {
-  border-left: 5px solid #33b5e5;
-}
-blockquote.pull-right {
-  border-right: 5px solid #33b5e5;
-}
-.thumbnail {
-  border-color: #222;
+.dropdown-menu li > a:hover {
+  background-color: #33b5e5;
 }
-.progress {
-  background-color: #060606;
-  background-image: none;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
+.alert,
+.alert .alert-heading,
+.alert-success,
+.alert-success .alert-heading,
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading,
+.alert-info,
+.alert-info .alert-heading {
+  color: #eeeeee;
+  text-shadow: none;
+  border: none;
 }
 .label {
   color: #eeeeee;
@@ -5453,23 +5408,64 @@ blockquote.pull-right {
 .label-info:hover {
   background-color: #004d66;
 }
-.alert,
-.alert .alert-heading,
-.alert-success,
-.alert-success .alert-heading,
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading,
-.alert-info,
-.alert-info .alert-heading {
-  color: #eeeeee;
-  text-shadow: none;
-  border: none;
+.well,
+.hero-unit {
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
 }
-footer.footer {
+.well,
+.hero-unit {
+  border-top: solid 1px #353535;
+  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
+  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8);
+}
+.thumbnail {
+  border-color: #222;
+}
+.progress {
+  background-color: #060606;
+  background-image: none;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.modal {
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
+  border-top: solid 1px #353535;
+  background-color: #282828;
+}
+.modal-header {
+  border-bottom: 1px solid #222;
+}
+.modal-footer {
+  background-color: #282828;
+  border-top: 1px solid #222;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.footer {
   border-top: 1px solid #222;
 }
+@media (max-width: 768px) {
+  div.subnav .nav > li + li > a,
+  div.subnav .nav > li:first-child > a {
+    border-top: 1px solid #222;
+    border-left: 1px solid #222;
+  }
+  .subnav .nav > li + li > a:hover,
+  .subnav .nav > li:first-child > a:hover {
+    border-bottom: 0;
+    background-color: #33b5e5;
+  }
+}
 .pull-right {
   float: right;
 }
diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
index 1724023b..e9b2b399 100644
--- a/cyborg/bootstrap.min.css
+++ b/cyborg/bootstrap.min.css
@@ -802,7 +802,8 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .invisible{visibility:hidden;}
 .affix{position:fixed;}
 label,input,button,select,textarea,.navbar .search-query:-moz-placeholder,.navbar .search-query::-webkit-input-placeholder{font-family:'Droid Sans',sans-serif;color:#999999;}
-.jumbotron h1{font-weight:normal !important;}
+code,pre{background-color:#eeeeee;}
+blockquote{border-left:5px solid #33b5e5;}blockquote.pull-right{border-right:5px solid #33b5e5;}
 html{min-height:100%;}
 body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradient(top, #060606, #252a30);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#060606), to(#252a30));background-image:-webkit-linear-gradient(top, #060606, #252a30);background-image:-o-linear-gradient(top, #060606, #252a30);background-image:linear-gradient(to bottom, #060606, #252a30);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff060606', endColorstr='#ff252a30', GradientType=0);}
 .page-header{border-bottom:2px solid #33b5e5;}
@@ -826,24 +827,22 @@ body{min-height:100%;background-color:#121417;background-image:-moz-linear-gradi
 .navbar-inverse .brand:hover{border-bottom:none;background-color:#000000;}
 .navbar-inverse .nav li>a:hover{border-bottom-color:transparent;}
 .navbar-inverse .nav .active>a{border-bottom-color:transparent;}
-.dropdown-menu{background-color:#191A1A;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
-.dropdown-menu li>a:hover{background-color:#33b5e5;}
 div.subnav{position:static;background-color:#020202;background-image:none;border:0;}div.subnav.subnav-fixed{position:relative;left:-1px;top:auto;}
 div.subnav .nav>li>a,div.subnav .nav .active a{background-color:#020202;border-left:1px solid #222;border-right:0;color:#eeeeee;}
 div.subnav .nav li.nav-header{text-shadow:none;}
 div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:first-child>a:hover{background:transparent;border-bottom:2px solid #33b5e5;border-left:1px solid #222;color:#ffffff;}
 div.subnav .nav .open .dropdown-toggle{border:0;border-left:1px solid #222;border-bottom:2px solid #33b5e5;background-color:#060606;}
 div.subnav .nav .open .dropdown-menu{background-color:#020202;border-left:solid 1px rgba(255, 255, 255, 0.1);}div.subnav .nav .open .dropdown-menu li>a:hover{border-bottom:0;background:#33b5e5;}
-@media (max-width:768px){div.subnav .nav>li+li>a,div.subnav .nav>li:first-child>a{border-top:1px solid #222;border-left:1px solid #222;} .subnav .nav>li+li>a:hover,.subnav .nav>li:first-child>a:hover{border-bottom:0;background-color:#33b5e5;}}.nav-list li>a{text-shadow:none;}
-.nav-list li>a:hover{background-color:#33b5e5;color:#ffffff;}
-.nav-list .nav-header{text-shadow:none;}
-.nav-list .divider{background-color:transparent;border-bottom:1px solid #222;}
 .nav-tabs{border-bottom:1px solid #222;}.nav-tabs li>a:hover,.nav-tabs li.active>a,.nav-tabs li.active>a:hover{border:1px solid #222;background-color:#33b5e5;color:#ffffff;}
 .nav-tabs .open .dropdown-toggle{background-color:#060606 !important;border:1px solid #222;}
 .nav-tabs .dropdown-menu li>a:hover{border:none;}
 .nav-pills li>a:hover{background-color:#33b5e5;color:#ffffff;}
 .nav-pills .open .dropdown-toggle{background-color:#060606;}
 .nav-pills .dropdown-menu li>a:hover{border:none;}
+.nav-list li>a{text-shadow:none;}
+.nav-list li>a:hover{background-color:#33b5e5;color:#ffffff;}
+.nav-list .nav-header{text-shadow:none;}
+.nav-list .divider{background-color:transparent;border-bottom:1px solid #222;}
 .nav-stacked li>a{border:1px solid #222 !important;}
 .nav-stacked li>a:hover,.nav-stacked li.active>a{background-color:#33b5e5;color:#ffffff;}
 .tabbable .nav-tabs,.tabbable .nav-tabs li.active>a{border-color:#222;}
@@ -873,25 +872,19 @@ div.subnav .nav .open .dropdown-menu{background-color:#020202;border-left:solid
 .btn .caret{border-top:4px solid black;opacity:0.3;}
 .btn-group>.dropdown-menu>li>a:hover{border-bottom:0;}
 .btn.disabled,.btn[disabled]{background-color:#adafae;}
-input,textarea,select{border-width:2px;}
+input,textarea,select{border-width:2px;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}
 legend,label{color:#999999;border-bottom:0px solid #222;}
 input,textarea,select,.uneditable-input{color:#282828;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly],.uneditable-input{background-color:#555;border-color:#444;}
 input:focus,textarea:focus,input.focused,textarea.focused{border-color:#52a8ec;outline:0;outline:thin dotted \9;}
 input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
 .form-actions{border-top:1px solid #222;}
-.modal{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;border-top:solid 1px #353535;background-color:#282828;}
-.modal-header{border-bottom:1px solid #222;}
-.modal-footer{background-color:#282828;border-top:1px solid #222;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .table{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}.table tbody tr.success td{background-color:#669900;color:#ffffff;}
 .table tbody tr.error td{background-color:#cc0000;color:#ffffff;}
 .table tbody tr.info td{background-color:#33b5e5;color:#ffffff;}
-.well,.hero-unit,.prettyprint,input,textarea,select{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}
-code,pre{background-color:#eeeeee;}
-.well,.hero-unit{border-top:solid 1px #353535;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
-blockquote{border-left:5px solid #33b5e5;}blockquote.pull-right{border-right:5px solid #33b5e5;}
-.thumbnail{border-color:#222;}
-.progress{background-color:#060606;background-image:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.dropdown-menu{background-color:#191A1A;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
+.dropdown-menu li>a:hover{background-color:#33b5e5;}
+.alert,.alert .alert-heading,.alert-success,.alert-success .alert-heading,.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading,.alert-info,.alert-info .alert-heading{color:#eeeeee;text-shadow:none;border:none;}
 .label{color:#eeeeee;}
 .label,.alert{background-color:#666666;}
 .label:hover{background-color:#4d4d4d;}
@@ -903,9 +896,15 @@ blockquote{border-left:5px solid #33b5e5;}blockquote.pull-right{border-right:5px
 .label-success:hover{background-color:#3a5700;}
 .label-info,.alert-info{background-color:#007399;}
 .label-info:hover{background-color:#004d66;}
-.alert,.alert .alert-heading,.alert-success,.alert-success .alert-heading,.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading,.alert-info,.alert-info .alert-heading{color:#eeeeee;text-shadow:none;border:none;}
-footer.footer{border-top:1px solid #222;}
-.pull-right{float:right;}
+.well,.hero-unit{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;}
+.well,.hero-unit{border-top:solid 1px #353535;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);}
+.thumbnail{border-color:#222;}
+.progress{background-color:#060606;background-image:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.modal{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;border-top:solid 1px #353535;background-color:#282828;}
+.modal-header{border-bottom:1px solid #222;}
+.modal-footer{background-color:#282828;border-top:1px solid #222;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.footer{border-top:1px solid #222;}
+@media (max-width:768px){div.subnav .nav>li+li>a,div.subnav .nav>li:first-child>a{border-top:1px solid #222;border-left:1px solid #222;} .subnav .nav>li+li>a:hover,.subnav .nav>li:first-child>a:hover{border-bottom:0;background-color:#33b5e5;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
index 419d5072..1bfc1faa 100755
--- a/cyborg/bootswatch.less
+++ b/cyborg/bootswatch.less
@@ -15,8 +15,16 @@ label, input, button, select, textarea,
 	color: @gray;
 }
 
-.jumbotron h1 {
-	font-weight: normal !important;
+code, pre {
+	background-color: @grayLighter;
+}
+
+blockquote {
+	border-left: 5px solid @blue;
+
+	&.pull-right {
+		border-right: 5px solid @blue;
+	}
 }
 
 // SCAFFOLDING
@@ -156,17 +164,6 @@ body {
 	}
 }
 
-.dropdown-menu {
-	background-color: #191A1A;
-	// border-left: solid 1px rgba(255, 255, 255, 0.1);
-	.box-shadow(0 2px 4px rgba(0, 0, 0, 0.8));
-}
-
-.dropdown-menu li > a:hover {
-	background-color: @blue;
-	// border-bottom: 3px solid transparent;
-}
-
 div.subnav {
 	position: static;
 	background-color: @grayDarker;
@@ -219,44 +216,9 @@ div.subnav {
 	}
 }
 
-@media (max-width: 768px) {
-	div.subnav .nav > li + li > a,
-	div.subnav .nav > li:first-child > a {
-		border-top: 1px solid #222;
-		border-left: 1px solid #222;
-	}
-
-	.subnav .nav > li + li > a:hover,
-	.subnav .nav > li:first-child > a:hover {
-			border-bottom: 0;
-			background-color: @blue;
-	}
-}
-
-// NAVIGATION
+// NAV
 // -----------------------------------------------------
 
-.nav-list {
-
-	li > a {
-		text-shadow: none;
-	}
-
-	li > a:hover {
-		background-color: @blue;
-		color: @white;
-	}
-
-	.nav-header {
-		text-shadow: none;
-	}
-
-	.divider {
-		background-color: transparent;
-		border-bottom: 1px solid #222;
-	}
-}
-
 .nav-tabs {
 
 	border-bottom: 1px solid #222;
@@ -295,6 +257,27 @@ div.subnav {
 	}
 }
 
+.nav-list {
+
+	li > a {
+		text-shadow: none;
+	}
+
+	li > a:hover {
+		background-color: @blue;
+		color: @white;
+	}
+
+	.nav-header {
+		text-shadow: none;
+	}
+
+	.divider {
+		background-color: transparent;
+		border-bottom: 1px solid #222;
+	}
+}
+
 .nav-stacked {
 
 	li > a {
@@ -429,6 +412,7 @@ div.subnav {
 
 input, textarea, select {
 	border-width: 2px;
+	.border-radius(1px);
 }
 
 legend, label {
@@ -466,27 +450,7 @@ select:focus {
 	border-top: 1px solid #222;
 }
 
-// MODALS
-// -----------------------------------------------------
-
-.modal {
- 	.border-radius(1px);
-	border-top: solid 1px lighten(@grayDark, 5%);
-	background-color: @grayDark;
-}
-
-.modal-header {
-	border-bottom: 1px solid #222;
-}
-
-.modal-footer {
-	background-color: @grayDark;
-	border-top: 1px solid #222;
-	.border-radius(0 0 6px 6px);
-	.box-shadow(none);
-}
-
-// MISCELLANEOUS
+// TABLES
 // -----------------------------------------------------
 
 .table {
@@ -507,41 +471,36 @@ select:focus {
 		background-color: @blue;
 		color: @white;
 	}
-
-
 }
 
+// DROPDOWNS
+// -----------------------------------------------------
 
-
-.well, .hero-unit, .prettyprint, input, textarea, select {
-	.border-radius(1px);
-}
-
-code, pre {
-	background-color: @grayLighter;
-}
-
-.well, .hero-unit {
-	border-top: solid 1px lighten(@grayDark, 5%);
-	.box-shadow(0 2px 4px rgba(0,0,0,.8));
+.dropdown-menu {
+	background-color: #191A1A;
+	.box-shadow(0 2px 4px rgba(0, 0, 0, 0.8));
 }
 
-blockquote {
-	border-left: 5px solid @blue;
-
-	&.pull-right {
-		border-right: 5px solid @blue;
-	}
+.dropdown-menu li > a:hover {
+	background-color: @blue;
 }
 
-.thumbnail {
-	border-color: #222;
-}
+// ALERTS, LABELS, BADGES
+// -----------------------------------------------------
 
-.progress {
-	background-color: #060606;
-	background-image: none;
-	.border-radius(0);
+.alert,
+.alert .alert-heading,
+.alert-success,
+.alert-success .alert-heading,
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading,
+.alert-info,
+.alert-info .alert-heading {
+  color: @grayLighter;
+  text-shadow: none;
+  border: none;
 }
 
 .label {
@@ -552,7 +511,8 @@ blockquote {
 
 .label:hover { background-color: darken(@gray, 30%); }
 
-.label-important, .alert-danger,
+.label-important,
+.alert-danger,
 .alert-error { background-color: @red; }
 
 .label-important:hover { background-color: darken(@red, 10%); }
@@ -569,21 +529,62 @@ blockquote {
 
 .label-info:hover { background-color: darken(@blueDark, 20%); }
 
-.alert,
-.alert .alert-heading,
-.alert-success,
-.alert-success .alert-heading,
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading,
-.alert-info,
-.alert-info .alert-heading {
-  color: @grayLighter;
-  text-shadow: none;
-  border: none;
+// MISC
+// -----------------------------------------------------
+
+.well, .hero-unit {
+	.border-radius(1px);
+}
+
+.well, .hero-unit {
+	border-top: solid 1px lighten(@grayDark, 5%);
+	.box-shadow(0 2px 4px rgba(0,0,0,.8));
+}
+
+.thumbnail {
+	border-color: #222;
+}
+
+.progress {
+	background-color: #060606;
+	background-image: none;
+	.border-radius(0);
 }
 
-footer.footer {
+.modal {
+ 	.border-radius(1px);
+	border-top: solid 1px lighten(@grayDark, 5%);
+	background-color: @grayDark;
+}
+
+.modal-header {
+	border-bottom: 1px solid #222;
+}
+
+.modal-footer {
+	background-color: @grayDark;
 	border-top: 1px solid #222;
+	.border-radius(0 0 6px 6px);
+	.box-shadow(none);
+}
+
+.footer {
+	border-top: 1px solid #222;
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
+
+@media (max-width: 768px) {
+	div.subnav .nav > li + li > a,
+	div.subnav .nav > li:first-child > a {
+		border-top: 1px solid #222;
+		border-left: 1px solid #222;
+	}
+
+	.subnav .nav > li + li > a:hover,
+	.subnav .nav > li:first-child > a:hover {
+			border-bottom: 0;
+			background-color: @blue;
+	}
 }
diff --git a/journal/bootstrap.css b/journal/bootstrap.css
index b41e324b..78c27abe 100644
--- a/journal/bootstrap.css
+++ b/journal/bootstrap.css
@@ -4780,10 +4780,6 @@ h4 {
 h5 {
   font-size: 13px;
 }
-h6 {
-  color: #000000;
-  font-weight: bold;
-}
 p > a,
 address > a,
 .breadcrumb a,
@@ -4798,15 +4794,27 @@ abbr[title]:hover {
   text-decoration: none;
   border-bottom: 1px solid;
 }
+code,
+pre {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  background-color: #eeeeee;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
 .page-header {
   border-bottom: 2px solid #eeeeee;
 }
+hr {
+  border-bottom: 1px solid #eeeeee;
+}
 .navbar {
   font-family: "News Cycle", "Arial Narrow Bold", sans-serif;
   font-weight: bold;
 }
 .navbar .navbar-inner {
-  border-top: 2px solid #eeeeee;
   border-bottom: 2px solid #eeeeee;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
@@ -4980,37 +4988,19 @@ div.subnav li.dropdown.open .dropdown-toggle:hover {
 .btn-inverse.active {
   background-color: #000000 \9;
 }
-.modal {
-  -webkit-border-radius: 0px;
-  -moz-border-radius: 0px;
-  border-radius: 0px;
-  background: #ffffff;
-}
-.modal-header {
-  border-bottom: none;
-}
-.modal-footer {
-  background: transparent;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  border-top: none;
-}
-.close,
-.close:hover {
-  border-bottom: none;
-}
-.hero-unit {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  border: 1px solid rgba(0, 0, 0, 0.05);
+.table-bordered {
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
 }
-.hero-unit h1 {
-  line-height: 1.5em;
+legend {
+  border-bottom: 2px solid #eeeeee;
+  font-family: "News Cycle", "Arial Narrow Bold", sans-serif;
+  font-weight: bold;
+  color: #000000;
 }
 .well {
   -webkit-border-radius: 0;
@@ -5020,7 +5010,8 @@ div.subnav li.dropdown.open .dropdown-toggle:hover {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.table-bordered {
+.hero-unit {
+  border: 1px solid rgba(0, 0, 0, 0.05);
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
@@ -5028,31 +5019,28 @@ div.subnav li.dropdown.open .dropdown-toggle:hover {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-legend {
-  border-bottom: 2px solid #eeeeee;
-  font-family: "News Cycle", "Arial Narrow Bold", sans-serif;
-  font-weight: bold;
-  color: #000000;
+.hero-unit h1 {
+  line-height: 1.5em;
 }
-a.thumbnail:hover {
-  -webkit-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3);
-  border-color: #ddd;
+.modal {
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  border-radius: 0px;
+  background: #ffffff;
 }
-code,
-pre,
-pre.prettyprint {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-  background-color: #eeeeee;
+.modal-header {
+  border-bottom: none;
+}
+.modal-footer {
+  border-top: none;
+  background: transparent;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
 }
-hr {
-  border-bottom: 1px solid #eeeeee;
+.close,
+.close:hover {
+  border-bottom: none;
 }
 @media (max-width: 768px) {
   div.subnav {
diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
index 88e96ac8..a2a8cbef 100644
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.css
@@ -807,10 +807,11 @@ h2{font-size:36px;}
 h3{font-size:28px;}
 h4{font-size:20px;}
 h5{font-size:13px;}
-h6{color:#000000;font-weight:bold;}
 p>a,address>a,.breadcrumb a,abbr[title]{text-decoration:none;border-bottom:1px dotted;}p>a:hover,address>a:hover,.breadcrumb a:hover,abbr[title]:hover{text-decoration:none;border-bottom:1px solid;}
+code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#eeeeee;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .page-header{border-bottom:2px solid #eeeeee;}
-.navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+hr{border-bottom:1px solid #eeeeee;}
+.navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar .brand{padding:16px 20px 20px;font-size:24px;font-weight:bold;text-shadow:none;text-transform:uppercase;}
 .navbar .nav>li>a{padding:20px 10px 21px;font-size:18px;text-shadow:none;text-transform:uppercase;}
 .navbar .nav>li.active>a{background-color:transparent;color:#000000;}
@@ -831,17 +832,14 @@ div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdo
 [class^="icon-"],[class*=" icon-"]{vertical-align:baseline;}
 .btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#141414;background-image:-moz-linear-gradient(top, #222222, #000000);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#000000));background-image:-webkit-linear-gradient(top, #222222, #000000);background-image:-o-linear-gradient(top, #222222, #000000);background-image:linear-gradient(to bottom, #222222, #000000);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff000000', GradientType=0);border-color:#000000 #000000 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#000000;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#000000;*background-color:#000000;}
 .btn-inverse:active,.btn-inverse.active{background-color:#000000 \9;}
+.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;color:#000000;}
+.well{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.hero-unit h1{line-height:1.5em;}
 .modal{-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;background:#ffffff;}
 .modal-header{border-bottom:none;}
-.modal-footer{background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-top:none;}
+.modal-footer{border-top:none;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .close,.close:hover{border-bottom:none;}
-.hero-unit{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.hero-unit h1{line-height:1.5em;}
-.well{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;color:#000000;}
-a.thumbnail:hover{-webkit-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);border-color:#ddd;}
-code,pre,pre.prettyprint{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#eeeeee;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-hr{border-bottom:1px solid #eeeeee;}
 @media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/journal/bootswatch.less b/journal/bootswatch.less
index 2e35a2e7..3793d709 100755
--- a/journal/bootswatch.less
+++ b/journal/bootswatch.less
@@ -9,6 +9,7 @@
 @import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700');
 
 h1, h2, h3, h4, h5, h6 {
+
 	line-height: 1.5em;
 
 	a {
@@ -16,33 +17,15 @@ h1, h2, h3, h4, h5, h6 {
 	}
 }
 
-h1 {
-	font-size: 48px;
-}
-
-h2 {
-	font-size: 36px;
-}
-
-h3 {
-	font-size: 28px;
-}
+h1 { font-size: 48px; }
 
-h4 {
-	font-size: 20px;
-}
+h2 { font-size: 36px; }
 
-h5 {
-	font-size: 13px;
-}
+h3 { font-size: 28px; }
 
-h6 {
-	color: @black;
-	font-weight: bold;
-}
+h4 { font-size: 20px; }
 
-// SCAFFOLDING
-// -----------------------------------------------------
+h5 { font-size: 13px; }
 
 p > a,
 address > a,
@@ -57,10 +40,23 @@ abbr[title] {
 	}
 }
 
+code, pre {
+	.border-radius(0);
+	background-color: @grayLighter;
+	.box-shadow(none);
+}
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
 .page-header {
 	border-bottom: 2px solid @grayLighter;
 }
 
+hr {
+	border-bottom: 1px solid @grayLighter;
+}
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -70,7 +66,6 @@ abbr[title] {
 	font-weight: bold;
 
 	.navbar-inner {
-		border-top: 2px solid @grayLighter;
 		border-bottom: 2px solid @grayLighter;
 		.border-radius(0);
 		.box-shadow(none);
@@ -206,6 +201,9 @@ div.subnav {
 	}
 }
 
+// NAV
+// -----------------------------------------------------
+
 // BUTTONS
 // -----------------------------------------------------
 
@@ -217,79 +215,77 @@ div.subnav {
 	.buttonBackground(@grayDarker, @black);
 }
 
-// MODALS
+// TABLES
 // -----------------------------------------------------
 
-.modal {
- 	.border-radius(0px);
-	background: @bodyBackground;
+.table-bordered {
+	.border-radius(0);
+	.box-shadow(none);
 }
 
-.modal-header {
-	border-bottom: none;
-}
+// FORMS
+// -----------------------------------------------------
 
-.modal-footer {
-	background: transparent;
-	.box-shadow(none);
-	border-top: none;
+legend {
+	border-bottom: 2px solid @grayLighter;
+	font-family: @headingsFontFamily;
+	font-weight: @headingsFontWeight;
+	color: @headingsColor;
 }
 
-.close,
-.close:hover {
-	border-bottom: none;
-}
+// DROPDOWNS
+// -----------------------------------------------------
 
 // MISC
 // -----------------------------------------------------
 
-.hero-unit {
-	.box-shadow(none);
-	border: 1px solid rgba(0,0,0,.05);
-	.border-radius(0);
-
-	h1 {
-		line-height: 1.5em;
-	}
-}
-
 .well {
 	.border-radius(0);
 	.box-shadow(none);
-
 }
 
-.table-bordered {
+.hero-unit {
+	border: 1px solid rgba(0,0,0,.05);
 	.border-radius(0);
 	.box-shadow(none);
+
+	h1 {
+		line-height: 1.5em;
+	}
 }
 
+// a.thumbnail:hover {
+// 	.box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3));
+// 	border-color: #ddd;
+// }
 
-legend {
-	border-bottom: 2px solid @grayLighter;
-	font-family: @headingsFontFamily;
-	font-weight: @headingsFontWeight;
-	color: @headingsColor;
+.modal {
+ 	.border-radius(0px);
+	background: @bodyBackground;
 }
 
-a.thumbnail:hover {
-	.box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3));
-	border-color: #ddd;
+.modal-header {
+	border-bottom: none;
 }
 
-code, pre, pre.prettyprint {
-	.border-radius(0);
-	background-color: @grayLighter;
+.modal-footer {
+	border-top: none;
+	background: transparent;
 	.box-shadow(none);
 }
 
-hr {
-	border-bottom: 1px solid @grayLighter;
+.close,
+.close:hover {
+	border-bottom: none;
 }
 
+// MEDIA QUERIES
+// -----------------------------------------------------
+
 @media (max-width: 768px) {
 
 	div.subnav {
+
 		height: auto;
 
 		.nav > li.active > a {
diff --git a/readable/bootstrap.css b/readable/bootstrap.css
index d5e8e1f3..5d2241f5 100644
--- a/readable/bootstrap.css
+++ b/readable/bootstrap.css
@@ -4760,12 +4760,26 @@ h2 {
 h3 {
   font-size: 1.5em;
 }
-h6 {
-  color: #282828;
-}
 small {
   font-size: 13px;
 }
+blockquote {
+  border-left: 6px solid #cdcdcd;
+}
+blockquote.pull-right {
+  border-right: 6px solid #cdcdcd;
+}
+blockquote p {
+  font-size: 1em;
+  line-height: 1.2em;
+}
+code,
+pre {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  background-color: #ffffff;
+}
 .muted,
 .help-block,
 .uneditable-input,
@@ -4879,18 +4893,6 @@ div.subnav .nav > li:active > a:hover {
 div.subnav-fixed {
   top: 50px;
 }
-.dropdown-menu {
-  border: 1px solid #D4D4D4;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-}
-.dropdown-menu .divider {
-  margin: 5px 1px;
-}
 .nav .dropdown .caret {
   opacity: 1;
 }
@@ -5046,6 +5048,23 @@ div.subnav-fixed {
 .btn .caret {
   margin-top: 13px;
 }
+.table-bordered {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
 input,
 button,
 select,
@@ -5066,34 +5085,17 @@ input[type="file"] {
   border-top: 1px solid #D4D4D4;
   padding-top: 2em;
 }
-.table-bordered {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.table-bordered thead:last-child tr:last-child th:first-child,
-.table-bordered tbody:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.modal {
-  background-color: #ffffff;
+.dropdown-menu {
+  border: 1px solid #D4D4D4;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
 }
-.modal-header {
-  border-bottom: none;
-}
-.modal-footer {
-  background-color: #fafdfa;
+.dropdown-menu .divider {
+  margin: 5px 1px;
 }
 .alert,
 .label,
@@ -5142,16 +5144,6 @@ input[type="file"] {
   -moz-border-radius: 0;
   border-radius: 0;
 }
-blockquote {
-  border-left: 6px solid #cdcdcd;
-}
-blockquote.pull-right {
-  border-right: 6px solid #cdcdcd;
-}
-blockquote p {
-  font-size: 1em;
-  line-height: 1.2em;
-}
 .thumbnail {
   background-color: #ffffff;
 }
@@ -5164,12 +5156,17 @@ blockquote p {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-code,
-pre {
+.modal {
+  background-color: #ffffff;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
-  background-color: #ffffff;
+}
+.modal-header {
+  border-bottom: none;
+}
+.modal-footer {
+  background-color: #fafdfa;
 }
 .pull-right {
   float: right;
diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css
index 05e9438c..9f6d3e6c 100644
--- a/readable/bootstrap.min.css
+++ b/readable/bootstrap.min.css
@@ -804,8 +804,10 @@ body{word-spacing:-0.05em;}
 h1{font-size:2.5em;}
 h2{font-size:2em;}
 h3{font-size:1.5em;}
-h6{color:#282828;}
 small{font-size:13px;}
+blockquote{border-left:6px solid #cdcdcd;}blockquote.pull-right{border-right:6px solid #cdcdcd;}
+blockquote p{font-size:1em;line-height:1.2em;}
+code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;}
 .muted,.help-block,.uneditable-input,blockquote,small{color:#999999;}
 .page-header{border-bottom:2px solid #cdcdcd;}
 .navbar .brand{font-weight:bold;line-height:1em;padding:15px 15px 7px;}.navbar .brand:hover{color:#c50001;}
@@ -826,7 +828,6 @@ div.subnav{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-
 div.subnav .nav>li.active>a,div.subnav .nav>li:active>a{color:#9c0001;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;}
 div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .nav>li:active>a:hover{background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#c50001;}
 div.subnav-fixed{top:50px;}
-.dropdown-menu{border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);}.dropdown-menu .divider{margin:5px 1px;}
 .nav .dropdown .caret{opacity:1;}
 .nav-tabs li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .nav-tabs li>a:hover{background-color:#fafdfa;}
@@ -857,16 +858,14 @@ div.subnav-fixed{top:50px;}
 .btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:6px;margin-right:2px;}
 .btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:3px;}
 .btn .caret{margin-top:13px;}
+.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 input,button,select,textarea{font-family:Palatino,Georgia,"Times New Roman",Times,serif;}
 input,textarea,select{color:#282828;}
 select,input[type="file"]{height:auto;line-height:normal;}
 .form-actions{border-top:1px solid #D4D4D4;padding-top:2em;}
-.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.modal{background-color:#ffffff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.modal-header{border-bottom:none;}
-.modal-footer{background-color:#fafdfa;}
+.dropdown-menu{border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);}.dropdown-menu .divider{margin:5px 1px;}
 .alert,.label,.label:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:1px solid #D4D4D4;color:#282828;text-shadow:none;}
 .alert-heading{color:#282828;text-shadow:none;}
 .label,.label:hover{background-color:#ffffff;font-weight:normal;font-size:16px;padding:4px;}
@@ -875,11 +874,11 @@ select,input[type="file"]{height:auto;line-height:normal;}
 .label-success,.label-success:hover{background-color:#dff0d8;}
 .label-info,.label-info:hover{background-color:#d9edf7;}
 .well,.hero-unit{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-blockquote{border-left:6px solid #cdcdcd;}blockquote.pull-right{border-right:6px solid #cdcdcd;}
-blockquote p{font-size:1em;line-height:1.2em;}
 .thumbnail{background-color:#ffffff;}
 .thumbnail,.thumbnail>img{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;}
+.modal{background-color:#ffffff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.modal-header{border-bottom:none;}
+.modal-footer{background-color:#fafdfa;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/readable/bootswatch.less b/readable/bootswatch.less
index 85db1702..c09047f6 100755
--- a/readable/bootswatch.less
+++ b/readable/bootswatch.less
@@ -10,24 +10,33 @@ body {
 	word-spacing: -0.05em;
 }
 
-h1 {
-	font-size: 2.5em;
-}
+h1 { font-size: 2.5em; }
 
-h2 {
-	font-size: 2em;
-}
+h2 { font-size: 2em; }
 
-h3 {
-	font-size: 1.5em;
+h3 { font-size: 1.5em; }
+
+small {
+	font-size: 13px;
 }
 
-h6 {
-	color: @textColor;
+blockquote {
+
+	border-left: 6px solid @grayLighter;
+
+	&.pull-right {
+		border-right: 6px solid @grayLighter;
+	}
+
+	p {
+		font-size: 1em;
+		line-height: 1.2em;
+	}
 }
 
-small {
-	font-size: 13px;
+code, pre {
+	.border-radius(0);
+	background-color: @white;
 }
 
 .muted, .help-block, .uneditable-input, blockquote, small {
@@ -138,6 +147,7 @@ small {
 }
 
 div.subnav {
+
 	.box-shadow(none);
 	.border-radius(0);
 	background-color: @white;
@@ -167,16 +177,6 @@ div.subnav {
 	}
 }
 
-.dropdown-menu {
-	border: 1px solid #D4D4D4;
-	.border-radius(0);
-	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.2));
-
-	.divider {
-		margin: 5px 1px;
-	}
-}
-
 // NAV
 // -----------------------------------------------------
 
@@ -345,6 +345,23 @@ div.subnav {
 	margin-top: 13px;
 }
 
+// TABLES
+// -----------------------------------------------------
+
+.table-bordered {
+	.border-radius(0);
+}
+
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
+	.border-radius(0);
+}
+
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child {
+	.border-radius(0);
+}
+
 // FORMS
 // -----------------------------------------------------
 
@@ -366,41 +383,20 @@ select, input[type="file"] {
 	padding-top: 2em;
 }
 
-// TABLES
+// DROPDOWNS
 // -----------------------------------------------------
 
-.table-bordered {
-	.border-radius(0);
-}
-
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child {
-	.border-radius(0);
-}
-
-.table-bordered thead:last-child tr:last-child th:first-child,
-.table-bordered tbody:last-child tr:last-child td:first-child {
-	.border-radius(0);
-}
-
-// MODALS
-// -----------------------------------------------------
-
-.modal {
-	background-color: @white;
+.dropdown-menu {
+	border: 1px solid #D4D4D4;
 	.border-radius(0);
-}
-
-.modal-header {
-	border-bottom: none;
-}
+	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.2));
 
-.modal-footer {
-	background-color: @bodyBackground;
+	.divider {
+		margin: 5px 1px;
+	}
 }
 
-
-// MISCELLANEOUS
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
 .alert,
@@ -431,35 +427,37 @@ select, input[type="file"] {
 
 .label-info, .label-info:hover { background-color: @infoBackground; }
 
+// MISC
+// -----------------------------------------------------
+
 .well, .hero-unit {
 	.box-shadow(none);
 	border: 1px solid #D4D4D4;
 	.border-radius(0);
 }
 
-blockquote {
-	border-left: 6px solid @grayLighter;
-
-	&.pull-right {
-		border-right: 6px solid @grayLighter;
-	}
-
-	p {
-		font-size: 1em;
-		line-height: 1.2em;
-	}
-}
-
 .thumbnail {
 	background-color: @white;
 }
 
-.thumbnail, .thumbnail > img {
+.thumbnail,
+.thumbnail > img {
 	.border-radius(0);
 	.box-shadow(none);
 }
 
-code, pre {
-	.border-radius(0);
+.modal {
 	background-color: @white;
+	.border-radius(0);
+}
+
+.modal-header {
+	border-bottom: none;
 }
+
+.modal-footer {
+	background-color: @bodyBackground;
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css
index 8a682733..6617ec4b 100644
--- a/simplex/bootstrap.css
+++ b/simplex/bootstrap.css
@@ -4749,8 +4749,8 @@ a.badge:hover {
 .affix {
   position: fixed;
 }
-h6 {
-  color: inherit;
+hr {
+  border-bottom: none;
 }
 .navbar .navbar-inner {
   -webkit-box-shadow: inset 0 -1px #cfcaca;
@@ -5009,6 +5009,39 @@ div.subnav .dropdown.open:hover .dropdown-toggle {
   background-color: #fbebe9;
   color: #d9230f;
 }
+.breadcrumb {
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
+  border: 0px solid transparent;
+}
+.breadcrumb li {
+  padding-top: 5px;
+  text-shadow: none;
+}
+.breadcrumb a {
+  text-shadow: none;
+}
+.breadcrumb a:hover {
+  text-decoration: none;
+}
+.pagination li > a {
+  padding: 4px 14px 0;
+  color: #555555;
+}
+.pagination li > a:hover {
+  background-color: #fbebe9;
+  color: #d9230f;
+}
+.pagination li.active > a {
+  background-color: #fbebe9;
+  color: #d9230f;
+}
+.btn {
+  padding-top: .6em;
+  font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: bold;
+}
 legend {
   border-bottom: 1px solid #ddd;
   font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -5029,38 +5062,6 @@ legend {
 .input-prepend .btn {
   line-height: 16px;
 }
-.btn {
-  padding-top: .6em;
-  font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-weight: bold;
-}
-.modal-header {
-  border-bottom: none;
-}
-.modal-header,
-.modal-body {
-  background-color: #fefefe;
-}
-.modal-footer {
-  background-color: #f7f7f7;
-}
-i[class^="icon-"] {
-  opacity: 0.5;
-  vertical-align: -2px;
-}
-hr {
-  border-bottom: none;
-}
-.progress {
-  background-color: #e3e3e3;
-  background-image: -moz-linear-gradient(top, #e0e0e0, #e8e8e8);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));
-  background-image: -webkit-linear-gradient(top, #e0e0e0, #e8e8e8);
-  background-image: -o-linear-gradient(top, #e0e0e0, #e8e8e8);
-  background-image: linear-gradient(to bottom, #e0e0e0, #e8e8e8);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);
-}
 .label {
   padding: 4px 4px 3px;
   margin-left: 1px;
@@ -5068,11 +5069,9 @@ hr {
   line-height: 26px;
   font-weight: normal;
 }
-.hero-unit {
-  background-color: #fefefe;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
+i[class^="icon-"] {
+  opacity: 0.5;
+  vertical-align: -2px;
 }
 .well {
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
@@ -5080,37 +5079,35 @@ hr {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
   border: none;
 }
-.thumbnail {
-  padding: 10px;
-  background-color: #ffffff;
-}
-.breadcrumb {
+.hero-unit {
+  background-color: #fefefe;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
-  border: 0px solid transparent;
 }
-.breadcrumb li {
-  padding-top: 5px;
-  text-shadow: none;
-}
-.breadcrumb a {
-  text-shadow: none;
+.thumbnail {
+  padding: 10px;
+  background-color: #ffffff;
 }
-.breadcrumb a:hover {
-  text-decoration: none;
+.progress {
+  background-color: #e3e3e3;
+  background-image: -moz-linear-gradient(top, #e0e0e0, #e8e8e8);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #e0e0e0, #e8e8e8);
+  background-image: -o-linear-gradient(top, #e0e0e0, #e8e8e8);
+  background-image: linear-gradient(to bottom, #e0e0e0, #e8e8e8);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);
 }
-.pagination li > a {
-  padding: 4px 14px 0;
-  color: #555555;
+.modal-header {
+  border-bottom: none;
 }
-.pagination li > a:hover {
-  background-color: #fbebe9;
-  color: #d9230f;
+.modal-header,
+.modal-body {
+  background-color: #fefefe;
 }
-.pagination li.active > a {
-  background-color: #fbebe9;
-  color: #d9230f;
+.modal-footer {
+  background-color: #f7f7f7;
 }
 @media (max-width: 979px) {
   .nav-collapse.collapse .navbar-form,
diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css
index 90b63c7e..7e5af63c 100644
--- a/simplex/bootstrap.min.css
+++ b/simplex/bootstrap.min.css
@@ -801,7 +801,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .show{display:block;}
 .invisible{visibility:hidden;}
 .affix{position:fixed;}
-h6{color:inherit;}
+hr{border-bottom:none;}
 .navbar .navbar-inner{-webkit-box-shadow:inset 0 -1px #cfcaca;-moz-box-shadow:inset 0 -1px #cfcaca;box-shadow:inset 0 -1px #cfcaca;}
 .navbar .brand{padding:12px 20px 8px;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;}.navbar .brand:hover{color:#d9230f;}
 .navbar .nav>li>a{padding:13px 15px 6px;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;text-shadow:none;}.navbar .nav>li>a:hover{text-decoration:none;}
@@ -845,26 +845,25 @@ div.subnav .dropdown.open:hover .dropdown-toggle{background-color:transparent;}
 .nav-pills .dropdown.open .dropdown-toggle,.nav-pills .dropdown.open:hover .dropdown-toggle{background-color:#fbebe9;color:#d9230f;}.nav-pills .dropdown.open .dropdown-toggle .caret,.nav-pills .dropdown.open:hover .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;}
 .nav-list li>a{color:#555555;}.nav-list li>a:hover{background-color:#fbebe9;color:#d9230f;}
 .nav-list li.active>a,.nav-list li.active>a:hover{background-color:#fbebe9;color:#d9230f;}
+.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;}
+.breadcrumb a{text-shadow:none;}
+.breadcrumb a:hover{text-decoration:none;}
+.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;}
+.pagination li.active>a{background-color:#fbebe9;color:#d9230f;}
+.btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;}
 legend{border-bottom:1px solid #ddd;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}
 .navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f7f7f7;color:#555555;}
 .help-inline,.help-block{font-size:13px;}
 .input-append .btn,.input-prepend .btn{line-height:16px;}
-.btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;}
-.modal-header{border-bottom:none;}
-.modal-header,.modal-body{background-color:#fefefe;}
-.modal-footer{background-color:#f7f7f7;}
-i[class^="icon-"]{opacity:0.5;vertical-align:-2px;}
-hr{border-bottom:none;}
-.progress{background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));background-image:-webkit-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-o-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:linear-gradient(to bottom, #e0e0e0, #e8e8e8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);}
 .label{padding:4px 4px 3px;margin-left:1px;margin-right:1px;line-height:26px;font-weight:normal;}
-.hero-unit{background-color:#fefefe;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);}
+i[class^="icon-"]{opacity:0.5;vertical-align:-2px;}
 .well{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:none;}
+.hero-unit{background-color:#fefefe;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);}
 .thumbnail{padding:10px;background-color:#ffffff;}
-.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;}
-.breadcrumb a{text-shadow:none;}
-.breadcrumb a:hover{text-decoration:none;}
-.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;}
-.pagination li.active>a{background-color:#fbebe9;color:#d9230f;}
+.progress{background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));background-image:-webkit-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-o-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:linear-gradient(to bottom, #e0e0e0, #e8e8e8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe0e0e0', endColorstr='#ffe8e8e8', GradientType=0);}
+.modal-header{border-bottom:none;}
+.modal-header,.modal-body{background-color:#fefefe;}
+.modal-footer{background-color:#f7f7f7;}
 @media (max-width:979px){.nav-collapse.collapse .navbar-form,.nav-collapse.collapse .navbar-search{border-top:1px solid #eeeeee;border-bottom:1px solid #eeeeee;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less
index 5d61ebd6..30cd90ad 100755
--- a/simplex/bootswatch.less
+++ b/simplex/bootswatch.less
@@ -3,15 +3,18 @@
 // Version: 2.1.0
 // -----------------------------------------------------
 
-@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700');
-
 @boxShadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
 
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-h6 {
-	color: @headingsColor;
+@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700');
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
+hr {
+	border-bottom: none;
 }
 
 // NAVBAR
@@ -151,9 +154,7 @@ h6 {
 			.nav-header {
 				color: rgba(255, 255, 255, 0.7);
 			}
-
 		}
-
 	}
 }
 
@@ -359,6 +360,55 @@ div.subnav {
 	}
 }
 
+.breadcrumb {
+	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
+	border: 0px solid transparent;
+
+	li {
+		padding-top: 5px;
+		text-shadow: none;
+	}
+
+	a {
+		text-shadow: none;
+	}
+
+	a:hover {
+		text-decoration: none;
+	}
+}
+
+.pagination {
+
+	li > a {
+		padding: 4px 14px 0;
+		color: @textColor;
+
+		&:hover {
+			background-color: @dropdownLinkBackgroundHover;
+			color: @linkColor;
+		}
+	}
+
+	li.active > a {
+		background-color: @dropdownLinkBackgroundHover;
+		color: @linkColor;
+	}
+}
+
+
+// BUTTONS
+// -----------------------------------------------------
+
+.btn {
+	padding-top: .6em;
+	font-family: @headingsFontFamily;
+	font-weight: bold;
+}
+
+// TABLES
+// -----------------------------------------------------
+
 // FORMS
 // -----------------------------------------------------
 
@@ -383,29 +433,18 @@ legend {
 	line-height: 16px;
 }
 
-// BUTTONS
+// DROPDOWNS
 // -----------------------------------------------------
 
-.btn {
-	padding-top: .6em;
-	font-family: @headingsFontFamily;
-	font-weight: bold;
-}
-
-// MODALS
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
-.modal-header {
-	border-bottom: none;
-}
-
-.modal-header,
-.modal-body {
-	background-color: @navbarBackground;
-}
-
-.modal-footer {
-	background-color: @bodyBackground;
+.label {
+	padding: 4px 4px 3px;
+	margin-left: 1px;
+	margin-right: 1px;
+	line-height: 26px;
+	font-weight: normal;
 }
 
 // MISCELLANEOUS
@@ -416,20 +455,9 @@ i[class^="icon-"]{
 	vertical-align: -2px;
 }
 
-hr {
-	border-bottom: none;
-}
-
-.progress {
-    #gradient > .vertical(#e0e0e0, #e8e8e8);
-}
-
-.label {
-	padding: 4px 4px 3px;
-	margin-left: 1px;
-	margin-right: 1px;
-	line-height: 26px;
-	font-weight: normal;
+.well {
+	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
+	border: none;
 }
 
 .hero-unit {
@@ -437,52 +465,34 @@ hr {
 	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
 }
 
-.well {
-	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
-	border: none;
-}
-
 .thumbnail {
 	padding: 10px;
 	background-color: @white;
 }
 
-.breadcrumb {
-	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
-	border: 0px solid transparent;
-
-	li {
-		padding-top: 5px;
-		text-shadow: none;
-	}
-
-	a {
-		text-shadow: none;
-	}
-
-	a:hover {
-		text-decoration: none;
-	}
+.progress {
+    #gradient > .vertical(#e0e0e0, #e8e8e8);
 }
 
-.pagination {
+.modal {
 
-	li > a {
-		padding: 4px 14px 0;
-		color: @textColor;
+	&-header {
+		border-bottom: none;
+	}
 
-		&:hover {
-			background-color: @dropdownLinkBackgroundHover;
-			color: @linkColor;
-		}
+	&-header,
+	&-body {
+		background-color: @navbarBackground;
 	}
 
-	li.active > a {
-		background-color: @dropdownLinkBackgroundHover;
-		color: @linkColor;
+	&-footer {
+		background-color: @bodyBackground;
 	}
 }
 
+// MEDIA QUERIES
+// -----------------------------------------------------
+
 @media (max-width: 979px) {
 
 	.nav-collapse.collapse .navbar-form,
diff --git a/slate/bootstrap.css b/slate/bootstrap.css
index 218e2f25..18e172c5 100644
--- a/slate/bootstrap.css
+++ b/slate/bootstrap.css
@@ -4753,11 +4753,22 @@ h2,
 h3,
 h4,
 h5,
-h6,
-legend,
-label {
+h6 {
   text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
+code,
+pre {
+  background-color: #F7F7F7;
+  border: 1px solid #1c1e22;
+  text-shadow: none;
+}
+hr,
+legend,
+.page-header {
+  border-top: none;
+  border-bottom: 1px solid #1c1e22;
+  background-color: transparent;
+}
 .navbar .navbar-inner {
   background-color: #3a3f44;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
@@ -4864,11 +4875,6 @@ label {
   background-image: -o-linear-gradient(280deg, #202328, #272b30);
   background-image: linear-gradient(280deg, #202328, #272b30);
 }
-@media (max-width: 979px) {
-  .navbar .brand {
-    border-right: none;
-  }
-}
 div.subnav {
   background-color: #3a3f44;
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
@@ -4934,10 +4940,156 @@ div.subnav.subnav-fixed {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-@media (max-width: 768px) {
-  div.subnav .nav > li + li > a {
-    border-top: 1px solid transparent;
-  }
+.nav .nav-header {
+  text-shadow: none;
+}
+.nav > li > a {
+  background-color: #3a3f44;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
+  background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: -moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);
+  background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
+  -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  -moz-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  border: none;
+  color: #757c82;
+  font-weight: bold;
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+}
+.nav > li.active > a,
+.nav > li.active > a:hover {
+  background-color: transparent;
+  border: none;
+  color: #ffffff;
+}
+.nav > li > a:hover {
+  background-color: transparent;
+  color: #bbbfc2;
+}
+.nav-list {
+  background-color: #3a3f44;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
+}
+.nav-list li > a {
+  background-image: none;
+  text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+}
+.nav-list .nav-header {
+  color: #52575c;
+  text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+}
+.nav-list .divider {
+  border-bottom: 1px solid #1c1e22;
+  background-color: transparent;
+}
+.nav-tabs {
+  border-bottom: none;
+}
+.tabs-below .nav-tabs {
+  border-top: none;
+}
+.tabs-left .nav-tabs {
+  border-right: none;
+}
+.tabs-right .nav-tabs {
+  border-left: none;
+}
+.nav-tabs.nav-stacked > li > a,
+.nav-tabs.nav-stacked > li > a:hover {
+  border: none;
+}
+.breadcrumb {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.breadcrumb,
+.pagination > ul a,
+.pager a {
+  border: 1px solid transparent;
+  -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  -moz-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
+  background-color: #3a3f44;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
+  background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: -moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);
+  background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
+}
+.breadcrumb li,
+.breadcrumb a,
+.pagination > ul a {
+  color: #bbbfc2;
+  font-weight: bold;
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+}
+.breadcrumb a {
+  color: #ffffff;
+}
+.pagination  > ul {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.pagination li > a,
+.pagination li.disabled > a {
+  border-left: 1px solid #52575c;
+  border-right: 1px solid #2e3134;
+  border-top: none;
+  border-bottom: none;
+}
+.pagination li.disabled > a {
+  background-color: #52575c;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));
+  background-image: -webkit-linear-gradient(#757c82, #52575c 70%, #52575c);
+  background-image: -moz-linear-gradient(top, #757c82, #52575c 7000%, #52575c);
+  background-image: -o-linear-gradient(#757c82, #52575c 70%, #52575c);
+  background-image: linear-gradient(#757c82, #52575c 70%, #52575c);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);
+}
+.pagination  > ul > li:not(.disabled) a:hover {
+  background-color: #3a3f44;
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: -webkit-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: -o-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: linear-gradient(280deg, #272b30, #3a3f44);
+  border-left: 1px solid transparent;
+}
+.pagination  > ul > li.active > a,
+.pagination  > ul > li.active > a:hover {
+  color: #bbbfc2;
+  background-color: #3a3f44;
+  background-color: #43494f;
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(280deg, #30353b, #43494f);
+  background-image: -webkit-linear-gradient(280deg, #30353b, #43494f);
+  background-image: -o-linear-gradient(280deg, #30353b, #43494f);
+  background-image: linear-gradient(280deg, #30353b, #43494f);
+  border-left: 1px solid transparent;
+}
+.pager a:hover {
+  background-color: #3a3f44;
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: -webkit-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: -o-linear-gradient(280deg, #272b30, #3a3f44);
+  background-image: linear-gradient(280deg, #272b30, #3a3f44);
+  border: 1px solid transparent;
+}
+.pager .disabled a,
+.pager .disabled a:hover {
+  background-color: transparent;
 }
 .btn {
   color: #ffffff;
@@ -5169,170 +5321,6 @@ div.subnav.subnav-fixed {
 .caret {
   border-top-color: #ffffff;
 }
-.breadcrumb {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.breadcrumb,
-.pagination > ul a,
-.pager a {
-  border: 1px solid transparent;
-  -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  -moz-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  background-color: #3a3f44;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
-  background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-image: -moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);
-  background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
-}
-.breadcrumb li,
-.breadcrumb a,
-.pagination > ul a {
-  color: #bbbfc2;
-  font-weight: bold;
-  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
-}
-.breadcrumb a {
-  color: #ffffff;
-}
-.pagination  > ul {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.pagination li > a,
-.pagination li.disabled > a {
-  border-left: 1px solid #52575c;
-  border-right: 1px solid #2e3134;
-  border-top: none;
-  border-bottom: none;
-}
-.pagination li.disabled > a {
-  background-color: #52575c;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));
-  background-image: -webkit-linear-gradient(#757c82, #52575c 70%, #52575c);
-  background-image: -moz-linear-gradient(top, #757c82, #52575c 7000%, #52575c);
-  background-image: -o-linear-gradient(#757c82, #52575c 70%, #52575c);
-  background-image: linear-gradient(#757c82, #52575c 70%, #52575c);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);
-}
-.pagination  > ul > li:not(.disabled) a:hover {
-  background-color: #3a3f44;
-  background-repeat: repeat-x;
-  background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: -webkit-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: -o-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: linear-gradient(280deg, #272b30, #3a3f44);
-  border-left: 1px solid transparent;
-}
-.pagination  > ul > li.active > a,
-.pagination  > ul > li.active > a:hover {
-  color: #bbbfc2;
-  background-color: #3a3f44;
-  background-color: #43494f;
-  background-repeat: repeat-x;
-  background-image: -moz-linear-gradient(280deg, #30353b, #43494f);
-  background-image: -webkit-linear-gradient(280deg, #30353b, #43494f);
-  background-image: -o-linear-gradient(280deg, #30353b, #43494f);
-  background-image: linear-gradient(280deg, #30353b, #43494f);
-  border-left: 1px solid transparent;
-}
-.pager a:hover {
-  background-color: #3a3f44;
-  background-repeat: repeat-x;
-  background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: -webkit-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: -o-linear-gradient(280deg, #272b30, #3a3f44);
-  background-image: linear-gradient(280deg, #272b30, #3a3f44);
-  border: 1px solid transparent;
-}
-.pager .disabled a,
-.pager .disabled a:hover {
-  background-color: transparent;
-}
-.nav .nav-header {
-  text-shadow: none;
-}
-.nav > li > a {
-  background-color: #3a3f44;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
-  background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-image: -moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);
-  background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
-  -webkit-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  -moz-box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  box-shadow: '0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';
-  border: none;
-  color: #757c82;
-  font-weight: bold;
-  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
-}
-.nav > li.active > a,
-.nav > li.active > a:hover {
-  background-color: transparent;
-  border: none;
-  color: #ffffff;
-}
-.nav > li > a:hover {
-  background-color: transparent;
-  color: #bbbfc2;
-}
-.nav-list {
-  background-color: #3a3f44;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.4);
-}
-.nav-list li > a {
-  background-image: none;
-  text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-}
-.nav-list .nav-header {
-  color: #52575c;
-  text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-}
-.nav-list .divider {
-  border-bottom: 1px solid #1c1e22;
-  background-color: transparent;
-}
-.nav-tabs {
-  border-bottom: none;
-}
-.tabs-below .nav-tabs {
-  border-top: none;
-}
-.tabs-left .nav-tabs {
-  border-right: none;
-}
-.tabs-right .nav-tabs {
-  border-left: none;
-}
-.nav-tabs.nav-stacked > li > a,
-.nav-tabs.nav-stacked > li > a:hover {
-  border: none;
-}
-.dropdown-menu {
-  -webkit-box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
-}
-.dropdown-menu li.active a,
-.dropdown-menu li.active a:hover {
-  background-color: #3a3f44;
-}
-.dropdown.open .dropdown-toggle {
-  background-color: #3a3f44;
-  color: #bbbfc2;
-}
 label,
 input,
 button,
@@ -5341,8 +5329,9 @@ textarea,
 legend {
   color: #757c82;
 }
-.form-actions {
-  border-top: none;
+legend,
+label {
+  text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
 .input-prepend .add-on,
 .input-append .add-on {
@@ -5368,6 +5357,27 @@ select[readonly],
 textarea[readonly] {
   color: #bbbfc2;
 }
+.form-actions {
+  border-top: none;
+}
+.dropdown-menu {
+  -webkit-box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 5px rgba(0, 0, 0, 0.2);
+}
+.dropdown-menu li.active a,
+.dropdown-menu li.active a:hover {
+  background-color: #3a3f44;
+}
+.dropdown.open .dropdown-toggle {
+  background-color: #3a3f44;
+  color: #bbbfc2;
+}
+.dropdown-menu .divider {
+  border-top: none;
+  border-bottom: 1px solid #1c1e22;
+  background-color: transparent;
+}
 .label,
 .alert {
   color: rgba(255, 255, 255, 0.9);
@@ -5396,49 +5406,16 @@ textarea[readonly] {
   background-color: #3a87ad;
   border-color: #3a87ad;
 }
-.modal {
-  background-color: #2e3236;
-}
-.modal-header {
-  border-bottom: none;
-}
-.modal-body {
-  border-bottom: 1px solid #1C1E22;
-}
-.modal-footer {
-  border-top: none;
-  background-color: #272b30;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-code,
-pre {
-  background-color: #F7F7F7;
-  border: 1px solid #1c1e22;
-  text-shadow: none;
-}
-hr,
-legend,
-.page-header,
-.dropdown-menu .divider {
-  border-top: none;
-  border-bottom: 1px solid #1c1e22;
-  background-color: transparent;
-}
-footer.footer {
-  border-top: 1px solid #1c1e22;
-}
-footer.footer p {
-  color: #757c82;
-}
 .well,
-.progress,
 .hero-unit {
   -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
   box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
+.thumbnail,
+a.thumbnail:hover {
+  border: 1px solid #1c1e22;
+}
 .progress {
   background-color: #202328;
   background-color: #202328;
@@ -5449,10 +5426,41 @@ footer.footer p {
   background-image: linear-gradient(to bottom, #202328, #202328);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff202328', GradientType=0);
+  -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
-.thumbnail,
-a.thumbnail:hover {
-  border: 1px solid #1c1e22;
+.footer {
+  border-top: 1px solid #1c1e22;
+}
+.footer p {
+  color: #757c82;
+}
+.modal {
+  background-color: #2e3236;
+}
+.modal-header {
+  border-bottom: none;
+}
+.modal-body {
+  border-bottom: 1px solid #1C1E22;
+}
+.modal-footer {
+  border-top: none;
+  background-color: #272b30;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+@media (max-width: 979px) {
+  .navbar .brand {
+    border-right: none;
+  }
+}
+@media (max-width: 768px) {
+  div.subnav .nav > li + li > a {
+    border-top: 1px solid transparent;
+  }
 }
 .pull-right {
   float: right;
diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css
index 9aea6699..945b34a2 100644
--- a/slate/bootstrap.min.css
+++ b/slate/bootstrap.min.css
@@ -800,7 +800,9 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .show{display:block;}
 .invisible{visibility:hidden;}
 .affix{position:fixed;}
-h1,h2,h3,h4,h5,h6,legend,label{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
+h1,h2,h3,h4,h5,h6{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
+code,pre{background-color:#F7F7F7;border:1px solid #1c1e22;text-shadow:none;}
+hr,legend,.page-header{border-top:none;border-bottom:1px solid #1c1e22;background-color:transparent;}
 .navbar .navbar-inner{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);}
 .navbar .brand{font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;}
 .navbar .navbar-text{padding:0 15px;font-weight:bold;}
@@ -816,14 +818,37 @@ h1,h2,h3,h4,h5,h6,legend,label{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
 .navbar-inverse .navbar-inner{background-color:#151719;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), color-stop(70%, #151719), to(#151719));background-image:-webkit-linear-gradient(#202328, #151719 70%, #151719);background-image:-moz-linear-gradient(top, #202328, #151719 7000%, #151719);background-image:-o-linear-gradient(#202328, #151719 70%, #151719);background-image:linear-gradient(#202328, #151719 70%, #151719);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff151719', GradientType=0);}
 .navbar-inverse .nav li>a{background-image:none;background-color:transparent;}
 .navbar-inverse .nav li>a:hover,.navbar-inverse .nav li.active>a,.navbar-inverse .nav li.active>a:hover{background-color:#272b30;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #202328, #272b30);background-image:-webkit-linear-gradient(280deg, #202328, #272b30);background-image:-o-linear-gradient(280deg, #202328, #272b30);background-image:linear-gradient(280deg, #202328, #272b30);}
-@media (max-width:979px){.navbar .brand{border-right:none;}}div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;}
+div.subnav{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}div.subnav .nav>li>a{color:#bbbfc2;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);border-right:1px solid #2e3134;border-left:1px solid #52575c;}div.subnav .nav>li>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;border-right:1px solid transparent;}
 div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-right:1px solid #2e3134;}
 div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{border-left:1px solid transparent;}
 div.subnav.subnav-fixed .nav>li.active:first-child>a,div.subnav.subnav-fixed .nav>li:first-child>a:hover{border-left:1px solid #2e3134;}
 div.subnav .nav>li.active:last-child>a,div.subnav .nav>li:last-child>a:hover{border-right:1px solid #2e3134;}
 div.subnav .open .dropdown-toggle{border-right:1px solid #2e3134;border-left:1px solid #52575c;}
 div.subnav.subnav-fixed{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-@media (max-width:768px){div.subnav .nav>li+li>a{border-top:1px solid transparent;}}.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#484d51;background-image:-moz-linear-gradient(top, #52575c, #3a3e41);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), to(#3a3e41));background-image:-webkit-linear-gradient(top, #52575c, #3a3e41);background-image:-o-linear-gradient(top, #52575c, #3a3e41);background-image:linear-gradient(to bottom, #52575c, #3a3e41);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3e41', GradientType=0);border-color:#3a3e41 #3a3e41 #161719;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3a3e41;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;border:1px solid #272b30;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#3a3e41;*background-color:#2e3134;}
+.nav .nav-header{text-shadow:none;}
+.nav>li>a{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';border:none;color:#757c82;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
+.nav>li.active>a,.nav>li.active>a:hover{background-color:transparent;border:none;color:#ffffff;}
+.nav>li>a:hover{background-color:transparent;color:#bbbfc2;}
+.nav-list{background-color:#3a3f44;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);}.nav-list li>a{background-image:none;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
+.nav-list .nav-header{color:#52575c;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
+.nav-list .divider{border-bottom:1px solid #1c1e22;background-color:transparent;}
+.nav-tabs{border-bottom:none;}
+.tabs-below .nav-tabs{border-top:none;}
+.tabs-left .nav-tabs{border-right:none;}
+.tabs-right .nav-tabs{border-left:none;}
+.nav-tabs.nav-stacked>li>a,.nav-tabs.nav-stacked>li>a:hover{border:none;}
+.breadcrumb{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.breadcrumb,.pagination>ul a,.pager a{border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);}
+.breadcrumb li,.breadcrumb a,.pagination>ul a{color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
+.breadcrumb a{color:#ffffff;}
+.pagination >ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.pagination li>a,.pagination li.disabled>a{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;}
+.pagination li.disabled>a{background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 7000%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);}
+.pagination >ul>li:not(.disabled) a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;}
+.pagination >ul>li.active>a,.pagination >ul>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;}
+.pager a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border:1px solid transparent;}
+.pager .disabled a,.pager .disabled a:hover{background-color:transparent;}
+.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#484d51;background-image:-moz-linear-gradient(top, #52575c, #3a3e41);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), to(#3a3e41));background-image:-webkit-linear-gradient(top, #52575c, #3a3e41);background-image:-o-linear-gradient(top, #52575c, #3a3e41);background-image:linear-gradient(to bottom, #52575c, #3a3e41);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3e41', GradientType=0);border-color:#3a3e41 #3a3e41 #161719;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3a3e41;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;border:1px solid #272b30;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#3a3e41;*background-color:#2e3134;}
 .btn:active,.btn.active{background-color:#222426 \9;}
 .btn,.btn:hover{color:#ffffff;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
 .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#757a82;background-image:-moz-linear-gradient(top, #757c82, #757882);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), to(#757882));background-image:-webkit-linear-gradient(top, #757c82, #757882);background-image:-o-linear-gradient(top, #757c82, #757882);background-image:linear-gradient(to bottom, #757c82, #757882);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff757882', GradientType=0);border-color:#757882 #757882 #51535a;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#757882;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#757882;*background-color:#696b75;}
@@ -839,53 +864,29 @@ div.subnav.subnav-fixed{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:
 .btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#393939;background-image:-moz-linear-gradient(top, #454545, #262626);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));background-image:-webkit-linear-gradient(top, #454545, #262626);background-image:-o-linear-gradient(top, #454545, #262626);background-image:linear-gradient(to bottom, #454545, #262626);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff454545', endColorstr='#ff262626', GradientType=0);border-color:#262626 #262626 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#262626;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#262626;*background-color:#191919;}
 .btn-inverse:active,.btn-inverse.active{background-color:#0c0c0c \9;}
 .caret{border-top-color:#ffffff;}
-.breadcrumb{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.breadcrumb,.pagination>ul a,.pager a{border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);}
-.breadcrumb li,.breadcrumb a,.pagination>ul a{color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
-.breadcrumb a{color:#ffffff;}
-.pagination >ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination li>a,.pagination li.disabled>a{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;}
-.pagination li.disabled>a{background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 7000%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);}
-.pagination >ul>li:not(.disabled) a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;}
-.pagination >ul>li.active>a,.pagination >ul>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;}
-.pager a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border:1px solid transparent;}
-.pager .disabled a,.pager .disabled a:hover{background-color:transparent;}
-.nav .nav-header{text-shadow:none;}
-.nav>li>a{background-color:#3a3f44;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));background-image:-webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:-moz-linear-gradient(top, #52575c, #3a3f44 7000%, #3a3f44);background-image:-o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-image:linear-gradient(#52575c, #3a3f44 70%, #3a3f44);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';border:none;color:#757c82;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
-.nav>li.active>a,.nav>li.active>a:hover{background-color:transparent;border:none;color:#ffffff;}
-.nav>li>a:hover{background-color:transparent;color:#bbbfc2;}
-.nav-list{background-color:#3a3f44;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.4);}.nav-list li>a{background-image:none;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
-.nav-list .nav-header{color:#52575c;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
-.nav-list .divider{border-bottom:1px solid #1c1e22;background-color:transparent;}
-.nav-tabs{border-bottom:none;}
-.tabs-below .nav-tabs{border-top:none;}
-.tabs-left .nav-tabs{border-right:none;}
-.tabs-right .nav-tabs{border-left:none;}
-.nav-tabs.nav-stacked>li>a,.nav-tabs.nav-stacked>li>a:hover{border:none;}
-.dropdown-menu{-webkit-box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);}.dropdown-menu li.active a,.dropdown-menu li.active a:hover{background-color:#3a3f44;}
-.dropdown.open .dropdown-toggle{background-color:#3a3f44;color:#bbbfc2;}
 label,input,button,select,textarea,legend{color:#757c82;}
-.form-actions{border-top:none;}
+legend,label{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}
 .input-prepend .add-on,.input-append .add-on{vertical-align:top;background-color:#52575c;border-top:1px solid #757c82;border-left:1px solid #757c82;border-bottom:1px solid #3a3f44;border-right:1px solid #3a3f44;text-shadow:none;}
 .input-append .btn,.input-prepend .btn{margin-top:-1px;padding:5px 14px;}
 .uneditable-input,input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{color:#bbbfc2;}
+.form-actions{border-top:none;}
+.dropdown-menu{-webkit-box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);box-shadow:0 5px 5px rgba(0, 0, 0, 0.2);}.dropdown-menu li.active a,.dropdown-menu li.active a:hover{background-color:#3a3f44;}
+.dropdown.open .dropdown-toggle{background-color:#3a3f44;color:#bbbfc2;}
+.dropdown-menu .divider{border-top:none;border-bottom:1px solid #1c1e22;background-color:transparent;}
 .label,.alert{color:rgba(255, 255, 255, 0.9);text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
 .alert-heading{color:rgba(255, 255, 255, 0.9);text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.4);}
 .alert{background-color:#f89406;border-color:#f89406;}
 .alert-success{background-color:#468847;border-color:#468847;}
 .alert-error{background-color:#b94a48;border-color:#b94a48;}
 .alert-info{background-color:#3a87ad;border-color:#3a87ad;}
-.modal{background-color:#2e3236;}
-.modal-header{border-bottom:none;}
+.well,.hero-unit{-webkit-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);}
+.thumbnail,a.thumbnail:hover{border:1px solid #1c1e22;}
+.progress{background-color:#202328;background-color:#202328;background-image:-moz-linear-gradient(top, #202328, #202328);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), to(#202328));background-image:-webkit-linear-gradient(top, #202328, #202328);background-image:-o-linear-gradient(top, #202328, #202328);background-image:linear-gradient(to bottom, #202328, #202328);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff202328', GradientType=0);-webkit-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);}
+.footer{border-top:1px solid #1c1e22;}.footer p{color:#757c82;}
+.modal{background-color:#2e3236;}.modal-header{border-bottom:none;}
 .modal-body{border-bottom:1px solid #1C1E22;}
 .modal-footer{border-top:none;background-color:#272b30;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-code,pre{background-color:#F7F7F7;border:1px solid #1c1e22;text-shadow:none;}
-hr,legend,.page-header,.dropdown-menu .divider{border-top:none;border-bottom:1px solid #1c1e22;background-color:transparent;}
-footer.footer{border-top:1px solid #1c1e22;}footer.footer p{color:#757c82;}
-.well,.progress,.hero-unit{-webkit-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);}
-.progress{background-color:#202328;background-color:#202328;background-image:-moz-linear-gradient(top, #202328, #202328);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), to(#202328));background-image:-webkit-linear-gradient(top, #202328, #202328);background-image:-o-linear-gradient(top, #202328, #202328);background-image:linear-gradient(to bottom, #202328, #202328);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff202328', endColorstr='#ff202328', GradientType=0);}
-.thumbnail,a.thumbnail:hover{border:1px solid #1c1e22;}
-.pull-right{float:right;}
+@media (max-width:979px){.navbar .brand{border-right:none;}}@media (max-width:768px){div.subnav .nav>li+li>a{border-top:1px solid transparent;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}
diff --git a/slate/bootswatch.less b/slate/bootswatch.less
index 928f6513..6dd84fa6 100755
--- a/slate/bootswatch.less
+++ b/slate/bootswatch.less
@@ -3,13 +3,28 @@
 // Version: 2.1.0
 // -----------------------------------------------------
 
-// SCAFFOLDING
+// TYPOGRAPHY
 // -----------------------------------------------------
 
-h1, h2, h3, h4, h5, h6, legend, label {
+h1, h2, h3, h4, h5, h6 {
 	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
 
+code, pre {
+	background-color: #F7F7F7;
+	border: 1px solid darken(@grayDarker, 5%);
+	text-shadow: none;
+}
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
+hr, legend, .page-header {
+	border-top: none;
+	border-bottom: 1px solid darken(@grayDarker, 5%);
+	background-color: transparent;
+}
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -111,12 +126,6 @@ h1, h2, h3, h4, h5, h6, legend, label {
 	}
 }
 
-@media (max-width: 979px) {
-	.navbar .brand {
-		border-right: none;
-	}
-}
-
 div.subnav {
 	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
 	border: 1px solid transparent;
@@ -170,62 +179,74 @@ div.subnav {
 	}
 }
 
-@media (max-width: 768px) {
-	div.subnav .nav > li + li > a {
-		border-top: 1px solid transparent;
-	}
-}
-
-// BUTTONS
+// NAV
 // -----------------------------------------------------
 
-.btn {
-    .buttonBackground(@gray, darken(@gray, 10%));
-	.border-radius(3px);
-	border: 1px solid @grayDarker;
+.nav .nav-header {
+	text-shadow: none;
 }
 
-.btn, .btn:hover {
-	color: @white;
+.nav > li > a {
+	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+	border: none;
+	color: @grayLight;
 	font-weight: bold;
 	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
+.nav > li.active > a,
+.nav > li.active > a:hover {
+	background-color: transparent;
+	border: none;
+	color: @white;
 }
 
-.btn-warning {
-  .buttonBackground(lighten(@orange, 15%), @orange);
+.nav > li > a:hover {
+	background-color: transparent;
+	color: @grayLighter;
 }
 
-.btn-danger {
-  .buttonBackground(#ee5f5b, #bd362f);
-}
+.nav-list {
+	background-color: @grayDark;
+	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
 
-.btn-success {
-  .buttonBackground(#62c462, #51a351);
-}
+	li > a {
+		background-image: none;
+		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+	}
 
-.btn-info {
-  .buttonBackground(#5bc0de, #2f96b4);
-}
+	.nav-header {
+		color: @gray;
+		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+	}
 
-.btn-inverse {
-  .buttonBackground(#454545, #262626);
+	.divider {
+		border-bottom: 1px solid darken(@grayDarker, 5%);
+		background-color: transparent;
+	}
 }
 
-.caret {
-	border-top-color: @white;
+.nav-tabs {
+	border-bottom: none;
 }
 
-// TABLES
-// -----------------------------------------------------
+.tabs-below .nav-tabs {
+	border-top: none;
+}
 
+.tabs-left .nav-tabs {
+	border-right: none;
+}
 
+.tabs-right .nav-tabs {
+	border-left: none;
+}
 
-// NAVIGATION
-// -----------------------------------------------------
+.nav-tabs.nav-stacked > li > a,
+.nav-tabs.nav-stacked > li > a:hover {
+	border: none;
+}
 
 .breadcrumb {
 	.box-shadow(none);
@@ -293,85 +314,51 @@ div.subnav {
 	}
 }
 
-.nav .nav-header {
-	text-shadow: none;
-}
+// BUTTONS
+// -----------------------------------------------------
 
-.nav > li > a {
-	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
-	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
-	border: none;
-	color: @grayLight;
-	font-weight: bold;
-	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+.btn {
+    .buttonBackground(@gray, darken(@gray, 10%));
+	.border-radius(3px);
+	border: 1px solid @grayDarker;
 }
 
-.nav > li.active > a,
-.nav > li.active > a:hover {
-	background-color: transparent;
-	border: none;
+.btn, .btn:hover {
 	color: @white;
+	font-weight: bold;
+	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
 
-.nav > li > a:hover {
-	background-color: transparent;
-	color: @grayLighter;
-}
-
-.nav-list {
-	background-color: @grayDark;
-	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.4));
-
-	li > a {
-		background-image: none;
-		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-	}
-
-	.nav-header {
-		color: @gray;
-		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
-	}
-
-	.divider {
-		border-bottom: 1px solid darken(@grayDarker, 5%);
-		background-color: transparent;
-	}
+.btn-primary {
+  .buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
 }
 
-.nav-tabs {
-	border-bottom: none;
+.btn-warning {
+  .buttonBackground(lighten(@orange, 15%), @orange);
 }
 
-.tabs-below .nav-tabs {
-	border-top: none;
+.btn-danger {
+  .buttonBackground(#ee5f5b, #bd362f);
 }
 
-.tabs-left .nav-tabs {
-	border-right: none;
+.btn-success {
+  .buttonBackground(#62c462, #51a351);
 }
 
-.tabs-right .nav-tabs {
-	border-left: none;
+.btn-info {
+  .buttonBackground(#5bc0de, #2f96b4);
 }
 
-.nav-tabs.nav-stacked > li > a,
-.nav-tabs.nav-stacked > li > a:hover {
-	border: none;
+.btn-inverse {
+  .buttonBackground(#454545, #262626);
 }
 
-.dropdown-menu {
-	.box-shadow(0 5px 5px rgba(0, 0, 0, 0.2));
-
-	li.active a,
-	li.active a:hover {
-		background-color: @grayDark;
-	}
+.caret {
+	border-top-color: @white;
 }
 
-.dropdown.open .dropdown-toggle {
-	background-color: @grayDark;
-	color: @grayLighter;
-}
+// TABLES
+// -----------------------------------------------------
 
 // FORMS
 // -----------------------------------------------------
@@ -380,8 +367,8 @@ label, input, button, select, textarea, legend {
 	color: @textColor;
 }
 
-.form-actions {
-	border-top: none;
+legend, label {
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
 
 .input-prepend .add-on,
@@ -411,7 +398,34 @@ textarea[readonly] {
 	color: @grayLighter;
 }
 
-// LABELS AND ALERTS
+.form-actions {
+	border-top: none;
+}
+
+// DROPDOWNS
+// -----------------------------------------------------
+
+.dropdown-menu {
+	.box-shadow(0 5px 5px rgba(0, 0, 0, 0.2));
+
+	li.active a,
+	li.active a:hover {
+		background-color: @grayDark;
+	}
+}
+
+.dropdown.open .dropdown-toggle {
+	background-color: @grayDark;
+	color: @grayLighter;
+}
+
+.dropdown-menu .divider {
+	border-top: none;
+	border-bottom: 1px solid darken(@grayDarker, 5%);
+	background-color: transparent;
+}
+
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
 .label, .alert {
@@ -445,59 +459,62 @@ textarea[readonly] {
   border-color: @infoText;
 }
 
-// MODALS
+// MISC
 // -----------------------------------------------------
 
-.modal {
-	background-color: darken(@grayDark, 5%);
+.well, .hero-unit {
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-.modal-header {
-	border-bottom: none;
+.thumbnail,
+a.thumbnail:hover {
+  border: 1px solid darken(@grayDarker, 5%);
 }
 
-.modal-body {
-	border-bottom: 1px solid #1C1E22;
+.progress {
+	background-color: darken(@grayDarker, 3%);
+	#gradient > .vertical(darken(@grayDarker, 3%), darken(@grayDarker, 3%));
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-.modal-footer {
-	border-top: none;
-	background-color: @grayDarker;
-	.box-shadow(none);
+.footer {
+	border-top: 1px solid darken(@grayDarker, 5%);
+
+	p {
+		color: @textColor;
+	}
 }
 
-// MISCELLANEOUS
-// -----------------------------------------------------
+.modal {
 
-code, pre {
-	background-color: #F7F7F7;
-	border: 1px solid darken(@grayDarker, 5%);
-	text-shadow: none;
-}
+	background-color: darken(@grayDark, 5%);
 
-hr, legend, .page-header, .dropdown-menu .divider {
-	border-top: none;
-	border-bottom: 1px solid darken(@grayDarker, 5%);
-	background-color: transparent;
-}
+	&-header {
+		border-bottom: none;
+	}
 
-footer.footer {
-	border-top: 1px solid darken(@grayDarker, 5%);
+	&-body {
+		border-bottom: 1px solid #1C1E22;
+	}
 
-	p {
-		color: @textColor;
+	&-footer {
+		border-top: none;
+		background-color: @grayDarker;
+		.box-shadow(none);
 	}
 }
 
-.well, .progress, .hero-unit {
-	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5);
-}
+// MEDIA QUERIES
+// -----------------------------------------------------
 
-.progress {
-	background-color: darken(@grayDarker, 3%);
-	#gradient > .vertical(darken(@grayDarker, 3%), darken(@grayDarker, 3%));
+@media (max-width: 979px) {
+	.navbar .brand {
+		border-right: none;
+	}
 }
 
-.thumbnail, a.thumbnail:hover {
-  border: 1px solid darken(@grayDarker, 5%);
-}
+@media (max-width: 768px) {
+	div.subnav .nav > li + li > a {
+		border-top: 1px solid transparent;
+	}
+}
\ No newline at end of file
diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less
index 987fd039..068f1ed3 100755
--- a/spacelab/bootswatch.less
+++ b/spacelab/bootswatch.less
@@ -3,6 +3,12 @@
 // Version: 2.1.0
 // -----------------------------------------------------
 
+// TYPOGRAPHY
+// -----------------------------------------------------
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -124,6 +130,9 @@ div.subnav {
 	}
 }
 
+// NAV
+// -----------------------------------------------------
+
 .nav > li.dropdown > .dropdown-toggle,
 .nav > li.dropdown.active > .dropdown-toggle,
 .nav > li.dropdown.open > .dropdown-toggle,
@@ -141,7 +150,7 @@ div.subnav {
 	}
 }
 
-// BUTTON
+// BUTTONS
 // -----------------------------------------------------
 
 .btn {
@@ -183,22 +192,29 @@ div.subnav {
   .buttonBackground(lighten(@purple, 5%), @purple);
 }
 
+// TABLES
+// -----------------------------------------------------
 
 // FORMS
 // -----------------------------------------------------
 
 .control-group.warning {
-  .formFieldState(#E29235, #E29235, @warningBackground);
+	.formFieldState(#E29235, #E29235, @warningBackground);
 }
 
 .control-group.error {
-  .formFieldState(#C00, #C00, @errorBackground);
+	.formFieldState(#C00, #C00, @errorBackground);
 }
 
 .control-group.success {
-  .formFieldState(#2BA949, #2BA949, @successBackground);
+	.formFieldState(#2BA949, #2BA949, @successBackground);
 }
 
+// DROPDOWNS
+// -----------------------------------------------------
+
+// ALERTS, LABELS, BADGES
+// -----------------------------------------------------
 
 // MISC
 // -----------------------------------------------------
@@ -211,4 +227,7 @@ div.subnav {
 .hero-unit {
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
     border: 1px solid rgba(0,0,0,.05);
-}
\ No newline at end of file
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
index 9fe715db..73831c7e 100644
--- a/spruce/bootstrap.css
+++ b/spruce/bootstrap.css
@@ -4749,15 +4749,6 @@ a.badge:hover {
 .affix {
   position: fixed;
 }
-.navbar .brand,
-legend,
-.btn,
-.navbar .nav > li > a,
-div.subnav li > a,
-.navbar-text {
-  font-family: 'Josefin Slab', serif;
-  font-weight: 700;
-}
 h1 {
   font-size: 54px;
   line-height: 1.2em;
@@ -4785,13 +4776,21 @@ h6 > small,
   color: #f5f3dc;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-.alert-heading {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: inherit;
+code,
+pre {
+  color: #026567;
+  background-color: #f5f3dc;
 }
-body {
-  background-size: 100% 1400px;
-  background-repeat: repeat-y;
+.page-header {
+  border-bottom: 2px solid #f5f3dc;
+  padding-bottom: 5px;
+}
+.page-header h1 {
+  margin-bottom: 0;
+}
+hr {
+  border-top: none;
+  border-bottom: 2px solid #f5f3dc;
 }
 blockquote {
   border-left: 2px solid #f5f3dc;
@@ -4802,11 +4801,6 @@ blockquote.pull-right {
 blockquote small {
   color: #013435;
 }
-code,
-pre {
-  color: #026567;
-  background-color: #f5f3dc;
-}
 .navbar .navbar-inner {
   background-image: none;
   -webkit-box-shadow: none;
@@ -4814,12 +4808,16 @@ pre {
   box-shadow: none;
 }
 .navbar .brand {
-  font-size: 26px;
   padding: 18px 20px 12px;
+  font-size: 26px;
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
 }
 .navbar .nav > li > a {
-  font-size: 20px;
   padding: 20px 20px 10px;
+  font-size: 20px;
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
 }
 .navbar .nav .active > a,
 .navbar .nav .active > a:hover {
@@ -4835,6 +4833,8 @@ pre {
 .navbar .navbar-text {
   margin: 19px 20px 0;
   font-size: 20px;
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
   line-height: inherit;
 }
 .navbar .divider-vertical {
@@ -4890,6 +4890,8 @@ div.subnav .nav > li > a {
   padding: 13px 12px 9px;
   border-color: transparent;
   background-color: transparent;
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
   color: #f5f3dc;
 }
 div.subnav .nav > li + li > a {
@@ -4919,42 +4921,144 @@ div.subnav .dropdown.open > .dropdown-menu a:hover {
 div.subnav.subnav-fixed {
   top: 50px;
 }
-.table,
-.table.table-bordered,
-.table.table-striped {
-  -webkit-border-radius: 0 0 8px 8px;
-  -moz-border-radius: 0 0 8px 8px;
-  border-radius: 0 0 8px 8px;
+.nav .disabled > a {
+  color: #ccc;
 }
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child,
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
+.nav .disabled > a:hover {
+  background-color: #748C73;
 }
-.table-striped tbody:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0 0 0 8px;
-  -moz-border-radius: 0 0 0 8px;
-  border-radius: 0 0 0 8px;
+.nav-list li > a,
+.nav-list .nav-header {
+  text-shadow: none;
 }
-.table-striped tbody:last-child tr:last-child td:last-child {
-  -webkit-border-radius: 0 0 8px 0;
-  -moz-border-radius: 0 0 8px 0;
-  border-radius: 0 0 8px 0;
+.nav-list li > a:hover {
+  background-color: transparent;
 }
-.table-bordered {
-  border: none;
+.nav-list li.active > a,
+.nav-list li.active > a:hover {
+  background-color: #A2CDB5;
+  text-shadow: none;
 }
-.table thead tr th:first-child,
-.table tbody tr td:first-child {
-  border-left: none;
+.nav-list .divider {
+  background-color: transparent;
+  border-bottom: 1px solid #f5f3dc;
 }
-.table th,
-.table-striped tbody tr:nth-child(odd) th {
+.nav-tabs {
+  border-color: transparent;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  background-color: #748C73;
+}
+.nav-tabs > li > a:hover,
+.nav-pills > li > a:hover {
+  background-color: #748C73;
+  border-color: transparent;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
+  background-color: #A2CDB5;
+  border-color: transparent;
+  color: #01584c;
+}
+.nav-tabs.nav-stacked > li > a {
+  border-color: transparent;
+}
+.nav-tabs.nav-stacked > li > a:hover {
+  border-color: transparent;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle {
+  background-color: #748C73;
+  border-color: transparent;
+  color: #ebd90b;
+}
+.nav-tabs .active.open .dropdown-toggle,
+.nav-pills .active.open .dropdown-toggle {
+  background-color: #A2CDB5;
+}
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
+  background-color: #f5f3dc;
+  color: #013435;
+  border-color: transparent;
+}
+.nav-tabs .dropdown-menu a:hover,
+.nav-pills .dropdown-menu a:hover {
+  background-color: #A2CDB5;
+  color: #f5f3dc;
+}
+.nav .nav-header {
+  color: #01584c;
+}
+.tabbable .nav-tabs,
+.tabbable .nav-tabs > li > a,
+.tabbable .nav-tabs > li > a:hover,
+.tabbable .nav-tabs > li.active > a,
+.tabbable .nav-tabs > li.active > a:hover {
+  border-color: transparent;
+}
+.breadcrumb {
+  background-color: #748c73;
+  background-image: none;
+  border-color: transparent;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.breadcrumb li {
+  color: #ebd90b;
+  text-shadow: none;
+}
+.breadcrumb li a {
+  color: #ebd90b;
+}
+.breadcrumb li a:hover {
+  color: #ebd90b;
+}
+.breadcrumb li .divider {
+  color: #f5f3dc;
+}
+.breadcrumb .active {
+  color: #f5f3dc;
+}
+.pagination  > ul {
   background-color: #748c73;
+  background-image: none;
+  border-color: transparent;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.pagination a {
+  color: #ebd90b;
+  border-color: transparent;
+}
+.pagination a:hover {
+  color: #ebd90b;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+.pagination .active a {
   color: #f5f3dc;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: #01584c;
+}
+.pager a {
+  border: none;
+  background-color: #748C73;
+}
+.pager a:hover {
+  background-color: #687D67;
+}
+.pager .disabled a,
+.pager .disabled a:hover {
+  background-color: #748C73;
+  color: #013435;
 }
 .btn {
   color: #ffffff;
@@ -4973,8 +5077,10 @@ div.subnav.subnav-fixed {
   /* Darken IE7 buttons by default so they stand out more given they won't have borders */
 
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  text-shadow: none;
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
   color: #ffffff;
+  text-shadow: none;
   border-color: transparent;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
@@ -5190,146 +5296,46 @@ div.subnav.subnav-fixed {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.nav .disabled > a {
-  color: #ccc;
-}
-.nav .disabled > a:hover {
-  background-color: #748C73;
-}
-.breadcrumb {
-  background-color: #748c73;
-  background-image: none;
-  border-color: transparent;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+.table,
+.table.table-bordered,
+.table.table-striped {
+  -webkit-border-radius: 0 0 8px 8px;
+  -moz-border-radius: 0 0 8px 8px;
+  border-radius: 0 0 8px 8px;
 }
-.breadcrumb li {
-  color: #ebd90b;
-  text-shadow: none;
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child,
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
 }
-.breadcrumb li a {
-  color: #ebd90b;
+.table-striped tbody:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 8px;
+  -moz-border-radius: 0 0 0 8px;
+  border-radius: 0 0 0 8px;
 }
-.breadcrumb li a:hover {
-  color: #ebd90b;
+.table-striped tbody:last-child tr:last-child td:last-child {
+  -webkit-border-radius: 0 0 8px 0;
+  -moz-border-radius: 0 0 8px 0;
+  border-radius: 0 0 8px 0;
 }
-.breadcrumb li .divider {
-  color: #f5f3dc;
+.table-bordered {
+  border: none;
 }
-.breadcrumb .active {
-  color: #f5f3dc;
+.table thead tr th:first-child,
+.table tbody tr td:first-child {
+  border-left: none;
 }
-.pagination  > ul {
+.table th,
+.table-striped tbody tr:nth-child(odd) th {
   background-color: #748c73;
-  background-image: none;
-  border-color: transparent;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.pagination a {
-  color: #ebd90b;
-  border-color: transparent;
-}
-.pagination a:hover {
-  color: #ebd90b;
-  background-color: rgba(0, 0, 0, 0.1);
-}
-.pagination .active a {
   color: #f5f3dc;
-  background-color: rgba(0, 0, 0, 0.1);
-}
-.pagination .disabled a,
-.pagination .disabled a:hover {
-  color: #01584c;
-}
-.nav-list li > a,
-.nav-list .nav-header {
-  text-shadow: none;
-}
-.nav-list li > a:hover {
-  background-color: transparent;
-}
-.nav-list li.active > a,
-.nav-list li.active > a:hover {
-  background-color: #A2CDB5;
-  text-shadow: none;
-}
-.nav-list .divider {
-  background-color: transparent;
-  border-bottom: 1px solid #f5f3dc;
-}
-.nav-tabs {
-  border-color: transparent;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  background-color: #748C73;
-}
-.nav-tabs > li > a:hover,
-.nav-pills > li > a:hover {
-  background-color: #748C73;
-  border-color: transparent;
-}
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
-  background-color: #A2CDB5;
-  border-color: transparent;
-  color: #01584c;
-}
-.nav-tabs.nav-stacked > li > a {
-  border-color: transparent;
-}
-.nav-tabs.nav-stacked > li > a:hover {
-  border-color: transparent;
-}
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle {
-  background-color: #748C73;
-  border-color: transparent;
-  color: #ebd90b;
-}
-.nav-tabs .active.open .dropdown-toggle,
-.nav-pills .active.open .dropdown-toggle {
-  background-color: #A2CDB5;
-}
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
-  background-color: #f5f3dc;
-  color: #013435;
-  border-color: transparent;
-}
-.nav-tabs .dropdown-menu a:hover,
-.nav-pills .dropdown-menu a:hover {
-  background-color: #A2CDB5;
-  color: #f5f3dc;
-}
-.nav .nav-header {
-  color: #01584c;
-}
-.tabbable .nav-tabs,
-.tabbable .nav-tabs > li > a,
-.tabbable .nav-tabs > li > a:hover,
-.tabbable .nav-tabs > li.active > a,
-.tabbable .nav-tabs > li.active > a:hover {
-  border-color: transparent;
-}
-.pager a {
-  border: none;
-  background-color: #748C73;
-}
-.pager a:hover {
-  background-color: #687D67;
-}
-.pager .disabled a,
-.pager .disabled a:hover {
-  background-color: #748C73;
-  color: #013435;
 }
 legend {
+  font-family: 'Josefin Slab', serif;
+  font-weight: 700;
   color: #f5f3dc;
 }
 label,
@@ -5354,31 +5360,14 @@ legend {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.modal-header {
-  padding: 12px 15px 6px;
-  background-color: #015b4e;
-}
-.modal-body,
-.modal-footer {
-  background-color: #f5f3dc;
-  border: none;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.modal-body label,
-.modal-footer label {
-  color: #013435;
-}
-.modal-footer {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
-}
 .alert {
   text-shadow: none;
   border: none;
 }
+.alert-heading {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: inherit;
+}
 .badge,
 .label {
   background-color: #01584c;
@@ -5404,10 +5393,6 @@ legend {
 .label-inverse {
   background-color: #ebd90b;
 }
-.progress {
-  background-color: #748c73;
-  background-image: none;
-}
 .well {
   border: none;
   -webkit-box-shadow: none;
@@ -5425,13 +5410,30 @@ legend {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-hr {
-  border-top: none;
-  border-bottom: 2px solid #f5f3dc;
+.progress {
+  background-color: #748c73;
+  background-image: none;
 }
-.page-header {
-  border-bottom: 2px solid #f5f3dc;
-  padding-bottom: 5px;
+.modal-header {
+  padding: 12px 15px 6px;
+  background-color: #015b4e;
+}
+.modal-body,
+.modal-footer {
+  background-color: #f5f3dc;
+  border: none;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.modal-body label,
+.modal-footer label {
+  color: #013435;
+}
+.modal-footer {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
 }
 .pull-right {
   float: right;
diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
index a827331e..cd6777d1 100644
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.css
@@ -801,24 +801,23 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .show{display:block;}
 .invisible{visibility:hidden;}
 .affix{position:fixed;}
-.navbar .brand,legend,.btn,.navbar .nav>li>a,div.subnav li>a,.navbar-text{font-family:'Josefin Slab',serif;font-weight:700;}
 h1{font-size:54px;line-height:1.2em;color:#ebd90b;}
 h2{font-size:48px;}
 h3{font-size:36px;}
 h4{font-size:24px;}
 h5{font-size:20px;}
 h1>small,h2>small,h3>small,h4>small,h5>small,h6>small,.muted{color:#f5f3dc;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
-.alert-heading{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;color:inherit;}
-body{background-size:100% 1400px;background-repeat:repeat-y;}
+code,pre{color:#026567;background-color:#f5f3dc;}
+.page-header{border-bottom:2px solid #f5f3dc;padding-bottom:5px;}.page-header h1{margin-bottom:0;}
+hr{border-top:none;border-bottom:2px solid #f5f3dc;}
 blockquote{border-left:2px solid #f5f3dc;}blockquote.pull-right{border-right:2px solid #f5f3dc;}
 blockquote small{color:#013435;}
-code,pre{color:#026567;background-color:#f5f3dc;}
 .navbar .navbar-inner{background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.navbar .brand{font-size:26px;padding:18px 20px 12px;}
-.navbar .nav>li>a{font-size:20px;padding:20px 20px 10px;}
+.navbar .brand{padding:18px 20px 12px;font-size:26px;font-family:'Josefin Slab',serif;font-weight:700;}
+.navbar .nav>li>a{padding:20px 20px 10px;font-size:20px;font-family:'Josefin Slab',serif;font-weight:700;}
 .navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ebd90b;}
 .navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.navbar .navbar-text{margin:19px 20px 0;font-size:20px;line-height:inherit;}
+.navbar .navbar-text{margin:19px 20px 0;font-size:20px;font-family:'Josefin Slab',serif;font-weight:700;line-height:inherit;}
 .navbar .divider-vertical{border-color:rgba(0, 0, 0, 0.2);}
 .navbar .navbar-search{margin-top:12px;}
 .navbar .navbar-search .search-query{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:#ffffff;}
@@ -828,45 +827,13 @@ code,pre{color:#026567;background-color:#f5f3dc;}
 .navbar .btn-navbar{margin-top:14px;}
 .navbar .nav-collapse.in .nav li>a{color:#f5f3dc;}.navbar .nav-collapse.in .nav li>a:hover{color:#ebd90b;background-color:#01584c;}
 .navbar .navbar-form,.navbar .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;color:#f5f3dc;}
+div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;}
 div.subnav .nav>li+li>a{border-color:transparent;}
 div.subnav .nav>li.active>a,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;border-color:transparent;color:#ebd90b;}
 div.subnav .dropdown.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;}
 div.subnav .dropdown.open>.dropdown-menu a:hover{background-color:#748c73;color:#f5f3dc;}
 div.subnav.subnav-fixed{top:50px;}
-.table,.table.table-bordered,.table.table-striped{-webkit-border-radius:0 0 8px 8px;-moz-border-radius:0 0 8px 8px;border-radius:0 0 8px 8px;}
-.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child,.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.table-striped tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 8px;-moz-border-radius:0 0 0 8px;border-radius:0 0 0 8px;}
-.table-striped tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 8px 0;-moz-border-radius:0 0 8px 0;border-radius:0 0 8px 0;}
-.table-bordered{border:none;}
-.table thead tr th:first-child,.table tbody tr td:first-child{border-left:none;}
-.table th,.table-striped tbody tr:nth-child(odd) th{background-color:#748c73;color:#f5f3dc;}
-.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#014344;background-image:-moz-linear-gradient(top, #014d4e, #013435);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#014d4e), to(#013435));background-image:-webkit-linear-gradient(top, #014d4e, #013435);background-image:-o-linear-gradient(top, #014d4e, #013435);background-image:linear-gradient(to bottom, #014d4e, #013435);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff014d4e', endColorstr='#ff013435', GradientType=0);border-color:#013435 #013435 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#013435;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);text-shadow:none;color:#ffffff;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#013435;*background-color:#011b1c;}
-.btn:active,.btn.active{background-color:#000303 \9;}
-.btn:hover{color:#eeeeee;}
-.btn-large{font-size:18px;}
-.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#01806f;background-image:-moz-linear-gradient(top, #028a78, #017162);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162));background-image:-webkit-linear-gradient(top, #028a78, #017162);background-image:-o-linear-gradient(top, #028a78, #017162);background-image:linear-gradient(to bottom, #028a78, #017162);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0);border-color:#017162 #017162 #002620;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#017162;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#017162;*background-color:#01584c;}
-.btn-primary:active,.btn-primary.active{background-color:#013f36 \9;}
-.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ec6a1e;background-image:-moz-linear-gradient(top, #ee7026, #e86112);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee7026), to(#e86112));background-image:-webkit-linear-gradient(top, #ee7026, #e86112);background-image:-o-linear-gradient(top, #ee7026, #e86112);background-image:linear-gradient(to bottom, #ee7026, #e86112);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee7026', endColorstr='#ffe86112', GradientType=0);border-color:#e86112 #e86112 #a1440d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e86112;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#e86112;*background-color:#d15710;}
-.btn-warning:active,.btn-warning.active{background-color:#b94e0e \9;}
-.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d44f3e;background-image:-moz-linear-gradient(top, #d65747, #d14432);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432));background-image:-webkit-linear-gradient(top, #d65747, #d14432);background-image:-o-linear-gradient(top, #d65747, #d14432);background-image:linear-gradient(to bottom, #d65747, #d14432);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0);border-color:#d14432 #d14432 #952f21;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d14432;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#d14432;*background-color:#bf3c2b;}
-.btn-danger:active,.btn-danger.active{background-color:#aa3526 \9;}
-.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;}
-.btn-success:active,.btn-success.active{background-color:#408140 \9;}
-.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;}
-.btn-info:active,.btn-info.active{background-color:#24748c \9;}
-.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e1d00b;background-image:-moz-linear-gradient(top, #ebd90b, #d3c30a);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a));background-image:-webkit-linear-gradient(top, #ebd90b, #d3c30a);background-image:-o-linear-gradient(top, #ebd90b, #d3c30a);background-image:linear-gradient(to bottom, #ebd90b, #d3c30a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0);border-color:#d3c30a #d3c30a #8a7f06;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d3c30a;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#d3c30a;*background-color:#baac09;}
-.btn-inverse:active,.btn-inverse.active{background-color:#a29608 \9;}
-.btn-group .dropdown-toggle{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .nav .disabled>a{color:#ccc;}.nav .disabled>a:hover{background-color:#748C73;}
-.breadcrumb{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.breadcrumb li{color:#ebd90b;text-shadow:none;}.breadcrumb li a{color:#ebd90b;}
-.breadcrumb li a:hover{color:#ebd90b;}
-.breadcrumb li .divider{color:#f5f3dc;}
-.breadcrumb .active{color:#f5f3dc;}
-.pagination >ul{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination a{color:#ebd90b;border-color:transparent;}.pagination a:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);}
-.pagination .active a{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);}
-.pagination .disabled a,.pagination .disabled a:hover{color:#01584c;}
 .nav-list li>a,.nav-list .nav-header{text-shadow:none;}
 .nav-list li>a:hover{background-color:transparent;}
 .nav-list li.active>a,.nav-list li.active>a:hover{background-color:#A2CDB5;text-shadow:none;}
@@ -880,28 +847,59 @@ div.subnav.subnav-fixed{top:50px;}
 .nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;}.nav-tabs .dropdown-menu a:hover,.nav-pills .dropdown-menu a:hover{background-color:#A2CDB5;color:#f5f3dc;}
 .nav .nav-header{color:#01584c;}
 .tabbable .nav-tabs,.tabbable .nav-tabs>li>a,.tabbable .nav-tabs>li>a:hover,.tabbable .nav-tabs>li.active>a,.tabbable .nav-tabs>li.active>a:hover{border-color:transparent;}
+.breadcrumb{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.breadcrumb li{color:#ebd90b;text-shadow:none;}.breadcrumb li a{color:#ebd90b;}
+.breadcrumb li a:hover{color:#ebd90b;}
+.breadcrumb li .divider{color:#f5f3dc;}
+.breadcrumb .active{color:#f5f3dc;}
+.pagination >ul{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.pagination a{color:#ebd90b;border-color:transparent;}.pagination a:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);}
+.pagination .active a{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);}
+.pagination .disabled a,.pagination .disabled a:hover{color:#01584c;}
 .pager a{border:none;background-color:#748C73;}.pager a:hover{background-color:#687D67;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#748C73;color:#013435;}
-legend{color:#f5f3dc;}
+.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#014344;background-image:-moz-linear-gradient(top, #014d4e, #013435);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#014d4e), to(#013435));background-image:-webkit-linear-gradient(top, #014d4e, #013435);background-image:-o-linear-gradient(top, #014d4e, #013435);background-image:linear-gradient(to bottom, #014d4e, #013435);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff014d4e', endColorstr='#ff013435', GradientType=0);border-color:#013435 #013435 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#013435;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);font-family:'Josefin Slab',serif;font-weight:700;color:#ffffff;text-shadow:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#013435;*background-color:#011b1c;}
+.btn:active,.btn.active{background-color:#000303 \9;}
+.btn:hover{color:#eeeeee;}
+.btn-large{font-size:18px;}
+.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#01806f;background-image:-moz-linear-gradient(top, #028a78, #017162);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162));background-image:-webkit-linear-gradient(top, #028a78, #017162);background-image:-o-linear-gradient(top, #028a78, #017162);background-image:linear-gradient(to bottom, #028a78, #017162);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0);border-color:#017162 #017162 #002620;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#017162;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#017162;*background-color:#01584c;}
+.btn-primary:active,.btn-primary.active{background-color:#013f36 \9;}
+.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ec6a1e;background-image:-moz-linear-gradient(top, #ee7026, #e86112);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee7026), to(#e86112));background-image:-webkit-linear-gradient(top, #ee7026, #e86112);background-image:-o-linear-gradient(top, #ee7026, #e86112);background-image:linear-gradient(to bottom, #ee7026, #e86112);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee7026', endColorstr='#ffe86112', GradientType=0);border-color:#e86112 #e86112 #a1440d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e86112;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#e86112;*background-color:#d15710;}
+.btn-warning:active,.btn-warning.active{background-color:#b94e0e \9;}
+.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d44f3e;background-image:-moz-linear-gradient(top, #d65747, #d14432);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432));background-image:-webkit-linear-gradient(top, #d65747, #d14432);background-image:-o-linear-gradient(top, #d65747, #d14432);background-image:linear-gradient(to bottom, #d65747, #d14432);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0);border-color:#d14432 #d14432 #952f21;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d14432;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#d14432;*background-color:#bf3c2b;}
+.btn-danger:active,.btn-danger.active{background-color:#aa3526 \9;}
+.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e1d00b;background-image:-moz-linear-gradient(top, #ebd90b, #d3c30a);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a));background-image:-webkit-linear-gradient(top, #ebd90b, #d3c30a);background-image:-o-linear-gradient(top, #ebd90b, #d3c30a);background-image:linear-gradient(to bottom, #ebd90b, #d3c30a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0);border-color:#d3c30a #d3c30a #8a7f06;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d3c30a;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#d3c30a;*background-color:#baac09;}
+.btn-inverse:active,.btn-inverse.active{background-color:#a29608 \9;}
+.btn-group .dropdown-toggle{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.table,.table.table-bordered,.table.table-striped{-webkit-border-radius:0 0 8px 8px;-moz-border-radius:0 0 8px 8px;border-radius:0 0 8px 8px;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child,.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.table-striped tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 8px;-moz-border-radius:0 0 0 8px;border-radius:0 0 0 8px;}
+.table-striped tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 8px 0;-moz-border-radius:0 0 8px 0;border-radius:0 0 8px 0;}
+.table-bordered{border:none;}
+.table thead tr th:first-child,.table tbody tr td:first-child{border-left:none;}
+.table th,.table-striped tbody tr:nth-child(odd) th{background-color:#748c73;color:#f5f3dc;}
+legend{font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;}
 label,.help-block,input[type="file"]{color:#f5f3dc;}
 input,textarea,select{color:#013435;}
 .uneditable-input{color:#555555;}
 legend{border-bottom:2px solid #ffffff;}
 .form-actions{border-top:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.modal-header{padding:12px 15px 6px;background-color:#015b4e;}
-.modal-body,.modal-footer{background-color:#f5f3dc;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#013435;}
-.modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
 .alert{text-shadow:none;border:none;}
+.alert-heading{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;color:inherit;}
 .badge,.label{background-color:#01584c;text-shadow:none;}.badge-success,.label-success{background-color:#24c00b;}
 .badge-warning,.label-warning{background-color:#ee7026;}
 .badge-important,.label-important{background-color:#d14432;}
 .badge-info,.label-info{background-color:#185af9;}
 .badge-inverse,.label-inverse{background-color:#ebd90b;}
-.progress{background-color:#748c73;background-image:none;}
 .well{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .thumbnail{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.thumbnail img{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-hr{border-top:none;border-bottom:2px solid #f5f3dc;}
-.page-header{border-bottom:2px solid #f5f3dc;padding-bottom:5px;}
+.progress{background-color:#748c73;background-image:none;}
+.modal-header{padding:12px 15px 6px;background-color:#015b4e;}
+.modal-body,.modal-footer{background-color:#f5f3dc;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#013435;}
+.modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
 .pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index 1bbc5a0a..24235df7 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -8,14 +8,6 @@
 
 @import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700');
 
-.navbar .brand, legend, .btn,
-.navbar .nav > li > a,
-div.subnav li > a,
-.navbar-text  {
-	font-family: @headingsFontFamily;
-	font-weight: @headingsFontWeight;
-}
-
 h1 {
 	font-size: 54px;
 	line-height: 1.2em;
@@ -27,23 +19,43 @@ h3 { font-size: 36px; }
 h4 { font-size: 24px; }
 h5 { font-size: 20px; }
 
-h1 > small, h2 > small, h3 > small, h4 > small, h5 > small, h6 > small, .muted {
+h1 > small,
+h2 > small,
+h3 > small,
+h4 > small,
+h5 > small,
+h6 > small,
+.muted {
 	color: @headingsColor;
 	font-family: @baseFontFamily;
 }
 
-.alert-heading {
-	font-family: @baseFontFamily;
-	color: inherit;
+code, pre {
+	color: lighten(@blueDark, 10%);
+	background-color: @headingsColor;
 }
 
 // SCAFFOLDING
 // --------------------------------------------------
 
-body {
-	// #gradient > .vertical-three-colors (#90A38F, #AEAD8E, 60%, #90A38F);
-	background-size: 100% 1400px;
-	background-repeat: repeat-y;
+// body {
+// 	#gradient > .vertical-three-colors (#90A38F, #AEAD8E, 60%, #90A38F);
+// 	background-size: 100% 1400px;
+// 	background-repeat: repeat-y;
+// }
+
+.page-header {
+	border-bottom: 2px solid @headingsColor;
+	padding-bottom: 5px;
+
+	h1 {
+		margin-bottom: 0;
+	}
+}
+
+hr {
+	border-top: none;
+	border-bottom: 2px solid @headingsColor;
 }
 
 blockquote {
@@ -58,11 +70,6 @@ blockquote {
 	}
 }
 
-code, pre {
-	color: lighten(@blueDark, 10%);
-	background-color: @headingsColor;
-}
-
 // NAVBAR
 // --------------------------------------------------
 
@@ -74,13 +81,17 @@ code, pre {
 	}
 
 	.brand {
-		font-size: 26px;
 		padding: 18px 20px 12px;
+		font-size: 26px;
+		font-family: @headingsFontFamily;
+		font-weight: @headingsFontWeight;
 	}
 
 	.nav > li > a {
-		font-size: 20px;
 		padding: 20px 20px 10px;
+		font-size: 20px;
+		font-family: @headingsFontFamily;
+		font-weight: @headingsFontWeight;
 	}
 
 	.nav .active > a,
@@ -97,6 +108,8 @@ code, pre {
 	.navbar-text {
 		margin: 19px 20px 0;
 		font-size: 20px;
+		font-family: @headingsFontFamily;
+		font-weight: @headingsFontWeight;
 		line-height: inherit;
 	}
 
@@ -159,6 +172,8 @@ div.subnav {
 		padding: 13px 12px 9px;
 		border-color: transparent;
 		background-color: transparent;
+		font-family: @headingsFontFamily;
+		font-weight: @headingsFontWeight;
 		color: @headingsColor;
 	}
 
@@ -193,103 +208,109 @@ div.subnav {
 	}
 }
 
-// TABLES
+// NAV
 // --------------------------------------------------
 
-.table,
-.table.table-bordered,
-.table.table-striped {
-	.border-radius(0 0 8px 8px);
-}
+.nav {
+	.disabled > a {
 
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child,
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child {
-	.border-radius(0);
-}
+		color: #ccc;
 
-.table-striped tbody:last-child tr:last-child td:first-child {
-	.border-radius(0 0 0 8px);
+		&:hover {
+			background-color: #748C73;
+		}
+	}
 }
 
-.table-striped tbody:last-child tr:last-child td:last-child {
-	.border-radius(0 0 8px 0);
-}
+.nav-list {
 
-.table-bordered {
-	border: none;
-}
+	li > a,
+	.nav-header {
+		text-shadow: none;
+	}
 
-.table thead tr th:first-child,
-.table tbody tr td:first-child {
-	border-left: none;
-}
+	li > a:hover {
+		background-color: transparent;
+	}
 
-.table th,
-.table-striped tbody tr:nth-child(odd) th {
-	background-color: darken(#90A38F, 10%);
-	color: @headingsColor;
-}
+	li.active > a,
+	li.active > a:hover {
+		background-color: #A2CDB5;
+		text-shadow: none;
+	}
 
-// BUTTONS
-// --------------------------------------------------
+	.divider {
+		background-color: transparent;
+		border-bottom: 1px solid @headingsColor;
+	}
+}
 
-.btn {
-  .buttonBackground(lighten(@blueDark, 5%), @blueDark);
-    text-shadow: none;
-    color: @white;
+.nav-tabs {
 	border-color: transparent;
-	.box-shadow(none);
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+	background-color: #748C73;
 
 	&:hover {
-		color: @grayLighter;
+		background-color: #748C73;
+		border-color: transparent;
 	}
 }
 
-.btn-large {
-	font-size: 18px;
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
+	background-color: #A2CDB5;
+	border-color: transparent;
+	color: @blue;
 }
 
-.btn-primary {
-	.buttonBackground(lighten(@blue, 10%), lighten(@blue, 5%));
-}
+.nav-tabs.nav-stacked > li > a {
+	border-color: transparent;
 
-.btn-warning {
-  .buttonBackground(@orange, darken(@orange, 5%));
+	&:hover {
+		border-color: transparent;
+	}
 }
 
-.btn-danger {
-  .buttonBackground(lighten(@red, 5%), @red);
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle  {
+	background-color: #748C73;
+	border-color: transparent;
+	color: @yellow;
 }
 
-.btn-success {
-  .buttonBackground(#62c462, #51a351);
+.nav-tabs .active.open .dropdown-toggle,
+.nav-pills .active.open .dropdown-toggle {
+	background-color: #A2CDB5;
 }
 
-.btn-info {
-  .buttonBackground(#5bc0de, #2f96b4);
-}
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
+	background-color: @headingsColor;
+	color: @textColor;
+	border-color: transparent;
 
-.btn-inverse {
-  .buttonBackground(@yellow, darken(@yellow, 5%));
+	a:hover {
+		background-color: #A2CDB5;
+		color: @headingsColor;
+	}
 }
 
-.btn-group .dropdown-toggle {
-	.box-shadow(none);
+.nav .nav-header {
+	color: @blue;
 }
 
-// NAVIGATION
-// --------------------------------------------------
-
-.nav {
-	.disabled > a {
-
-		color: #ccc;
-
-		&:hover {
-			background-color: #748C73;
-		}
+.tabbable {
+	.nav-tabs,
+	.nav-tabs > li > a,
+	.nav-tabs > li > a:hover,
+	.nav-tabs > li.active > a,
+	.nav-tabs > li.active > a:hover  {
+		border-color: transparent;
 	}
 }
 
@@ -351,120 +372,118 @@ div.subnav {
 	}
 }
 
-.nav-list {
+.pager {
 
-	li > a,
-	.nav-header {
-		text-shadow: none;
-	}
+	a {
+		border: none;
+		background-color: #748C73;
 
-	li > a:hover {
-		background-color: transparent;
+		&:hover {
+			background-color: #687D67;
+		}
 	}
 
-	li.active > a,
-	li.active > a:hover {
-		background-color: #A2CDB5;
-		text-shadow: none;
+	.disabled a,
+	.disabled a:hover {
+		background-color: #748C73;
+		color: @textColor;
 	}
+}
 
-	.divider {
-		background-color: transparent;
-		border-bottom: 1px solid @headingsColor;
+// BUTTONS
+// --------------------------------------------------
+
+.btn {
+	.buttonBackground(lighten(@blueDark, 5%), @blueDark);
+	font-family: @headingsFontFamily;
+	font-weight: @headingsFontWeight;
+    color: @white;
+    text-shadow: none;
+	border-color: transparent;
+	.box-shadow(none);
+
+	&:hover {
+		color: @grayLighter;
 	}
 }
 
-.nav-tabs {
-	border-color: transparent;
+.btn-large {
+	font-size: 18px;
 }
 
-.nav-tabs > li > a,
-.nav-pills > li > a {
-	background-color: #748C73;
+.btn-primary {
+	.buttonBackground(lighten(@blue, 10%), lighten(@blue, 5%));
+}
 
-	&:hover {
-		background-color: #748C73;
-		border-color: transparent;
-	}
+.btn-warning {
+  .buttonBackground(@orange, darken(@orange, 5%));
 }
 
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
-	background-color: #A2CDB5;
-	border-color: transparent;
-	color: @blue;
+.btn-danger {
+  .buttonBackground(lighten(@red, 5%), @red);
 }
 
-.nav-tabs.nav-stacked > li > a {
-	border-color: transparent;
+.btn-success {
+  .buttonBackground(#62c462, #51a351);
+}
 
-	&:hover {
-		border-color: transparent;
-	}
+.btn-info {
+  .buttonBackground(#5bc0de, #2f96b4);
 }
 
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle  {
-	background-color: #748C73;
-	border-color: transparent;
-	color: @yellow;
+.btn-inverse {
+  .buttonBackground(@yellow, darken(@yellow, 5%));
 }
 
-.nav-tabs .active.open .dropdown-toggle,
-.nav-pills .active.open .dropdown-toggle {
-	background-color: #A2CDB5;
+.btn-group .dropdown-toggle {
+	.box-shadow(none);
 }
 
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
-	background-color: @headingsColor;
-	color: @textColor;
-	border-color: transparent;
+// TABLES
+// --------------------------------------------------
 
-	a:hover {
-		background-color: #A2CDB5;
-		color: @headingsColor;
-	}
+.table,
+.table.table-bordered,
+.table.table-striped {
+	.border-radius(0 0 8px 8px);
 }
 
-.nav .nav-header {
-	color: @blue;
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child,
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
+	.border-radius(0);
 }
 
-.tabbable {
-	.nav-tabs,
-	.nav-tabs > li > a,
-	.nav-tabs > li > a:hover,
-	.nav-tabs > li.active > a,
-	.nav-tabs > li.active > a:hover  {
-		border-color: transparent;
-	}
+.table-striped tbody:last-child tr:last-child td:first-child {
+	.border-radius(0 0 0 8px);
 }
 
-.pager {
+.table-striped tbody:last-child tr:last-child td:last-child {
+	.border-radius(0 0 8px 0);
+}
 
-	a {
-		border: none;
-		background-color: #748C73;
+.table-bordered {
+	border: none;
+}
 
-		&:hover {
-			background-color: #687D67;
-		}
-	}
+.table thead tr th:first-child,
+.table tbody tr td:first-child {
+	border-left: none;
+}
 
-	.disabled a,
-	.disabled a:hover {
-		background-color: #748C73;
-		color: @textColor;
-	}
+.table th,
+.table-striped tbody tr:nth-child(odd) th {
+	background-color: darken(#90A38F, 10%);
+	color: @headingsColor;
 }
 
 // FORMS
 // --------------------------------------------------
 
 legend {
+	font-family: @headingsFontFamily;
+	font-weight: @headingsFontWeight;
 	color: @headingsColor;
 }
 
@@ -489,30 +508,7 @@ legend {
 	.border-radius(4px);
 }
 
-// MODALS
-// --------------------------------------------------
-
-.modal-header {
-	padding: 12px 15px 6px;
-	background-color: @green;
-}
-
-.modal-body,
-.modal-footer {
-	background-color: @headingsColor;
-	border: none;
-	.box-shadow(none);
-
-	label {
-		color: @textColor;
-	}
-}
-
-.modal-footer {
-	.border-radius(0 0 4px 4px);
-}
-
-// MISCELLANEOUS
+// ALERTS, LABELS, BADGES
 // --------------------------------------------------
 
 .alert {
@@ -520,6 +516,11 @@ legend {
 	border: none;
 }
 
+.alert-heading {
+	font-family: @baseFontFamily;
+	color: inherit;
+}
+
 .badge,
 .label {
 
@@ -547,10 +548,8 @@ legend {
 	}
 }
 
-.progress {
-	background-color: darken(#90A38F, 10%);
-	background-image: none;
-}
+// MISC
+// --------------------------------------------------
 
 .well {
 	border: none;
@@ -566,12 +565,33 @@ legend {
 	}
 }
 
-hr {
-	border-top: none;
-	border-bottom: 2px solid @headingsColor;
+.progress {
+	background-color: darken(#90A38F, 10%);
+	background-image: none;
 }
 
-.page-header {
-	border-bottom: 2px solid @headingsColor;
-	padding-bottom: 5px;
+.modal {
+
+	&-header {
+		padding: 12px 15px 6px;
+		background-color: @green;
+	}
+
+	&-body,
+	&-footer {
+		background-color: @headingsColor;
+		border: none;
+		.box-shadow(none);
+
+		label {
+			color: @textColor;
+		}
+	}
+
+	&-footer {
+		.border-radius(0 0 4px 4px);
+	}
 }
+
+// MEDIA QUERIES
+// --------------------------------------------------
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css
index d927f010..d72d4f41 100644
--- a/superhero/bootstrap.css
+++ b/superhero/bootstrap.css
@@ -4751,21 +4751,19 @@ a.badge:hover {
 .affix {
   position: fixed;
 }
-h6,
-legend,
 h1 small,
 h2 small,
 h3 small,
 h4 small,
 h5 small,
-h6 small {
+h6 small,
+h6 {
   font-family: 'Oswald', sans-serif;
   color: #e36b23;
   text-shadow: -1px 1px 0 #612c0c;
 }
 h1,
-h2,
-legend {
+h2 {
   text-shadow: -2px 2px 0 #612c0c;
 }
 h1 {
@@ -4777,9 +4775,8 @@ pre {
   border: none;
   color: #ece9d7;
 }
-.prettyprint {
-  border: none;
-  text-decoration: none;
+.page-header {
+  border-bottom: none;
 }
 blockquote {
   border-left: 5px solid #45515f;
@@ -4893,13 +4890,6 @@ blockquote.pull-right {
   background-color: #5a6a7d;
   background-image: none;
 }
-.dropdown .caret {
-  margin-top: 14px;
-  opacity: 1;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-top: 6px solid #5a6a7d;
-}
 div.subnav {
   background-color: #45515f;
   background-image: none;
@@ -4960,30 +4950,120 @@ div.subnav .nav > .active > a .caret,
 div.subnav .nav > .active > a:hover .caret {
   border-top-color: #ece9d7;
 }
-@media (max-width: 768px) {
-  div.subnav .nav > li:first-child > a,
-  div.subnav .nav > li:first-child > a:hover,
-  div.subnav .nav > li.active:first-child > a,
-  div.subnav .nav > li.active:first-child > a:hover {
-    -webkit-border-radius: 4px 4px 0 0;
-    -moz-border-radius: 4px 4px 0 0;
-    border-radius: 4px 4px 0 0;
-  }
-  div.subnav .nav > li:last-child > a,
-  div.subnav .nav > li:last-child > a:hover,
-  div.subnav .nav > li.active:last-child > a,
-  div.subnav .nav > li.active:last-child > a:hover {
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 4px;
-  }
+.nav .nav-header {
+  color: #ece9d7;
+  text-shadow: none;
 }
-.table,
-.table-striped tbody > tr > td:first-child,
-.table-striped tbody > tr > td:last-child {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+.nav-list {
+  padding: 0 15px;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+  text-shadow: none;
+  color: #ece9d7;
+}
+.nav-list .active > a,
+.nav-list .active > a:hover {
+  text-shadow: none;
+  color: #ffffff;
+}
+.nav-list li > a:hover {
+  background-color: #5a6a7d;
+}
+.nav-tabs,
+.nav-tabs.nav-stacked > li > a {
+  border-color: transparent;
+}
+.nav-tabs > li > a {
+  background-color: #45515f;
+  color: #ece9d7;
+}
+.nav-tabs li.active > a,
+.nav-tabs li.active > a:hover,
+.nav-tabs.nav-stacked > li.active > a:hover {
+  color: #ffffff;
+  background-color: #e36b23;
+  border-color: transparent;
+}
+.nav-tabs li > a:hover,
+.nav-tabs.nav-stacked > li > a:hover {
+  background-color: #5a6a7d;
+  border-color: transparent;
+}
+.nav-pills > li > a {
+  color: #ece9d7;
+  background-color: #45515f;
+}
+.nav-pills > li:hover > a {
+  background-color: #5a6a7d;
+  border-color: transparent;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > .open.active > a:hover {
+  background-color: #5a6a7d;
+  border-color: transparent;
+}
+.nav-pills .dropdown .caret,
+.nav-pills .dropdown:hover .caret {
+  border-top-color: #ece9d7;
+}
+.dropdown.open .dropdown-menu > li > a:hover,
+.dropdown.open .dropdown-menu > li.active > a:hover {
+  background-color: #e36b23;
+  color: #ffffff;
+}
+.tabbable .nav-tabs,
+.tabbable .nav-tabs > li.active > a,
+.tabbable .nav-tabs > li > a:hover,
+.tabbable .nav-tabs > li.active > a:hover {
+  border-color: transparent;
+}
+.breadcrumb {
+  background-color: #45515f;
+  background-image: none;
+  border: none;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.breadcrumb li {
+  text-shadow: none;
+}
+.breadcrumb .divider {
+  color: #ece9d7;
+}
+.pagination ul {
+  background-image: none;
+  border-color: transparent;
+}
+.pagination li > a {
+  border: none;
+  color: #ece9d7;
+}
+.pagination li.active > a,
+.pagination li.active > a:hover {
+  background-color: #e36b23;
+  color: #ffffff;
+}
+.pagination li > a:hover {
+  background: #5a6a7d;
+}
+.pagination li.disabled > a,
+.pagination li.disabled > a:hover {
+  background: #3a4450;
+}
+.pager a {
+  color: #ece9d7;
+  background-color: #45515f;
+  border-color: transparent;
+}
+.pager a:hover {
+  background: #5a6a7d;
+}
+.pager .disabled a,
+.pager .disabled a:hover {
+  background-color: #45515f;
 }
 .btn,
 .btn:hover {
@@ -5099,120 +5179,12 @@ div.subnav .nav > .active > a:hover .caret {
 [class*=" icon-"] {
   vertical-align: -13%;
 }
-.nav .nav-header {
-  color: #ece9d7;
-  text-shadow: none;
-}
-.nav-list {
-  padding: 0 15px;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  text-shadow: none;
-  color: #ece9d7;
-}
-.nav-list .active > a,
-.nav-list .active > a:hover {
-  text-shadow: none;
-  color: #ffffff;
-}
-.nav-list li > a:hover {
-  background-color: #5a6a7d;
-}
-.nav-tabs,
-.nav-tabs.nav-stacked > li > a {
-  border-color: transparent;
-}
-.nav-tabs > li > a {
-  background-color: #45515f;
-  color: #ece9d7;
-}
-.nav-tabs li.active > a,
-.nav-tabs li.active > a:hover,
-.nav-tabs.nav-stacked > li.active > a:hover {
-  color: #ffffff;
-  background-color: #e36b23;
-  border-color: transparent;
-}
-.nav-tabs li > a:hover,
-.nav-tabs.nav-stacked > li > a:hover {
-  background-color: #5a6a7d;
-  border-color: transparent;
-}
-.nav-pills > li > a {
-  color: #ece9d7;
-  background-color: #45515f;
-}
-.nav-pills > li:hover > a {
-  background-color: #5a6a7d;
-  border-color: transparent;
-}
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > .open.active > a:hover {
-  background-color: #5a6a7d;
-  border-color: transparent;
-}
-.nav-pills .dropdown .caret,
-.nav-pills .dropdown:hover .caret {
-  border-top-color: #ece9d7;
-}
-.dropdown.open .dropdown-menu > li > a:hover,
-.dropdown.open .dropdown-menu > li.active > a:hover {
-  background-color: #e36b23;
-  color: #ffffff;
-}
-.tabbable .nav-tabs,
-.tabbable .nav-tabs > li.active > a,
-.tabbable .nav-tabs > li > a:hover,
-.tabbable .nav-tabs > li.active > a:hover {
-  border-color: transparent;
-}
-.breadcrumb {
-  background-color: #45515f;
-  background-image: none;
-  border: none;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.breadcrumb li {
-  text-shadow: none;
-}
-.breadcrumb .divider {
-  color: #ece9d7;
-}
-.pagination ul {
-  background-image: none;
-  border-color: transparent;
-}
-.pagination li > a {
-  border: none;
-  color: #ece9d7;
-}
-.pagination li.active > a,
-.pagination li.active > a:hover {
-  background-color: #e36b23;
-  color: #ffffff;
-}
-.pagination li > a:hover {
-  background: #5a6a7d;
-}
-.pagination li.disabled > a,
-.pagination li.disabled > a:hover {
-  background: #3a4450;
-}
-.pager a {
-  color: #ece9d7;
-  background-color: #45515f;
-  border-color: transparent;
-}
-.pager a:hover {
-  background: #5a6a7d;
-}
-.pager .disabled a,
-.pager .disabled a:hover {
-  background-color: #45515f;
+.table,
+.table-striped tbody > tr > td:first-child,
+.table-striped tbody > tr > td:last-child {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
 }
 input,
 button,
@@ -5222,6 +5194,9 @@ textarea {
 }
 legend {
   border-bottom: none;
+  font-family: 'Oswald', sans-serif;
+  color: #e36b23;
+  text-shadow: -2px 2px 0 #612c0c;
 }
 label {
   color: #ece9d7;
@@ -5336,30 +5311,50 @@ label {
 .input-prepend .btn {
   color: #2a333c;
 }
-.modal {
-  background-color: transparent;
+.dropdown .caret {
+  margin-top: 14px;
+  opacity: 1;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-top: 6px solid #5a6a7d;
 }
-.modal-header,
-.modal-body,
-.modal-footer {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  background-color: #2a333c;
+.label {
+  background-color: #45515f;
+  color: #ece9d7;
+}
+.label-important {
+  background-color: #b94a48;
+}
+.label-warning {
+  background-color: #e36b23;
+}
+.label-success {
+  background-color: #468847;
+}
+.label-info {
+  background-color: #3a87ad;
+}
+.alert {
+  background-color: #45515f;
   border: none;
+  color: #ece9d7;
+  text-shadow: none;
 }
-.modal-header {
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
+.alert a {
+  color: #ea9059;
 }
-.modal-footer {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius: 0 0 4px 4px;
-  border-radius: 0 0 4px 4px;
+.alert .alert-heading {
+  color: #e36b23;
 }
-.page-header {
-  border-bottom: none;
+.alert-success {
+  background-color: #468847;
+}
+.alert-danger,
+.alert-error {
+  background-color: #b94a48;
+}
+.alert-info {
+  background-color: #3a87ad;
 }
 .well,
 .hero-unit {
@@ -5391,43 +5386,45 @@ label {
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-.label {
-  background-color: #45515f;
-  color: #ece9d7;
-}
-.label-important {
-  background-color: #b94a48;
-}
-.label-warning {
-  background-color: #e36b23;
-}
-.label-success {
-  background-color: #468847;
-}
-.label-info {
-  background-color: #3a87ad;
+.modal {
+  background-color: transparent;
 }
-.alert {
-  background-color: #45515f;
+.modal-header,
+.modal-body,
+.modal-footer {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  background-color: #2a333c;
   border: none;
-  color: #ece9d7;
-  text-shadow: none;
 }
-.alert a {
-  color: #ea9059;
-}
-.alert .alert-heading {
-  color: #e36b23;
-}
-.alert-success {
-  background-color: #468847;
+.modal-header {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
 }
-.alert-danger,
-.alert-error {
-  background-color: #b94a48;
+.modal-footer {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
 }
-.alert-info {
-  background-color: #3a87ad;
+@media (max-width: 768px) {
+  div.subnav .nav > li:first-child > a,
+  div.subnav .nav > li:first-child > a:hover,
+  div.subnav .nav > li.active:first-child > a,
+  div.subnav .nav > li.active:first-child > a:hover {
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
+  }
+  div.subnav .nav > li:last-child > a,
+  div.subnav .nav > li:last-child > a:hover,
+  div.subnav .nav > li.active:last-child > a,
+  div.subnav .nav > li.active:last-child > a:hover {
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 4px;
+  }
 }
 .pull-right {
   float: right;
diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css
index fbc27bcd..0a3bc22c 100644
--- a/superhero/bootstrap.min.css
+++ b/superhero/bootstrap.min.css
@@ -802,11 +802,11 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .show{display:block;}
 .invisible{visibility:hidden;}
 .affix{position:fixed;}
-h6,legend,h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:'Oswald',sans-serif;color:#e36b23;text-shadow:-1px 1px 0 #612c0c;}
-h1,h2,legend{text-shadow:-2px 2px 0 #612c0c;}
+h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h6{font-family:'Oswald',sans-serif;color:#e36b23;text-shadow:-1px 1px 0 #612c0c;}
+h1,h2{text-shadow:-2px 2px 0 #612c0c;}
 h1{line-height:55px;}
 code,pre{background-color:#566577;border:none;color:#ece9d7;}
-.prettyprint{border:none;text-decoration:none;}
+.page-header{border-bottom:none;}
 blockquote{border-left:5px solid #45515f;}
 blockquote.pull-right{border-right:5px solid #45515f;}
 .navbar .navbar-inner{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-image:none;}
@@ -827,7 +827,6 @@ blockquote.pull-right{border-right:5px solid #45515f;}
 .navbar .nav-collapse.collapse{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar .nav-collapse.collapse .nav-header{color:#ece9d7;}
 .navbar .nav-collapse.collapse .nav li>a{color:#e36b23;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#5a6a7d;background-image:none;}
-.dropdown .caret{margin-top:14px;opacity:1;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #5a6a7d;}
 div.subnav{background-color:#45515f;background-image:none;border:none;}div.subnav .nav>li>a,div.subnav .nav>li.active>a{border-left:none;border-right:none;color:#ece9d7;}
 div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover{background-color:#5a6a7d;}
 div.subnav .nav>li+li>a{border-top:0px solid transparent;}
@@ -836,25 +835,6 @@ div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{color:#ffffff;back
 div.subnav.subnav-fixed{top:70px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}div.subnav.subnav-fixed .nav>li>a,div.subnav.subnav-fixed .nav>li.active>a,div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a:hover{border-color:transparent;padding-left:12px;padding-right:12px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 div.subnav.subnav-fixed .nav>li>a:hover,div.subnav.subnav-fixed .nav>li.active>a:hover{color:#ffffff;}
 div.subnav .nav>.active>a .caret,div.subnav .nav>.active>a:hover .caret{border-top-color:#ece9d7;}
-@media (max-width:768px){div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover,div.subnav .nav>li.active:first-child>a,div.subnav .nav>li.active:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} div.subnav .nav>li:last-child>a,div.subnav .nav>li:last-child>a:hover,div.subnav .nav>li.active:last-child>a,div.subnav .nav>li.active:last-child>a:hover{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}}.table,.table-striped tbody>tr>td:first-child,.table-striped tbody>tr>td:last-child{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.btn,.btn:hover{text-shadow:none;background-image:none;-webkit-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);-moz-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);border:none;}
-.btn-warning{background-color:#e6c92e;}
-.btn-primary,.btn-primary:hover{-webkit-box-shadow:-2px 2px 0 #612c0c;-moz-box-shadow:-2px 2px 0 #612c0c;box-shadow:-2px 2px 0 #612c0c;}
-.btn-warning,.btn-warning:hover{-webkit-box-shadow:-2px 2px 0 #6e5f0d;-moz-box-shadow:-2px 2px 0 #6e5f0d;box-shadow:-2px 2px 0 #6e5f0d;}
-.btn-danger,.btn-danger:hover{-webkit-box-shadow:-2px 2px 0 #9f1411;-moz-box-shadow:-2px 2px 0 #9f1411;box-shadow:-2px 2px 0 #9f1411;}
-.btn-success,.btn-success:hover{-webkit-box-shadow:-2px 2px 0 #276627;-moz-box-shadow:-2px 2px 0 #276627;box-shadow:-2px 2px 0 #276627;}
-.btn-info,.btn-info:hover{-webkit-box-shadow:-2px 2px 0 #124a5b;-moz-box-shadow:-2px 2px 0 #124a5b;box-shadow:-2px 2px 0 #124a5b;}
-.btn-inverse,.btn-inverse:hover{-webkit-box-shadow:-2px 2px 0 #121212;-moz-box-shadow:-2px 2px 0 #121212;box-shadow:-2px 2px 0 #121212;}
-.btn.dropdown-toggle,.btn.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #333333;-moz-box-shadow:0 2px 0 #333333;box-shadow:0 2px 0 #333333;}
-.btn-primary.dropdown-toggle,.btn-primary.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #612c0c;-moz-box-shadow:0 2px 0 #612c0c;box-shadow:0 2px 0 #612c0c;}
-.btn-warning.dropdown-toggle,.btn-warning.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #6e5f0d;-moz-box-shadow:0 2px 0 #6e5f0d;box-shadow:0 2px 0 #6e5f0d;}
-.btn-danger.dropdown-toggle,.btn-danger.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #9f1411;-moz-box-shadow:0 2px 0 #9f1411;box-shadow:0 2px 0 #9f1411;}
-.btn-success.dropdown-toggle,.btn-success.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #276627;-moz-box-shadow:0 2px 0 #276627;box-shadow:0 2px 0 #276627;}
-.btn-info.dropdown-toggle,.btn-info.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #124a5b;-moz-box-shadow:0 2px 0 #124a5b;box-shadow:0 2px 0 #124a5b;}
-.btn-inverse.dropdown-toggle,.btn-inverse.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #121212;-moz-box-shadow:0 2px 0 #121212;box-shadow:0 2px 0 #121212;}
-.btn.active,.btn:active{position:relative;top:1px;left:-1px;-webkit-box-shadow:-1px 1px 0 #333333;-moz-box-shadow:-1px 1px 0 #333333;box-shadow:-1px 1px 0 #333333;}
-.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn[disabled]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;top:0;left:0;}
-[class^="icon-"],[class*=" icon-"]{vertical-align:-13%;}
 .nav .nav-header{color:#ece9d7;text-shadow:none;}
 .nav-list{padding:0 15px;}
 .nav-list>li>a,.nav-list .nav-header{text-shadow:none;color:#ece9d7;}
@@ -879,8 +859,27 @@ div.subnav .nav>.active>a .caret,div.subnav .nav>.active>a:hover .caret{border-t
 .pagination li.disabled>a,.pagination li.disabled>a:hover{background:#3a4450;}
 .pager a{color:#ece9d7;background-color:#45515f;border-color:transparent;}.pager a:hover{background:#5a6a7d;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#45515f;}
+.btn,.btn:hover{text-shadow:none;background-image:none;-webkit-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);-moz-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);border:none;}
+.btn-warning{background-color:#e6c92e;}
+.btn-primary,.btn-primary:hover{-webkit-box-shadow:-2px 2px 0 #612c0c;-moz-box-shadow:-2px 2px 0 #612c0c;box-shadow:-2px 2px 0 #612c0c;}
+.btn-warning,.btn-warning:hover{-webkit-box-shadow:-2px 2px 0 #6e5f0d;-moz-box-shadow:-2px 2px 0 #6e5f0d;box-shadow:-2px 2px 0 #6e5f0d;}
+.btn-danger,.btn-danger:hover{-webkit-box-shadow:-2px 2px 0 #9f1411;-moz-box-shadow:-2px 2px 0 #9f1411;box-shadow:-2px 2px 0 #9f1411;}
+.btn-success,.btn-success:hover{-webkit-box-shadow:-2px 2px 0 #276627;-moz-box-shadow:-2px 2px 0 #276627;box-shadow:-2px 2px 0 #276627;}
+.btn-info,.btn-info:hover{-webkit-box-shadow:-2px 2px 0 #124a5b;-moz-box-shadow:-2px 2px 0 #124a5b;box-shadow:-2px 2px 0 #124a5b;}
+.btn-inverse,.btn-inverse:hover{-webkit-box-shadow:-2px 2px 0 #121212;-moz-box-shadow:-2px 2px 0 #121212;box-shadow:-2px 2px 0 #121212;}
+.btn.dropdown-toggle,.btn.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #333333;-moz-box-shadow:0 2px 0 #333333;box-shadow:0 2px 0 #333333;}
+.btn-primary.dropdown-toggle,.btn-primary.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #612c0c;-moz-box-shadow:0 2px 0 #612c0c;box-shadow:0 2px 0 #612c0c;}
+.btn-warning.dropdown-toggle,.btn-warning.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #6e5f0d;-moz-box-shadow:0 2px 0 #6e5f0d;box-shadow:0 2px 0 #6e5f0d;}
+.btn-danger.dropdown-toggle,.btn-danger.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #9f1411;-moz-box-shadow:0 2px 0 #9f1411;box-shadow:0 2px 0 #9f1411;}
+.btn-success.dropdown-toggle,.btn-success.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #276627;-moz-box-shadow:0 2px 0 #276627;box-shadow:0 2px 0 #276627;}
+.btn-info.dropdown-toggle,.btn-info.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #124a5b;-moz-box-shadow:0 2px 0 #124a5b;box-shadow:0 2px 0 #124a5b;}
+.btn-inverse.dropdown-toggle,.btn-inverse.dropdown-toggle:hover{-webkit-box-shadow:0 2px 0 #121212;-moz-box-shadow:0 2px 0 #121212;box-shadow:0 2px 0 #121212;}
+.btn.active,.btn:active{position:relative;top:1px;left:-1px;-webkit-box-shadow:-1px 1px 0 #333333;-moz-box-shadow:-1px 1px 0 #333333;box-shadow:-1px 1px 0 #333333;}
+.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn[disabled]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;top:0;left:0;}
+[class^="icon-"],[class*=" icon-"]{vertical-align:-13%;}
+.table,.table-striped tbody>tr>td:first-child,.table-striped tbody>tr>td:last-child{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 input,button,select,textarea{font-family:'Noticia Text',serif;}
-legend{border-bottom:none;}
+legend{border-bottom:none;font-family:'Oswald',sans-serif;color:#e36b23;text-shadow:-2px 2px 0 #612c0c;}
 label{color:#ece9d7;line-height:15px;}
 .help-block{color:#ece9d7;opacity:0.6;}
 .form-actions{border-top:none;}
@@ -894,15 +893,7 @@ label{color:#ece9d7;line-height:15px;}
 .control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#58a959;border-color:#58a959;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success .checkbox:focus,.control-group.success .radio:focus,.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #9bcc9c;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #9bcc9c;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #9bcc9c;}
 .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#58a959;background-color:#dff0d8;border-color:#58a959;}
 .input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{color:#2a333c;}
-.modal{background-color:transparent;}
-.modal-header,.modal-body,.modal-footer{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2a333c;border:none;}
-.modal-header{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
-.modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
-.page-header{border-bottom:none;}
-.well,.hero-unit{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.hero-unit h1{color:#e36b23;line-height:2em;}
-.progress{background-color:#20262d;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.progress .bar{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.thumbnail{border:none;background:#45515f;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.dropdown .caret{margin-top:14px;opacity:1;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #5a6a7d;}
 .label{background-color:#45515f;color:#ece9d7;}
 .label-important{background-color:#b94a48;}
 .label-warning{background-color:#e36b23;}
@@ -913,7 +904,14 @@ label{color:#ece9d7;line-height:15px;}
 .alert-success{background-color:#468847;}
 .alert-danger,.alert-error{background-color:#b94a48;}
 .alert-info{background-color:#3a87ad;}
-.pull-right{float:right;}
+.well,.hero-unit{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.hero-unit h1{color:#e36b23;line-height:2em;}
+.progress{background-color:#20262d;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.progress .bar{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.thumbnail{border:none;background:#45515f;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.modal{background-color:transparent;}.modal-header,.modal-body,.modal-footer{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#2a333c;border:none;}
+.modal-header{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+@media (max-width:768px){div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover,div.subnav .nav>li.active:first-child>a,div.subnav .nav>li.active:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} div.subnav .nav>li:last-child>a,div.subnav .nav>li:last-child>a:hover,div.subnav .nav>li.active:last-child>a,div.subnav .nav>li.active:last-child>a:hover{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}}.pull-right{float:right;}
 .pull-left{float:left;}
 .hide{display:none;}
 .show{display:block;}
diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less
index c42f0409..077e0415 100755
--- a/superhero/bootswatch.less
+++ b/superhero/bootswatch.less
@@ -9,14 +9,13 @@
 @import url(https://fonts.googleapis.com/css?family=Oswald);
 @import url(https://fonts.googleapis.com/css?family=Noticia+Text);
 
-h6, legend,
-h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, h6 {
 	font-family: @headingsFontFamily;
 	color: @orange;
 	text-shadow: -1px 1px 0 darken(@orange, 30%);
 }
 
-h1, h2, legend {
+h1, h2 {
 	text-shadow: -2px 2px 0 darken(@orange, 30%);
 }
 
@@ -24,18 +23,17 @@ h1 {
 	line-height: 55px;
 }
 
-// SCAFFOLDING
-// --------------------------------------------------
-
 code, pre {
 	background-color: lighten(@blue, 8%);
 	border: none;
 	color: @textColor;
 }
 
-.prettyprint {
-	border: none;
-	text-decoration: none;
+// SCAFFOLDING
+// --------------------------------------------------
+
+.page-header {
+	border-bottom: none;
 }
 
 blockquote {
@@ -168,14 +166,6 @@ blockquote.pull-right {
 	}
 }
 
-.dropdown .caret {
-	margin-top: 14px;
-	opacity: 1;
-	border-left: 6px solid transparent;
-	border-right: 6px solid transparent;
-	border-top: 6px solid lighten(@blue, 10%);
-}
-
 div.subnav {
 	background-color: @blue;
 	background-image: none;
@@ -238,121 +228,6 @@ div.subnav {
 	}
 }
 
-@media (max-width: 768px) {
-	div.subnav .nav > li:first-child > a,
-	div.subnav .nav > li:first-child > a:hover,
-	div.subnav .nav > li.active:first-child > a,
-	div.subnav .nav > li.active:first-child > a:hover {
-		.border-radius(4px 4px 0 0);
-	}
-
-	div.subnav .nav > li:last-child > a,
-	div.subnav .nav > li:last-child > a:hover,
-	div.subnav .nav > li.active:last-child > a,
-	div.subnav .nav > li.active:last-child > a:hover {
-		.border-radius(0 0 4px 4px);
-	}
-
-}
-
-// TABLES
-// -----------------------------------------------------
-
-.table,
-.table-striped tbody > tr > td:first-child,
-.table-striped tbody > tr > td:last-child, {
-	.border-radius(4px);
-}
-
-// BUTTONS
-// --------------------------------------------------
-
-.btn,
-.btn:hover {
-	text-shadow: none;
-	background-image: none;
-	.box-shadow(-2px 2px 0 rgba(0, 0, 0, 0.2));
-	border: none;
-}
-
-.btn-warning {
-	background-color: @yellow;
-}
-
-.btn-primary, .btn-primary:hover {
-	.box-shadow(-2px 2px 0 darken(@btnPrimaryBackground, 30%));
-}
-
-.btn-warning, .btn-warning:hover {
-	.box-shadow(-2px 2px 0 darken(@yellow, 30%));
-}
-
-.btn-danger, .btn-danger:hover {
-	.box-shadow(-2px 2px 0 darken(#ee5f5b, 30%));
-}
-
-.btn-success, .btn-success:hover {
-	.box-shadow(-2px 2px 0 darken(#62c462, 30%));
-}
-
-.btn-info, .btn-info:hover {
-	.box-shadow(-2px 2px 0 darken(#5bc0de, 40%));
-}
-
-.btn-inverse, .btn-inverse:hover {
-	.box-shadow(-2px 2px 0 darken(#454545, 20%));
-}
-
-.btn.dropdown-toggle, .btn.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(@white, 80%));
-}
-
-.btn-primary.dropdown-toggle, .btn-primary.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(@btnPrimaryBackground, 30%));
-}
-
-.btn-warning.dropdown-toggle, .btn-warning.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(@yellow, 30%));
-}
-
-.btn-danger.dropdown-toggle, .btn-danger.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(#ee5f5b, 30%));
-}
-
-.btn-success.dropdown-toggle, .btn-success.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(#62c462, 30%));
-}
-
-.btn-info.dropdown-toggle, .btn-info.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(#5bc0de, 40%));
-}
-
-.btn-inverse.dropdown-toggle, .btn-inverse.dropdown-toggle:hover {
-	.box-shadow(0 2px 0 darken(#454545, 20%));
-}
-
-.btn.active,
-.btn:active {
-	position: relative;
-	top: 1px;
-	left: -1px;
-	.box-shadow(-1px 1px 0 darken(@white, 80%))
-}
-
-.btn.disabled,
-.btn.disabled.active,
-.btn.disabled:active,
-.btn[disabled] {
-	.box-shadow(none);
-	text-shadow: none;
-	top: 0;
-	left: 0;
-}
-
-[class^="icon-"], [class*=" icon-"] {
-	vertical-align: -13%;
-}
-
 // NAVIGATION
 // --------------------------------------------------
 
@@ -500,6 +375,104 @@ div.subnav {
 	}
 }
 
+// BUTTONS
+// --------------------------------------------------
+
+.btn,
+.btn:hover {
+	text-shadow: none;
+	background-image: none;
+	.box-shadow(-2px 2px 0 rgba(0, 0, 0, 0.2));
+	border: none;
+}
+
+.btn-warning {
+	background-color: @yellow;
+}
+
+.btn-primary, .btn-primary:hover {
+	.box-shadow(-2px 2px 0 darken(@btnPrimaryBackground, 30%));
+}
+
+.btn-warning, .btn-warning:hover {
+	.box-shadow(-2px 2px 0 darken(@yellow, 30%));
+}
+
+.btn-danger, .btn-danger:hover {
+	.box-shadow(-2px 2px 0 darken(#ee5f5b, 30%));
+}
+
+.btn-success, .btn-success:hover {
+	.box-shadow(-2px 2px 0 darken(#62c462, 30%));
+}
+
+.btn-info, .btn-info:hover {
+	.box-shadow(-2px 2px 0 darken(#5bc0de, 40%));
+}
+
+.btn-inverse, .btn-inverse:hover {
+	.box-shadow(-2px 2px 0 darken(#454545, 20%));
+}
+
+.btn.dropdown-toggle, .btn.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(@white, 80%));
+}
+
+.btn-primary.dropdown-toggle, .btn-primary.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(@btnPrimaryBackground, 30%));
+}
+
+.btn-warning.dropdown-toggle, .btn-warning.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(@yellow, 30%));
+}
+
+.btn-danger.dropdown-toggle, .btn-danger.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(#ee5f5b, 30%));
+}
+
+.btn-success.dropdown-toggle, .btn-success.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(#62c462, 30%));
+}
+
+.btn-info.dropdown-toggle, .btn-info.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(#5bc0de, 40%));
+}
+
+.btn-inverse.dropdown-toggle, .btn-inverse.dropdown-toggle:hover {
+	.box-shadow(0 2px 0 darken(#454545, 20%));
+}
+
+.btn.active,
+.btn:active {
+	position: relative;
+	top: 1px;
+	left: -1px;
+	.box-shadow(-1px 1px 0 darken(@white, 80%))
+}
+
+.btn.disabled,
+.btn.disabled.active,
+.btn.disabled:active,
+.btn[disabled] {
+	.box-shadow(none);
+	text-shadow: none;
+	top: 0;
+	left: 0;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+	vertical-align: -13%;
+}
+
+// TABLES
+// -----------------------------------------------------
+
+.table,
+.table-striped tbody > tr > td:first-child,
+.table-striped tbody > tr > td:last-child, {
+	.border-radius(4px);
+}
+
 // FORMS
 // --------------------------------------------------
 
@@ -509,6 +482,9 @@ input, button, select, textarea {
 
 legend {
 	border-bottom: none;
+	font-family: @headingsFontFamily;
+	color: @orange;
+	text-shadow: -2px 2px 0 darken(@orange, 30%);
 }
 
 label {
@@ -544,62 +520,20 @@ label {
 	color: @bodyBackground;
 }
 
-// MODALS
+// DROPDOWNS
 // --------------------------------------------------
 
-.modal {
-	background-color: transparent;
-}
-
-.modal-header,
-.modal-body,
-.modal-footer {
-	.box-shadow(none);
-	background-color: @bodyBackground;
-	border: none;
-}
-
-.modal-header {
-	.border-radius(4px 4px 0 0);
-}
-
-.modal-footer {
-	.border-radius(0 0 4px 4px);
+.dropdown .caret {
+	margin-top: 14px;
+	opacity: 1;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-top: 6px solid lighten(@blue, 10%);
 }
 
-// MISCELLANEOUS
+// ALERTS, LABELS, BADGES
 // --------------------------------------------------
 
-.page-header {
-	border-bottom: none;
-}
-
-.well, .hero-unit {
-	border: none;
-	.box-shadow(none);
-}
-
-.hero-unit h1 {
-	color: @orange;
-	line-height: 2em;
-}
-
-.progress {
-	background-color: darken(@blueDark, 5%);
-	background-image: none;
-	.box-shadow(none);
-
-	.bar {
-		.box-shadow(none);
-	}
-}
-
-.thumbnail {
-	border: none;
-	background: @blue;
-	.border-radius(3px);
-}
-
 .label {
 	background-color: @blue;
   	color: @textColor;
@@ -649,3 +583,77 @@ label {
   background-color: @infoText;
 }
 
+// MISC
+// --------------------------------------------------
+
+.well, .hero-unit {
+	border: none;
+	.box-shadow(none);
+}
+
+.hero-unit h1 {
+	color: @orange;
+	line-height: 2em;
+}
+
+.progress {
+	background-color: darken(@blueDark, 5%);
+	background-image: none;
+	.box-shadow(none);
+
+	.bar {
+		.box-shadow(none);
+	}
+}
+
+.thumbnail {
+	border: none;
+	background: @blue;
+	.border-radius(3px);
+}
+
+.modal {
+	background-color: transparent;
+
+	&-header,
+	&-body,
+	&-footer {
+		.box-shadow(none);
+		background-color: @bodyBackground;
+		border: none;
+	}
+
+	&-header {
+		.border-radius(4px 4px 0 0);
+	}
+
+	&-footer {
+		.border-radius(0 0 4px 4px);
+	}
+}
+
+// MEDIA QUERIES
+// --------------------------------------------------
+
+@media (max-width: 768px) {
+
+	div.subnav {
+
+		.nav > li {
+
+			&:first-child > a,
+			&:first-child > a:hover,
+			&.active:first-child > a,
+			&.active:first-child > a:hover {
+				.border-radius(4px 4px 0 0);
+			}
+
+			&:last-child > a,
+			&:last-child > a:hover,
+			&.active:last-child > a,
+			&.active:last-child > a:hover {
+				.border-radius(0 0 4px 4px);
+			}
+		}
+	}
+}
diff --git a/united/bootstrap.css b/united/bootstrap.css
index e7deaf87..e86d6f88 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -4793,6 +4793,12 @@ a.badge:hover {
 .navbar .nav-collapse.collapse .nav-header {
   color: #f5f5f5;
 }
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+  border-right: 1px solid #C03D14;
+  border-left: 1px solid #E6633A;
+}
 .btn-primary {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -4855,12 +4861,6 @@ a.badge:hover {
 .btn-warning.active {
   background-color: #e7a413 \9;
 }
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-  border-right: 1px solid #C03D14;
-  border-left: 1px solid #E6633A;
-}
 .alert {
   text-shadow: none;
 }
diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
index 5a27f12d..18b68af9 100644
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -809,11 +809,11 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .navbar .nav-collapse.collapse .nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.3);background-image:none;}
 .navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .navbar .nav-collapse.collapse .nav-header{color:#f5f5f5;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;}
 .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e86537;background-image:-moz-linear-gradient(top, #ef784e, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef784e), to(#dd4814));background-image:-webkit-linear-gradient(top, #ef784e, #dd4814);background-image:-o-linear-gradient(top, #ef784e, #dd4814);background-image:linear-gradient(to bottom, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffef784e', endColorstr='#ffdd4814', GradientType=0);border-color:#dd4814 #dd4814 #97310e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#dd4814;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#dd4814;*background-color:#c64012;}
 .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;}
 .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(to bottom, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5d185', endColorstr='#ffefb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#efb73e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#efb73e;*background-color:#edae26;}
 .btn-warning:active,.btn-warning.active{background-color:#e7a413 \9;}
-.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;}
 .alert{text-shadow:none;}
 .hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.hero-unit h1{line-height:1.6em;}
 .pull-right{float:right;}
diff --git a/united/bootswatch.less b/united/bootswatch.less
index 8efda4a6..f2d20b6e 100755
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -8,6 +8,9 @@
 
 @import url(https://fonts.googleapis.com/css?family=Ubuntu);
 
+// SCAFFOLDING
+// -----------------------------------------------------
+
 // NAVBAR
 // -----------------------------------------------------
 
@@ -69,6 +72,16 @@
 	}
 }
 
+// NAV
+// -----------------------------------------------------
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+	border-right: 1px solid #C03D14;
+	border-left: 1px solid #E6633A;
+}
+
 // BUTTONS
 // -----------------------------------------------------
 
@@ -80,24 +93,25 @@
   .buttonBackground(lighten(@yellow, 15%), @yellow);
 }
 
-// NAVIGATION
+// TABLES
 // -----------------------------------------------------
 
+// FORMS
+// -----------------------------------------------------
 
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-	border-right: 1px solid #C03D14;
-	border-left: 1px solid #E6633A;
-}
+// DROPDOWNS
+// -----------------------------------------------------
 
-// MISC
+// ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
 .alert {
 	text-shadow: none;
 }
 
+// MISC
+// -----------------------------------------------------
+
 .hero-unit {
     border: 1px solid rgba(0,0,0,.05);
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
@@ -106,3 +120,6 @@
 		line-height: 1.6em;
 	}
 }
+
+// MEDIA QUERIES
+// -----------------------------------------------------