uswds-jekyll 2.0.1 → 2.1.0

data/_sass/uswds/elements/_inputs.scss

@@ -32,15 +32,9 @@ select {
   line-height: $input-line-height;
   margin: 0.2em 0;
   max-width: $input-max-width;
-  outline: none;
   padding: $input-padding-vertical 0.7em;
   width: 100%;
 
-  &:focus,
-  &.usa-input-focus {
-    box-shadow: $focus-shadow;
-  }
-
   &.usa-input-success {
     border: 3px solid $color-green-light;
   }
@@ -94,7 +88,12 @@ select {
 
 .usa-input-required:after {
   color: $color-secondary-darkest;
-  content: ' (*Required)';
+  content: ' (*required)';
+}
+
+.usa-input-optional:after {
+  color: $color-gray-medium;
+  content: ' (optional)';
 }
 
 label {
@@ -112,11 +111,31 @@ select {
   -webkit-appearance: none;
   appearance: none;
   background-color: $color-white;
-  background-image: url('#{$image-path}/arrow-down.png');
-  background-image: url('#{$image-path}/arrow-down.svg');
+  background-image: url('#{$image-path}/arrow-both.png');
+  background-image: url('#{$image-path}/arrow-both.svg');
   background-position: right 1.3rem center;
   background-repeat: no-repeat;
-  background-size: 1.3rem;
+  background-size: 1rem;
+  padding-right: 3rem;
+
+  &::-ms-expand {
+    display: none;
+  }
+
+  // Show default webkit style on select element when autofilled to show icon
+  &:-webkit-autofill {
+    appearance: menulist;
+  }
+
+  // Remove dotted outline from select element on focus in Firefox
+  &:-moz-focusring {
+    color: transparent;
+    text-shadow: 0 0 0 $color-black;
+  }
+}
+
+option:first-child {
+  font-weight: $font-bold;
 }
 
 legend {
@@ -159,30 +178,31 @@ legend {
 [type=radio] + label {
   cursor: pointer;
   font-weight: 400;
-  margin-bottom: 0.5em;
+  margin-bottom: 0.65em;
 }
 
 [type=checkbox] + label::before,
 [type=radio] + label::before {
   background: $color-white;
-  border-radius: $border-radius;
+  border-radius: $checkbox-border-radius;
   box-shadow: 0 0 0 1px $color-gray-medium;
   content: '\a0';
   display: inline-block;
-  height: 1.8rem;
-  line-height: 1.8rem;
+  height: $spacing-medium;
+  line-height: $spacing-medium;
   margin-right: 0.6em;
   text-indent: 0.15em;
   vertical-align: middle\0; // Target IE 11 and below to vertically center inputs
-  width: 1.8rem;
+  width: $spacing-medium;
 }
 
 [type=radio] + label::before {
-  box-shadow: 0 0 0 2px $color-white, 0 0 0 3px $color-gray-medium;
-  height: 1.6rem;
-  line-height: 1.6rem;
-  width: 1.6rem;
   border-radius: 100%;
+  box-shadow: 0 0 0 2px $color-white, 0 0 0 3px $color-gray-medium;
+  height: 1.4rem; // Size overrides to account for shape + checked styling
+  line-height: 1.4rem;
+  margin-right: 0.75em;
+  width: 1.4rem;
 }
 
 [type=checkbox]:checked + label::before,
@@ -195,10 +215,6 @@ legend {
   box-shadow: 0 0 0 2px $color-white, 0 0 0 4px $color-primary;
 }
 
-[type=radio]:focus + label::before {
-  box-shadow: 0 0 0 2px $color-white, 0 0 0 4px $color-primary, 0 0 3px 4px $color-focus, 0 0 7px 4px $color-focus;
-}
-
 [type=checkbox]:checked + label::before,
 [type=checkbox]:checked:disabled + label::before {
   background-image: url('#{$image-path}/correct8.png');
@@ -207,17 +223,23 @@ legend {
   background-repeat: no-repeat;
 }
 
-[type=checkbox]:focus + label::before {
-  box-shadow: 0 0 0 1px $color-white, 0 0 0 3px $color-primary;
+[type=radio]:focus + label::before {
+  outline: $focus-outline;
+  outline-offset: $focus-spacing * 2; // Double the offset to account for circular shape
 }
 
 [type=checkbox]:disabled + label {
-  color: $color-gray;
+  color: $color-gray-lighter;
+}
+
+[type=checkbox]:focus + label::before {
+  outline: $focus-outline;
+  outline-offset: $focus-spacing;
 }
 
 [type=checkbox]:disabled + label::before,
 [type=radio]:disabled + label::before {
-  background: $color-gray-lighter;
+  background: $color-gray-lightest;
   box-shadow: 0 0 0 1px $color-gray-light;
   cursor: not-allowed;
 }
@@ -231,11 +253,6 @@ legend {
   width: 100%;
 }
 
-[type=range]:focus {
-  box-shadow: none;
-  outline: none;
-}
-
 [type=range]::-webkit-slider-runnable-track {
   background: $color-gray-light;
   border: 1px solid $color-gray-medium;
@@ -301,18 +318,6 @@ legend {
   border-radius: 2rem;
 }
 
-[type=range]:focus::-webkit-slider-thumb {
-  border: 2px solid $color-focus;
-}
-
-[type=range]:focus::-moz-range-thumb {
-  border: 2px solid $color-focus;
-}
-
-[type=range]:focus::-ms-thumb {
-  border: 2px solid $color-focus;
-}
-
 // Memorable dates
 
 .usa-date-of-birth {

data/_sass/uswds/elements/_labels.scss

@@ -1,6 +1,6 @@
 .usa-label {
-  background-color: $color-primary;
-  border-radius: $border-radius;
+  background-color: $color-gray;
+  border-radius: $label-border-radius;
   color: $color-white;
   font-size: $h5-font-size;
   margin-right: 0.5rem;

data/_sass/uswds/elements/_table.scss

@@ -1,40 +1,35 @@
 table {
   border-spacing: 0;
   margin: 2em 0;
-  min-width: 100%;
-
-  thead {
-    th,
-    td {
-      background-color: $color-gray-lightest;
-    }
-  }
+}
 
+thead {
   th {
-    text-align: left;
-  }
-
-  tbody {
-    th {
-      font-weight: $font-normal;
-    }
+    font-weight: $font-bold;
   }
 
   th,
   td {
-    background-color: $color-white;
-    border: 1px solid $color-gray;
-    padding: 1.5rem;
+    background-color: $color-gray-lightest;
   }
 }
 
+th {
+  text-align: left;
+}
+
+th,
+td {
+  background-color: $color-white;
+  border: 1px solid $color-gray;
+  font-weight: $font-normal;
+  padding: 1rem 1.5rem;
+}
+
 .usa-table-borderless {
   thead {
-    tr {
-      background-color: transparent;
-    }
-
     th {
+      background-color: transparent;
       border-top: 0;
     }
   }
@@ -44,4 +39,17 @@ table {
     border-left: 0;
     border-right: 0;
   }
+
+  th {
+    &:first-child {
+      padding-left: 0;
+    }
+  }
+}
+
+caption {
+  @include h5;
+  font-family: $font-serif;
+  margin-bottom: 1.2rem;
+  text-align: left;
 }

data/_sass/uswds/elements/_typography.scss

@@ -22,13 +22,12 @@ a {
     color: $color-primary-darker;
   }
 
-  &:visited {
-    color: $color-visited;
+  &:focus {
+    @include focus;
   }
 
-  &:focus {
-    box-shadow: $focus-shadow;
-    outline: 0;
+  &:visited {
+    color: $color-visited;
   }
 }
 
@@ -67,8 +66,7 @@ h1,
 h2,
 h3,
 h4,
-h5,
-h6 {
+h5 {
   clear: both;
   font-family: $font-serif;
   line-height: $heading-line-height;
@@ -76,6 +74,10 @@ h6 {
   margin-top: 1.5em;
 }
 
+h6 {
+  font-family: $font-sans;
+}
+
 h1 {
   @include h1();
 }
@@ -112,7 +114,7 @@ dfn {
 // Custom typography
 
 .usa-content {
-  p:not(.usa-font-lead),
+  p,
   ul:not(.usa-accordion):not(.usa-accordion-bordered),
   ol:not(.usa-accordion):not(.usa-accordion-bordered) {
     max-width: $text-max-width;
@@ -162,6 +164,7 @@ dfn {
 .usa-font-lead {
   font-family: $font-serif;
   font-size: $lead-font-size;
+  font-weight: $font-normal;
   line-height: $lead-line-height;
   max-width: $lead-max-width;
 }

data/_sass/uswds/uswds.scss

@@ -8,9 +8,9 @@
 // Core -------------- //
 @import 'core/variables';
 @import 'core/fonts';
-@import 'core/base';
 @import 'core/grid';
 @import 'core/utilities';
+@import 'core/base';
 
 // Elements -------------- //
 // Styles basic HTML elements

data/assets/uswds/CONTRIBUTING.md

@@ -85,6 +85,39 @@ gulp stylelint
 (Or, if you don't want to install Gulp globally, you can run `$(npm
 bin)/gulp` instead of `gulp`.)
 
+Note that running the tests also requires an installation of
+Chrome v59 or higher (v60 if you're on Windows).
+
+#### Visual regression testing
+
+The Standards come with optional tooling for detecting visual regressions,
+which can be especially useful if you're refactoring CSS.
+
+These tests work by comparing current screenshots of the Standards' Fractal
+components to "golden" screenshots that represent what the components are
+supposed to look like.
+
+Golden screenshots are stored on your local development system *only*;
+they're not version controlled.
+
+To generate the golden screenshots, run:
+
+```
+node spec/visual-regression-tester.js test --updateGolden
+```
+
+Then, make any CSS refactorings (or switch to a branch that has them).
+
+To compare the current state of your CSS to the golden screenshots, run:
+
+```
+node spec/visual-regression-tester.js test
+```
+
+If the current screenshots don't match their golden counterparts, you will
+be directed to an HTML file that visually shows the differences between
+any conflicting screenshots.
+
 ### Building
 
 To build the `uswds` package in preparation for releases, run:

data/assets/uswds/LICENSE.md

@@ -16,14 +16,6 @@ The files in `src/stylesheets/lib` are from:
 * [Neat](http://neat.bourbon.io/), copyright [thoughtbot](https://thoughtbot.com/), inc., also under the [MIT license](https://github.com/thoughtbot/neat/blob/master/LICENSE.md).
 * [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
 
-The file `src/js/vendor/html5shiv.js` is from [HTML5 Shiv](https://github.com/afarkas/html5shiv), copyright Alexander Farkas (aFarkas), under the [MIT license](https://github.com/aFarkas/html5shiv/blob/master/MIT%20and%20GPL2%20licenses.md).
-
-The file `src/js/vendor/rem.min.js` is from [REM unit polyfill](https://github.com/chuckcarpenter/REM-unit-polyfill), copyright Chuck Carpenter, under the [MIT license](https://github.com/chuckcarpenter/REM-unit-polyfill/blob/master/LICENSE.md).
-
-The file `src/js/vendor/respond.js` is from [Respond.js](https://github.com/scottjehl/Respond), copyright Scott Jehl, under the [MIT license](https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT).
-
-The file `src/js/vendor/selectivizr-min.js` is from [Selectivizr](http://selectivizr.com/), copyright Keith Clark, under the [MIT license](http://opensource.org/licenses/mit-license.php).
-
 #### Full license text for the MIT licensed files:
 
 ```

data/assets/uswds/README.md

@@ -22,7 +22,7 @@ This repository is for the Standards themselves. 18F maintains [another reposito
 * [Fractal](#fractal)
   * [Template compatibility](#template-compatibility)
 * [Need installation help?](#need-installation-help)
-* [Contributing to the code base](#contributing-to-the-codebase)
+* [Contributing to the code base](#contributing-to-the-code-base)
 * [Reuse of open-source style guides](#reuse-of-open-source-style-guides)
 * [Licenses and attribution](#licenses-and-attribution)
 
@@ -230,7 +230,7 @@ You can also email us directly at uswebdesignstandards@gsa.gov.
 
 For complete instructions on how to contribute code, please read [CONTRIBUTING.md](CONTRIBUTING.md). These instructions also include guidance on how to set up your own copy of the Standards style guide website for development.
 
-If you would like to learn more about our workflow process, check out the [Workflow](https://github.com/18F/web-design-standards/wiki/Workflow) and [Label Glossary](https://github.com/18F/web-design-standards/wiki/Label-glossary) pages on the wiki.
+If you would like to learn more about our workflow process, check out the [Workflow](https://github.com/18F/web-design-standards/wiki/Workflow) and [Issue label Glossary](https://github.com/18F/web-design-standards/wiki/Issue-label-glossary) pages on the wiki.
 
 If you have questions or concerns about our contributing workflow, please contact us by [filing a GitHub issue](https://github.com/18F/web-design-standards/issues) or [emailing our team](mailto:uswebdesignstandards@gsa.gov).
 

data/assets/uswds/css/uswds.css

@@ -1,4 +1,4 @@
-/*! uswds v1.3.1 */
+/*! uswds v1.4.3 */
 html {
   box-sizing: border-box;
 }
@@ -460,32 +460,6 @@ th {
 }
 
 /* stylelint-enable */
-html {
-  box-sizing: border-box;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
-}
-
-body {
-  background-color: #ffffff;
-  overflow-x: hidden;
-}
-
-.lt-ie9 * {
-  -webkit-filter: none !important;
-  filter: none !important;
-  /* stylelint-disable-line declaration-no-important */
-}
-
-[hidden] {
-  display: none !important;
-  /* stylelint-disable-line declaration-no-important */
-}
-
 .usa-grid,
 .usa-grid-full {
   max-width: 1200px;
@@ -819,6 +793,38 @@ body {
   left: -999em;
 }
 
+html {
+  box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: inherit;
+}
+
+body {
+  background-color: #ffffff;
+  overflow-x: hidden;
+}
+
+.lt-ie9 * {
+  -webkit-filter: none !important;
+  filter: none !important;
+  /* stylelint-disable-line declaration-no-important */
+}
+
+[hidden] {
+  display: none !important;
+  /* stylelint-disable-line declaration-no-important */
+}
+
+*:focus,
+.usa-focus {
+  outline: 2px dotted #aeb0b5;
+  outline-offset: 3px;
+}
+
 /* stylelint-disable selector-no-qualifying-type */
 .usa-button,
 .usa-button-primary,
@@ -839,7 +845,7 @@ button,
   appearance: none;
   background-color: #0071bc;
   border: 0;
-  border-radius: 3px;
+  border-radius: 5px;
   color: #ffffff;
   cursor: pointer;
   display: inline-block;
@@ -847,7 +853,6 @@ button,
   font-size: 1.7rem;
   font-weight: 700;
   line-height: 1;
-  outline: none;
   padding: 1rem 2rem;
   text-align: center;
   text-decoration: none;
@@ -891,26 +896,6 @@ button.usa-button-hover,
   text-decoration: none;
 }
 
-.usa-button:focus, .usa-button.usa-button-focus,
-.usa-button-primary:focus,
-.usa-button-primary.usa-button-focus,
-.usa-button:visited:focus,
-.usa-button:visited.usa-button-focus,
-.usa-button-primary:visited:focus,
-.usa-button-primary:visited.usa-button-focus,
-button:focus,
-button.usa-button-focus,
-[type=button]:focus,
-[type=button].usa-button-focus,
-[type=submit]:focus,
-[type=submit].usa-button-focus,
-[type=reset]:focus,
-[type=reset].usa-button-focus,
-[type=image]:focus,
-[type=image].usa-button-focus {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-}
-
 .usa-button:active, .usa-button.usa-button-active,
 .usa-button-primary:active,
 .usa-button-primary.usa-button-active,
@@ -994,7 +979,9 @@ button.usa-button-secondary,
 [type=submit].usa-button-secondary,
 [type=reset].usa-button-secondary,
 [type=image].usa-button-secondary {
-  background-color: #e31c3d;
+  background-color: #ffffff;
+  box-shadow: inset 0 0 0 2px #0071bc;
+  color: #0071bc;
 }
 
 .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,
@@ -1014,7 +1001,8 @@ button.usa-button-secondary.usa-button-hover,
 [type=reset].usa-button-secondary.usa-button-hover,
 [type=image].usa-button-secondary:hover,
 [type=image].usa-button-secondary.usa-button-hover {
-  background-color: #cd2026;
+  box-shadow: inset 0 0 0 2px #205493;
+  color: #205493;
 }
 
 .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,
@@ -1034,7 +1022,104 @@ button.usa-button-secondary.usa-button-active,
 [type=reset].usa-button-secondary.usa-button-active,
 [type=image].usa-button-secondary:active,
 [type=image].usa-button-secondary.usa-button-active {
-  background-color: #981b1e;
+  box-shadow: inset 0 0 0 2px #112e51;
+  color: #112e51;
+}
+
+.usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,
+.usa-button-primary.usa-button-secondary-inverse,
+.usa-button-primary.usa-button-outline-inverse,
+.usa-button:visited.usa-button-secondary-inverse,
+.usa-button:visited.usa-button-outline-inverse,
+.usa-button-primary:visited.usa-button-secondary-inverse,
+.usa-button-primary:visited.usa-button-outline-inverse,
+button.usa-button-secondary-inverse,
+button.usa-button-outline-inverse,
+[type=button].usa-button-secondary-inverse,
+[type=button].usa-button-outline-inverse,
+[type=submit].usa-button-secondary-inverse,
+[type=submit].usa-button-outline-inverse,
+[type=reset].usa-button-secondary-inverse,
+[type=reset].usa-button-outline-inverse,
+[type=image].usa-button-secondary-inverse,
+[type=image].usa-button-outline-inverse {
+  background: transparent;
+  box-shadow: inset 0 0 0 2px #ffffff;
+  color: #ffffff;
+}
+
+.usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,
+.usa-button-primary.usa-button-secondary-inverse:hover,
+.usa-button-primary.usa-button-secondary-inverse.usa-button-hover,
+.usa-button-primary.usa-button-outline-inverse:hover,
+.usa-button-primary.usa-button-outline-inverse.usa-button-hover,
+.usa-button:visited.usa-button-secondary-inverse:hover,
+.usa-button:visited.usa-button-secondary-inverse.usa-button-hover,
+.usa-button:visited.usa-button-outline-inverse:hover,
+.usa-button:visited.usa-button-outline-inverse.usa-button-hover,
+.usa-button-primary:visited.usa-button-secondary-inverse:hover,
+.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,
+.usa-button-primary:visited.usa-button-outline-inverse:hover,
+.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,
+button.usa-button-secondary-inverse:hover,
+button.usa-button-secondary-inverse.usa-button-hover,
+button.usa-button-outline-inverse:hover,
+button.usa-button-outline-inverse.usa-button-hover,
+[type=button].usa-button-secondary-inverse:hover,
+[type=button].usa-button-secondary-inverse.usa-button-hover,
+[type=button].usa-button-outline-inverse:hover,
+[type=button].usa-button-outline-inverse.usa-button-hover,
+[type=submit].usa-button-secondary-inverse:hover,
+[type=submit].usa-button-secondary-inverse.usa-button-hover,
+[type=submit].usa-button-outline-inverse:hover,
+[type=submit].usa-button-outline-inverse.usa-button-hover,
+[type=reset].usa-button-secondary-inverse:hover,
+[type=reset].usa-button-secondary-inverse.usa-button-hover,
+[type=reset].usa-button-outline-inverse:hover,
+[type=reset].usa-button-outline-inverse.usa-button-hover,
+[type=image].usa-button-secondary-inverse:hover,
+[type=image].usa-button-secondary-inverse.usa-button-hover,
+[type=image].usa-button-outline-inverse:hover,
+[type=image].usa-button-outline-inverse.usa-button-hover {
+  box-shadow: inset 0 0 0 2px #d6d7d9;
+  color: #d6d7d9;
+}
+
+.usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,
+.usa-button-primary.usa-button-secondary-inverse:active,
+.usa-button-primary.usa-button-secondary-inverse.usa-button-active,
+.usa-button-primary.usa-button-outline-inverse:active,
+.usa-button-primary.usa-button-outline-inverse.usa-button-active,
+.usa-button:visited.usa-button-secondary-inverse:active,
+.usa-button:visited.usa-button-secondary-inverse.usa-button-active,
+.usa-button:visited.usa-button-outline-inverse:active,
+.usa-button:visited.usa-button-outline-inverse.usa-button-active,
+.usa-button-primary:visited.usa-button-secondary-inverse:active,
+.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,
+.usa-button-primary:visited.usa-button-outline-inverse:active,
+.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,
+button.usa-button-secondary-inverse:active,
+button.usa-button-secondary-inverse.usa-button-active,
+button.usa-button-outline-inverse:active,
+button.usa-button-outline-inverse.usa-button-active,
+[type=button].usa-button-secondary-inverse:active,
+[type=button].usa-button-secondary-inverse.usa-button-active,
+[type=button].usa-button-outline-inverse:active,
+[type=button].usa-button-outline-inverse.usa-button-active,
+[type=submit].usa-button-secondary-inverse:active,
+[type=submit].usa-button-secondary-inverse.usa-button-active,
+[type=submit].usa-button-outline-inverse:active,
+[type=submit].usa-button-outline-inverse.usa-button-active,
+[type=reset].usa-button-secondary-inverse:active,
+[type=reset].usa-button-secondary-inverse.usa-button-active,
+[type=reset].usa-button-outline-inverse:active,
+[type=reset].usa-button-outline-inverse.usa-button-active,
+[type=image].usa-button-secondary-inverse:active,
+[type=image].usa-button-secondary-inverse.usa-button-active,
+[type=image].usa-button-outline-inverse:active,
+[type=image].usa-button-outline-inverse.usa-button-active {
+  box-shadow: inset 0 0 0 2px #aeb0b5;
+  color: #d6d7d9;
 }
 
 .usa-button.usa-button-gray,
@@ -1089,156 +1174,56 @@ button.usa-button-gray.usa-button-active,
   background-color: #212121;
 }
 
-.usa-button.usa-button-outline,
-.usa-button-primary.usa-button-outline,
-.usa-button:visited.usa-button-outline,
-.usa-button-primary:visited.usa-button-outline,
-button.usa-button-outline,
-[type=button].usa-button-outline,
-[type=submit].usa-button-outline,
-[type=reset].usa-button-outline,
-[type=image].usa-button-outline {
-  background-color: #ffffff;
-  box-shadow: inset 0 0 0 2px #0071bc;
-  color: #0071bc;
-}
-
-.usa-button.usa-button-outline:hover, .usa-button.usa-button-outline.usa-button-hover,
-.usa-button-primary.usa-button-outline:hover,
-.usa-button-primary.usa-button-outline.usa-button-hover,
-.usa-button:visited.usa-button-outline:hover,
-.usa-button:visited.usa-button-outline.usa-button-hover,
-.usa-button-primary:visited.usa-button-outline:hover,
-.usa-button-primary:visited.usa-button-outline.usa-button-hover,
-button.usa-button-outline:hover,
-button.usa-button-outline.usa-button-hover,
-[type=button].usa-button-outline:hover,
-[type=button].usa-button-outline.usa-button-hover,
-[type=submit].usa-button-outline:hover,
-[type=submit].usa-button-outline.usa-button-hover,
-[type=reset].usa-button-outline:hover,
-[type=reset].usa-button-outline.usa-button-hover,
-[type=image].usa-button-outline:hover,
-[type=image].usa-button-outline.usa-button-hover {
-  box-shadow: inset 0 0 0 2px #205493;
-  color: #205493;
-}
-
-.usa-button.usa-button-outline:active, .usa-button.usa-button-outline.usa-button-active,
-.usa-button-primary.usa-button-outline:active,
-.usa-button-primary.usa-button-outline.usa-button-active,
-.usa-button:visited.usa-button-outline:active,
-.usa-button:visited.usa-button-outline.usa-button-active,
-.usa-button-primary:visited.usa-button-outline:active,
-.usa-button-primary:visited.usa-button-outline.usa-button-active,
-button.usa-button-outline:active,
-button.usa-button-outline.usa-button-active,
-[type=button].usa-button-outline:active,
-[type=button].usa-button-outline.usa-button-active,
-[type=submit].usa-button-outline:active,
-[type=submit].usa-button-outline.usa-button-active,
-[type=reset].usa-button-outline:active,
-[type=reset].usa-button-outline.usa-button-active,
-[type=image].usa-button-outline:active,
-[type=image].usa-button-outline.usa-button-active {
-  box-shadow: inset 0 0 0 2px #112e51;
-  color: #112e51;
-}
-
-.usa-button.usa-button-outline:focus, .usa-button.usa-button-outline.usa-button-focus,
-.usa-button-primary.usa-button-outline:focus,
-.usa-button-primary.usa-button-outline.usa-button-focus,
-.usa-button:visited.usa-button-outline:focus,
-.usa-button:visited.usa-button-outline.usa-button-focus,
-.usa-button-primary:visited.usa-button-outline:focus,
-.usa-button-primary:visited.usa-button-outline.usa-button-focus,
-button.usa-button-outline:focus,
-button.usa-button-outline.usa-button-focus,
-[type=button].usa-button-outline:focus,
-[type=button].usa-button-outline.usa-button-focus,
-[type=submit].usa-button-outline:focus,
-[type=submit].usa-button-outline.usa-button-focus,
-[type=reset].usa-button-outline:focus,
-[type=reset].usa-button-outline.usa-button-focus,
-[type=image].usa-button-outline:focus,
-[type=image].usa-button-outline.usa-button-focus {
-  box-shadow: inset 0 0 0 2px #112e51, 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-}
-
-.usa-button.usa-button-outline-inverse,
-.usa-button-primary.usa-button-outline-inverse,
-.usa-button:visited.usa-button-outline-inverse,
-.usa-button-primary:visited.usa-button-outline-inverse,
-button.usa-button-outline-inverse,
-[type=button].usa-button-outline-inverse,
-[type=submit].usa-button-outline-inverse,
-[type=reset].usa-button-outline-inverse,
-[type=image].usa-button-outline-inverse {
-  background: transparent;
-  box-shadow: inset 0 0 0 2px #ffffff;
-  color: #ffffff;
-}
-
-.usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,
-.usa-button-primary.usa-button-outline-inverse:hover,
-.usa-button-primary.usa-button-outline-inverse.usa-button-hover,
-.usa-button:visited.usa-button-outline-inverse:hover,
-.usa-button:visited.usa-button-outline-inverse.usa-button-hover,
-.usa-button-primary:visited.usa-button-outline-inverse:hover,
-.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,
-button.usa-button-outline-inverse:hover,
-button.usa-button-outline-inverse.usa-button-hover,
-[type=button].usa-button-outline-inverse:hover,
-[type=button].usa-button-outline-inverse.usa-button-hover,
-[type=submit].usa-button-outline-inverse:hover,
-[type=submit].usa-button-outline-inverse.usa-button-hover,
-[type=reset].usa-button-outline-inverse:hover,
-[type=reset].usa-button-outline-inverse.usa-button-hover,
-[type=image].usa-button-outline-inverse:hover,
-[type=image].usa-button-outline-inverse.usa-button-hover {
-  box-shadow: inset 0 0 0 2px #d6d7d9;
-  color: #d6d7d9;
+.usa-button.usa-button-red,
+.usa-button-primary.usa-button-red,
+.usa-button:visited.usa-button-red,
+.usa-button-primary:visited.usa-button-red,
+button.usa-button-red,
+[type=button].usa-button-red,
+[type=submit].usa-button-red,
+[type=reset].usa-button-red,
+[type=image].usa-button-red {
+  background-color: #e31c3d;
 }
 
-.usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,
-.usa-button-primary.usa-button-outline-inverse:active,
-.usa-button-primary.usa-button-outline-inverse.usa-button-active,
-.usa-button:visited.usa-button-outline-inverse:active,
-.usa-button:visited.usa-button-outline-inverse.usa-button-active,
-.usa-button-primary:visited.usa-button-outline-inverse:active,
-.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,
-button.usa-button-outline-inverse:active,
-button.usa-button-outline-inverse.usa-button-active,
-[type=button].usa-button-outline-inverse:active,
-[type=button].usa-button-outline-inverse.usa-button-active,
-[type=submit].usa-button-outline-inverse:active,
-[type=submit].usa-button-outline-inverse.usa-button-active,
-[type=reset].usa-button-outline-inverse:active,
-[type=reset].usa-button-outline-inverse.usa-button-active,
-[type=image].usa-button-outline-inverse:active,
-[type=image].usa-button-outline-inverse.usa-button-active {
-  box-shadow: inset 0 0 0 2px #aeb0b5;
-  color: #d6d7d9;
+.usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,
+.usa-button-primary.usa-button-red:hover,
+.usa-button-primary.usa-button-red.usa-button-hover,
+.usa-button:visited.usa-button-red:hover,
+.usa-button:visited.usa-button-red.usa-button-hover,
+.usa-button-primary:visited.usa-button-red:hover,
+.usa-button-primary:visited.usa-button-red.usa-button-hover,
+button.usa-button-red:hover,
+button.usa-button-red.usa-button-hover,
+[type=button].usa-button-red:hover,
+[type=button].usa-button-red.usa-button-hover,
+[type=submit].usa-button-red:hover,
+[type=submit].usa-button-red.usa-button-hover,
+[type=reset].usa-button-red:hover,
+[type=reset].usa-button-red.usa-button-hover,
+[type=image].usa-button-red:hover,
+[type=image].usa-button-red.usa-button-hover {
+  background-color: #cd2026;
 }
 
-.usa-button.usa-button-outline-inverse:focus, .usa-button.usa-button-outline-inverse.usa-button-focus,
-.usa-button-primary.usa-button-outline-inverse:focus,
-.usa-button-primary.usa-button-outline-inverse.usa-button-focus,
-.usa-button:visited.usa-button-outline-inverse:focus,
-.usa-button:visited.usa-button-outline-inverse.usa-button-focus,
-.usa-button-primary:visited.usa-button-outline-inverse:focus,
-.usa-button-primary:visited.usa-button-outline-inverse.usa-button-focus,
-button.usa-button-outline-inverse:focus,
-button.usa-button-outline-inverse.usa-button-focus,
-[type=button].usa-button-outline-inverse:focus,
-[type=button].usa-button-outline-inverse.usa-button-focus,
-[type=submit].usa-button-outline-inverse:focus,
-[type=submit].usa-button-outline-inverse.usa-button-focus,
-[type=reset].usa-button-outline-inverse:focus,
-[type=reset].usa-button-outline-inverse.usa-button-focus,
-[type=image].usa-button-outline-inverse:focus,
-[type=image].usa-button-outline-inverse.usa-button-focus {
-  box-shadow: inset 0 0 0 2px #aeb0b5, 0 0 3px #3e94cf, 0 0 7px #3e94cf;
+.usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,
+.usa-button-primary.usa-button-red:active,
+.usa-button-primary.usa-button-red.usa-button-active,
+.usa-button:visited.usa-button-red:active,
+.usa-button:visited.usa-button-red.usa-button-active,
+.usa-button-primary:visited.usa-button-red:active,
+.usa-button-primary:visited.usa-button-red.usa-button-active,
+button.usa-button-red:active,
+button.usa-button-red.usa-button-active,
+[type=button].usa-button-red:active,
+[type=button].usa-button-red.usa-button-active,
+[type=submit].usa-button-red:active,
+[type=submit].usa-button-red.usa-button-active,
+[type=reset].usa-button-red:active,
+[type=reset].usa-button-red.usa-button-active,
+[type=image].usa-button-red:active,
+[type=image].usa-button-red.usa-button-active {
+  background-color: #981b1e;
 }
 
 .usa-button.usa-button-big,
@@ -1250,28 +1235,139 @@ button.usa-button-big,
 [type=submit].usa-button-big,
 [type=reset].usa-button-big,
 [type=image].usa-button-big {
-  font-size: 1.9rem;
+  border-radius: 8px;
+  font-size: 2.4rem;
   padding: 1.5rem 3rem;
 }
 
-/* stylelint-disable */
 .usa-button:disabled,
+.usa-button-primary:disabled,
+.usa-button:visited:disabled,
+.usa-button-primary:visited:disabled,
+button:disabled,
+[type=button]:disabled,
+[type=submit]:disabled,
+[type=reset]:disabled,
+[type=image]:disabled {
+  background-color: #d6d7d9;
+  pointer-events: none;
+}
+
+.usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,
+.usa-button-primary:disabled:hover,
+.usa-button-primary:disabled.usa-button-hover,
+.usa-button-primary:disabled:active,
+.usa-button-primary:disabled.usa-button-active,
+.usa-button-primary:disabled:focus,
+.usa-button-primary:disabled.usa-focus,
+.usa-button:visited:disabled:hover,
+.usa-button:visited:disabled.usa-button-hover,
+.usa-button:visited:disabled:active,
+.usa-button:visited:disabled.usa-button-active,
+.usa-button:visited:disabled:focus,
+.usa-button:visited:disabled.usa-focus,
+.usa-button-primary:visited:disabled:hover,
+.usa-button-primary:visited:disabled.usa-button-hover,
+.usa-button-primary:visited:disabled:active,
+.usa-button-primary:visited:disabled.usa-button-active,
+.usa-button-primary:visited:disabled:focus,
+.usa-button-primary:visited:disabled.usa-focus,
+button:disabled:hover,
+button:disabled.usa-button-hover,
+button:disabled:active,
+button:disabled.usa-button-active,
+button:disabled:focus,
+button:disabled.usa-focus,
+[type=button]:disabled:hover,
+[type=button]:disabled.usa-button-hover,
+[type=button]:disabled:active,
+[type=button]:disabled.usa-button-active,
+[type=button]:disabled:focus,
+[type=button]:disabled.usa-focus,
+[type=submit]:disabled:hover,
+[type=submit]:disabled.usa-button-hover,
+[type=submit]:disabled:active,
+[type=submit]:disabled.usa-button-active,
+[type=submit]:disabled:focus,
+[type=submit]:disabled.usa-focus,
+[type=reset]:disabled:hover,
+[type=reset]:disabled.usa-button-hover,
+[type=reset]:disabled:active,
+[type=reset]:disabled.usa-button-active,
+[type=reset]:disabled:focus,
+[type=reset]:disabled.usa-focus,
+[type=image]:disabled:hover,
+[type=image]:disabled.usa-button-hover,
+[type=image]:disabled:active,
+[type=image]:disabled.usa-button-active,
+[type=image]:disabled:focus,
+[type=image]:disabled.usa-focus {
+  background-color: #d6d7d9;
+  border: 0;
+  box-shadow: none;
+}
+
+/* stylelint-disable */
 .usa-button-disabled {
   background-color: #d6d7d9;
-  color: #323a45;
   pointer-events: none;
 }
 
-.usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus,
-.usa-button-disabled:hover,
-.usa-button-disabled.usa-button-hover,
-.usa-button-disabled:active,
-.usa-button-disabled.usa-button-active,
-.usa-button-disabled:focus {
+.usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {
   background-color: #d6d7d9;
   border: 0;
   box-shadow: none;
-  color: #323a45;
+}
+
+.usa-button-secondary-disabled,
+.usa-button-secondary-inverse-disabled,
+.usa-button-secondary:disabled,
+.usa-button-secondary-inverse:disabled,
+.usa-button-outline-inverse:disabled {
+  box-shadow: inset 0 0 0 2px #d6d7d9;
+  pointer-events: none;
+  color: #d6d7d9;
+}
+
+.usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,
+.usa-button-secondary-inverse-disabled:hover,
+.usa-button-secondary-inverse-disabled.usa-button-hover,
+.usa-button-secondary-inverse-disabled:active,
+.usa-button-secondary-inverse-disabled.usa-button-active,
+.usa-button-secondary-inverse-disabled:focus,
+.usa-button-secondary-inverse-disabled.usa-focus,
+.usa-button-secondary:disabled:hover,
+.usa-button-secondary:disabled.usa-button-hover,
+.usa-button-secondary:disabled:active,
+.usa-button-secondary:disabled.usa-button-active,
+.usa-button-secondary:disabled:focus,
+.usa-button-secondary:disabled.usa-focus,
+.usa-button-secondary-inverse:disabled:hover,
+.usa-button-secondary-inverse:disabled.usa-button-hover,
+.usa-button-secondary-inverse:disabled:active,
+.usa-button-secondary-inverse:disabled.usa-button-active,
+.usa-button-secondary-inverse:disabled:focus,
+.usa-button-secondary-inverse:disabled.usa-focus,
+.usa-button-outline-inverse:disabled:hover,
+.usa-button-outline-inverse:disabled.usa-button-hover,
+.usa-button-outline-inverse:disabled:active,
+.usa-button-outline-inverse:disabled.usa-button-active,
+.usa-button-outline-inverse:disabled:focus,
+.usa-button-outline-inverse:disabled.usa-focus {
+  background-color: #ffffff;
+  border: 0;
+}
+
+html .usa-button-secondary-disabled,
+.usa-button-secondary:disabled {
+  background-color: #ffffff;
+}
+
+html .usa-button-secondary-inverse-disabled,
+.usa-button-secondary-inverse:disabled {
+  background-color: transparent;
+  color: #5b616b;
+  box-shadow: inset 0 0 0 2px #5b616b;
 }
 
 .usa-button-unstyled {
@@ -1280,7 +1376,6 @@ button.usa-button-big,
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
@@ -1334,19 +1429,10 @@ select {
   line-height: 1.3;
   margin: 0.2em 0;
   max-width: 46rem;
-  outline: none;
   padding: 1rem 0.7em;
   width: 100%;
 }
 
-input:focus, input.usa-input-focus,
-textarea:focus,
-textarea.usa-input-focus,
-select:focus,
-select.usa-input-focus {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-}
-
 input.usa-input-success,
 textarea.usa-input-success,
 select.usa-input-success {
@@ -1401,7 +1487,12 @@ select.usa-input-success {
 
 .usa-input-required:after {
   color: #981b1e;
-  content: ' (*Required)';
+  content: ' (*required)';
+}
+
+.usa-input-optional:after {
+  color: #757575;
+  content: ' (optional)';
 }
 
 label {
@@ -1419,11 +1510,30 @@ select {
   -webkit-appearance: none;
   appearance: none;
   background-color: #ffffff;
-  background-image: url("../img/arrow-down.png");
-  background-image: url("../img/arrow-down.svg");
+  background-image: url("../img/arrow-both.png");
+  background-image: url("../img/arrow-both.svg");
   background-position: right 1.3rem center;
   background-repeat: no-repeat;
-  background-size: 1.3rem;
+  background-size: 1rem;
+  padding-right: 3rem;
+}
+
+select::-ms-expand {
+  display: none;
+}
+
+select:-webkit-autofill {
+  -webkit-appearance: menulist;
+  appearance: menulist;
+}
+
+select:-moz-focusring {
+  color: transparent;
+  text-shadow: 0 0 0 #000000;
+}
+
+option:first-child {
+  font-weight: 700;
 }
 
 legend {
@@ -1460,30 +1570,31 @@ legend {
 [type=radio] + label {
   cursor: pointer;
   font-weight: 400;
-  margin-bottom: 0.5em;
+  margin-bottom: 0.65em;
 }
 
 [type=checkbox] + label::before,
 [type=radio] + label::before {
   background: #ffffff;
-  border-radius: 3px;
+  border-radius: 2px;
   box-shadow: 0 0 0 1px #757575;
   content: '\a0';
   display: inline-block;
-  height: 1.8rem;
-  line-height: 1.8rem;
+  height: 2rem;
+  line-height: 2rem;
   margin-right: 0.6em;
   text-indent: 0.15em;
   vertical-align: middle\0;
-  width: 1.8rem;
+  width: 2rem;
 }
 
 [type=radio] + label::before {
-  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;
-  height: 1.6rem;
-  line-height: 1.6rem;
-  width: 1.6rem;
   border-radius: 100%;
+  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;
+  height: 1.4rem;
+  line-height: 1.4rem;
+  margin-right: 0.75em;
+  width: 1.4rem;
 }
 
 [type=checkbox]:checked + label::before,
@@ -1496,10 +1607,6 @@ legend {
   box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071bc;
 }
 
-[type=radio]:focus + label::before {
-  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071bc, 0 0 3px 4px #3e94cf, 0 0 7px 4px #3e94cf;
-}
-
 [type=checkbox]:checked + label::before,
 [type=checkbox]:checked:disabled + label::before {
   background-image: url("../img/correct8.png");
@@ -1508,17 +1615,23 @@ legend {
   background-repeat: no-repeat;
 }
 
-[type=checkbox]:focus + label::before {
-  box-shadow: 0 0 0 1px #ffffff, 0 0 0 3px #0071bc;
+[type=radio]:focus + label::before {
+  outline: 2px dotted #aeb0b5;
+  outline-offset: 6px;
 }
 
 [type=checkbox]:disabled + label {
-  color: #5b616b;
+  color: #d6d7d9;
+}
+
+[type=checkbox]:focus + label::before {
+  outline: 2px dotted #aeb0b5;
+  outline-offset: 3px;
 }
 
 [type=checkbox]:disabled + label::before,
 [type=radio]:disabled + label::before {
-  background: #d6d7d9;
+  background: #f1f1f1;
   box-shadow: 0 0 0 1px #aeb0b5;
   cursor: not-allowed;
 }
@@ -1530,11 +1643,6 @@ legend {
   width: 100%;
 }
 
-[type=range]:focus {
-  box-shadow: none;
-  outline: none;
-}
-
 [type=range]::-webkit-slider-runnable-track {
   background: #aeb0b5;
   border: 1px solid #757575;
@@ -1600,18 +1708,6 @@ legend {
   border-radius: 2rem;
 }
 
-[type=range]:focus::-webkit-slider-thumb {
-  border: 2px solid #3e94cf;
-}
-
-[type=range]:focus::-moz-range-thumb {
-  border: 2px solid #3e94cf;
-}
-
-[type=range]:focus::-ms-thumb {
-  border: 2px solid #3e94cf;
-}
-
 .usa-date-of-birth label {
   margin-top: 0;
 }
@@ -1641,8 +1737,8 @@ legend {
 }
 
 .usa-label, .usa-label-big {
-  background-color: #0071bc;
-  border-radius: 3px;
+  background-color: #5b616b;
+  border-radius: 2px;
   color: #ffffff;
   font-size: 1.5rem;
   margin-right: 0.5rem;
@@ -1707,34 +1803,31 @@ p + ol {
 table {
   border-spacing: 0;
   margin: 2em 0;
-  min-width: 100%;
 }
 
-table thead th,
-table thead td {
-  background-color: #f1f1f1;
+thead th {
+  font-weight: 700;
 }
 
-table th {
-  text-align: left;
+thead th,
+thead td {
+  background-color: #f1f1f1;
 }
 
-table tbody th {
-  font-weight: 400;
+th {
+  text-align: left;
 }
 
-table th,
-table td {
+th,
+td {
   background-color: #ffffff;
   border: 1px solid #5b616b;
-  padding: 1.5rem;
-}
-
-.usa-table-borderless thead tr {
-  background-color: transparent;
+  font-weight: 400;
+  padding: 1rem 1.5rem;
 }
 
 .usa-table-borderless thead th {
+  background-color: transparent;
   border-top: 0;
 }
 
@@ -1744,6 +1837,18 @@ table td {
   border-right: 0;
 }
 
+.usa-table-borderless th:first-child {
+  padding-left: 0;
+}
+
+caption {
+  font-size: 1.5rem;
+  font-weight: 700;
+  font-family: "Merriweather", "Georgia", "Cambria", "Times New Roman", "Times", serif;
+  margin-bottom: 1.2rem;
+  text-align: left;
+}
+
 html {
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-size: 10px;
@@ -1768,13 +1873,13 @@ a:hover, a:active {
   color: #205493;
 }
 
-a:visited {
-  color: #4c2c92;
+a:focus {
+  outline: 2px dotted #aeb0b5;
+  outline-offset: 3px;
 }
 
-a:focus {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-  outline: 0;
+a:visited {
+  color: #4c2c92;
 }
 
 .usa-external_link::after {
@@ -1815,8 +1920,7 @@ h1,
 h2,
 h3,
 h4,
-h5,
-h6 {
+h5 {
   clear: both;
   font-family: "Merriweather", "Georgia", "Cambria", "Times New Roman", "Times", serif;
   line-height: 1.3;
@@ -1824,6 +1928,10 @@ h6 {
   margin-top: 1.5em;
 }
 
+h6 {
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
+}
+
 h1 {
   font-size: 4rem;
   font-weight: 700;
@@ -1850,9 +1958,9 @@ h5 {
 }
 
 h6 {
-  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-size: 1.3rem;
   font-weight: 400;
+  line-height: 1.5;
   text-transform: uppercase;
 }
 
@@ -1863,14 +1971,14 @@ dfn {
   font-style: normal;
 }
 
-.usa-content p:not(.usa-font-lead),
+.usa-content p,
 .usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),
 .usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {
-  max-width: 53rem;
+  max-width: 66ch;
 }
 
 .usa-content-list {
-  max-width: 53rem;
+  max-width: 66ch;
 }
 
 .usa-sans p,
@@ -1915,6 +2023,7 @@ dfn {
 .usa-font-lead {
   font-family: "Merriweather", "Georgia", "Cambria", "Times New Roman", "Times", serif;
   font-size: 2rem;
+  font-weight: 400;
   line-height: 1.7;
   max-width: 77rem;
 }
@@ -2086,7 +2195,7 @@ dfn {
   background-color: #f1f1f1;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   list-style: none;
-  margin-bottom: 6px;
+  margin-bottom: 0.5rem;
   width: 100%;
 }
 
@@ -2097,23 +2206,22 @@ dfn {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
   background-color: #f1f1f1;
   background-image: url("../img/minus.png");
   background-image: url("../img/minus.svg");
-  background-position: right 3rem center;
+  background-position: right 2rem center;
   background-repeat: no-repeat;
-  background-size: 13px;
+  background-size: 1.5rem;
   color: #212121;
   cursor: pointer;
   display: inline-block;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-weight: 700;
   margin: 0;
-  padding: 1.5rem 5.5rem 1.5rem 3rem;
+  padding: 1.5rem 5.5rem 1.5rem 2rem;
   width: 100%;
 }
 
@@ -2122,11 +2230,6 @@ dfn {
   background-color: transparent;
 }
 
-.usa-accordion > ul button:focus,
-.usa-accordion-bordered > ul button:focus {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-}
-
 .usa-accordion > ul button:hover,
 .usa-accordion-bordered > ul button:hover {
   background-color: #d6d7d9;
@@ -2153,7 +2256,7 @@ dfn {
   background-image: url("../img/plus.png");
   background-image: url("../img/plus.svg");
   background-repeat: no-repeat;
-  background-size: 1.3rem;
+  background-size: 1.5rem;
 }
 
 .usa-accordion > li,
@@ -2161,7 +2264,7 @@ dfn {
   background-color: #f1f1f1;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   list-style: none;
-  margin-bottom: 6px;
+  margin-bottom: 0.5rem;
   width: 100%;
 }
 
@@ -2174,7 +2277,7 @@ dfn {
 .usa-accordion-content {
   background-color: #ffffff;
   overflow: auto;
-  padding: 3rem;
+  padding: 1.5rem 2rem;
 }
 
 .usa-accordion-content > *:first-child {
@@ -2200,23 +2303,22 @@ dfn {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
   background-color: #f1f1f1;
   background-image: url("../img/minus.png");
   background-image: url("../img/minus.svg");
-  background-position: right 3rem center;
+  background-position: right 2rem center;
   background-repeat: no-repeat;
-  background-size: 13px;
+  background-size: 1.5rem;
   color: #212121;
   cursor: pointer;
   display: inline-block;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-weight: 700;
   margin: 0;
-  padding: 1.5rem 5.5rem 1.5rem 3rem;
+  padding: 1.5rem 5.5rem 1.5rem 2rem;
   width: 100%;
 }
 
@@ -2224,10 +2326,6 @@ dfn {
   background-color: transparent;
 }
 
-.usa-accordion-button:focus {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
-}
-
 .usa-accordion-button:hover {
   background-color: #d6d7d9;
   color: #212121;
@@ -2246,22 +2344,29 @@ dfn {
   background-image: url("../img/plus.png");
   background-image: url("../img/plus.svg");
   background-repeat: no-repeat;
-  background-size: 1.3rem;
+  background-size: 1.5rem;
 }
 
 .usa-alert {
   background-color: #f1f1f1;
-  background-position: 1rem 2rem;
+  background-position: 2rem 2rem;
   background-repeat: no-repeat;
-  background-size: 4rem;
-  margin-top: 1.5em;
-  padding: 1em;
+  background-size: 5.2rem;
+  padding-bottom: 1.4rem;
+  padding-left: 3rem;
+  padding-right: 2rem;
+  padding-top: 2rem;
+  position: relative;
 }
 
-@media screen and (min-width: 600px) {
-  .usa-alert {
-    background-size: 5.2rem;
-  }
+.usa-alert::before {
+  background-color: #8b8b8b;
+  content: '';
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 1rem;
 }
 
 .usa-alert a {
@@ -2274,8 +2379,19 @@ dfn {
 
 .usa-alert ul {
   margin-bottom: 0;
-  margin-top: 1em;
-  padding-left: 1em;
+  margin-top: 1rem;
+  padding-left: 1rem;
+}
+
+.usa-alert-slim {
+  background-position: 2rem 1rem;
+  padding-bottom: 1rem;
+  padding-top: 1rem;
+}
+
+.usa-alert-slim .usa-alert-text:only-child {
+  margin-bottom: 0.5rem;
+  padding-top: 0.5rem;
 }
 
 .usa-alert-icon {
@@ -2285,33 +2401,13 @@ dfn {
 
 .usa-alert-body {
   display: table-cell;
-  padding-left: 3.5rem;
+  padding-left: 5rem;
   vertical-align: top;
 }
 
-@media screen and (min-width: 600px) {
-  .usa-alert-body {
-    padding-left: 5rem;
-  }
-}
-
-.usa-alert-body p:first-child {
-  margin-top: 0.8rem;
-}
-
-.usa-alert-body p:last-child {
-  margin-bottom: 0.8rem;
-}
-
 .usa-alert-heading {
-  margin-bottom: .3rem;
   margin-top: 0;
-}
-
-@media screen and (min-width: 600px) {
-  .usa-alert-heading {
-    margin-top: .3rem;
-  }
+  margin-bottom: 0;
 }
 
 .usa-alert-text {
@@ -2320,37 +2416,61 @@ dfn {
   margin-top: 0;
 }
 
+.usa-alert-text:only-child {
+  margin-bottom: 1rem;
+  padding-top: 0.5rem;
+}
+
 .usa-alert-success {
   background-color: #e7f4e4;
   background-image: url("../img/alerts/success.png");
   background-image: url("../img/alerts/success.svg");
 }
 
+.usa-alert-success::before {
+  background-color: #2e8540;
+}
+
 .usa-alert-warning {
   background-color: #fff1d2;
   background-image: url("../img/alerts/warning.png");
   background-image: url("../img/alerts/warning.svg");
 }
 
+.usa-alert-warning::before {
+  background-color: #fdb81e;
+}
+
 .usa-alert-error {
   background-color: #f9dede;
   background-image: url("../img/alerts/error.png");
   background-image: url("../img/alerts/error.svg");
 }
 
+.usa-alert-error::before {
+  background-color: #e31c3d;
+}
+
 .usa-alert-info {
   background-color: #e1f3f8;
   background-image: url("../img/alerts/info.png");
   background-image: url("../img/alerts/info.svg");
 }
 
+.usa-alert-info::before {
+  background-color: #02bfe7;
+}
+
 .usa-alert-no_icon {
   background-image: none;
 }
 
 .usa-alert-paragraph {
-  width: 53rem;
-  padding: 1em 3em 1em 1em;
+  width: 66ch;
+}
+
+.usa-alert {
+  margin-top: 1.5em;
 }
 
 .usa-banner {
@@ -2527,7 +2647,6 @@ dfn {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
@@ -2574,8 +2693,8 @@ dfn {
 }
 
 .usa-banner-button[aria-expanded=false]::after {
-  background-image: url(../img/angle-arrow-down-primary.png);
-  background-image: url(../img/angle-arrow-down-primary.svg);
+  background-image: url("../img/angle-arrow-down-primary.png");
+  background-image: url("../img/angle-arrow-down-primary.svg");
   background-size: 100%;
   content: '';
   display: inline-block;
@@ -2587,8 +2706,8 @@ dfn {
 }
 
 .usa-banner-button[aria-expanded=false]:hover::after {
-  background-image: url(../img/angle-arrow-down-primary-hover.png);
-  background-image: url(../img/angle-arrow-down-primary-hover.svg);
+  background-image: url("../img/angle-arrow-down-primary-hover.png");
+  background-image: url("../img/angle-arrow-down-primary-hover.svg");
 }
 
 .usa-banner-button[aria-expanded=false]::after {
@@ -2601,8 +2720,8 @@ dfn {
 }
 
 .usa-banner-button[aria-expanded=true]::after {
-  background-image: url(../img/close.png);
-  background-image: url(../img/close.svg);
+  background-image: url("../img/close.png");
+  background-image: url("../img/close.svg");
   background-size: 100%;
   content: '';
   display: inline-block;
@@ -2620,8 +2739,8 @@ dfn {
     position: relative;
   }
   .usa-banner-button[aria-expanded=true]::after {
-    background-image: url(../img/angle-arrow-up-primary.png);
-    background-image: url(../img/angle-arrow-up-primary.svg);
+    background-image: url("../img/angle-arrow-up-primary.png");
+    background-image: url("../img/angle-arrow-up-primary.svg");
     background-size: 100%;
     content: '';
     display: inline-block;
@@ -2632,8 +2751,8 @@ dfn {
     /* stylelint-enable */
   }
   .usa-banner-button[aria-expanded=true]:hover::after {
-    background-image: url(../img/angle-arrow-up-primary-hover.png);
-    background-image: url(../img/angle-arrow-up-primary-hover.svg);
+    background-image: url("../img/angle-arrow-up-primary-hover.png");
+    background-image: url("../img/angle-arrow-up-primary-hover.svg");
   }
   .usa-banner-button[aria-expanded=true]::after {
     background-position-y: 1px;
@@ -2690,13 +2809,29 @@ dfn {
   text-decoration: underline;
 }
 
-.usa-footer a {
-  font-weight: normal;
+.usa-footer .usa-footer-primary-link ~ li a,
+.usa-footer .usa-footer-secondary-link {
+  text-decoration: none;
+}
+
+.usa-footer-contact_info {
+  display: inline-block;
+}
+
+.usa-footer-contact_info a {
+  color: #212121;
+  text-decoration: none;
+}
+
+.usa-footer-contact_info:hover {
+  text-decoration: underline;
 }
 
 .usa-footer-return-to-top {
+  color: #0071bc;
   padding-bottom: 2rem;
   padding-top: 2rem;
+  text-decoration: underline;
 }
 
 .usa-footer-primary-section {
@@ -2704,7 +2839,7 @@ dfn {
 }
 
 .usa-footer-primary-section .usa-footer-primary-content {
-  padding-left: 2.5rem;
+  padding-left: 1.5rem;
   padding-right: 2.5rem;
 }
 
@@ -2732,20 +2867,56 @@ dfn {
   }
 }
 
-.usa-footer-medium .usa-footer-primary-section {
+.usa-footer-medium .usa-footer-contact_info p {
+  margin: 0 1rem 0 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-medium .usa-footer-contact_info p {
+    margin: 0 0 0 1rem;
+  }
+}
+
+.usa-footer-medium .usa-footer-contact-heading {
+  margin-top: 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-medium .usa-footer-contact-heading {
+    margin-top: 0.5rem;
+    margin-bottom: 0.5rem;
+  }
+}
+
+.usa-footer-medium .usa-footer-logo {
+  padding: 1rem 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-medium .usa-footer-logo {
+    padding: 2rem 0;
+  }
+}
+
+.usa-footer-medium .usa-footer-primary-link {
+  padding-bottom: 1.5rem;
+  padding-top: 1.5rem;
+}
+
+.usa-footer-medium .usa-footer-primary-section > .usa-grid {
   padding: 0;
 }
 
 @media screen and (min-width: 600px) {
-  .usa-footer-medium .usa-footer-primary-section {
-    padding-bottom: 1rem;
-    padding-top: 1rem;
+  .usa-footer-medium .usa-footer-primary-section > .usa-grid {
+    padding-left: 3rem;
+    padding-right: 3rem;
   }
 }
 
 @media screen and (min-width: 1201px) {
   .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {
-    margin-right: 6%;
+    margin-right: 5%;
     width: inherit;
   }
 }
@@ -2770,7 +2941,7 @@ dfn {
 
 @media screen and (min-width: 1201px) {
   .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {
-    margin-right: 9%;
+    margin-right: 5%;
     width: inherit;
   }
 }
@@ -2781,14 +2952,26 @@ dfn {
   }
 }
 
-.usa-footer-slim .usa-footer-primary-section {
-  padding-bottom: 2rem;
+.usa-footer-slim .usa-footer-primary-link {
+  padding-bottom: 1.5rem;
+  padding-top: 1.5rem;
+}
+
+.usa-footer-slim .usa-footer-primary-section > .usa-grid {
+  padding: 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-slim .usa-footer-primary-section > .usa-grid {
+    padding-left: 3rem;
+    padding-right: 3rem;
+  }
 }
 
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-primary-section {
-    padding-bottom: 1rem;
-    padding-top: 1rem;
+    padding-bottom: 0;
+    padding-top: 0;
   }
   .usa-footer-slim .usa-footer-primary-section .usa-grid-full {
     -webkit-box-align: center;
@@ -2805,8 +2988,8 @@ dfn {
 
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-contact_info {
-    padding-top: 2rem;
-    padding-bottom: 2rem;
+    padding-top: 1.5rem;
+    padding-bottom: 1.5rem;
   }
 }
 
@@ -2832,7 +3015,7 @@ dfn {
 ul.usa-footer-primary-content,
 li.usa-footer-primary-content,
 li.usa-footer-primary-content {
-  border-top: 1px solid #212121;
+  border-top: 1px solid #aeb0b5;
 }
 
 @media screen and (min-width: 600px) {
@@ -2846,7 +3029,7 @@ li.usa-footer-primary-content {
 ul.usa-footer-primary-content:last-child,
 li.usa-footer-primary-content:last-child,
 li.usa-footer-primary-content:last-child {
-  border-bottom: 1px solid #212121;
+  border-bottom: 1px solid #aeb0b5;
 }
 
 @media screen and (min-width: 600px) {
@@ -2859,9 +3042,9 @@ li.usa-footer-primary-content:last-child {
 
 /* stylelint-enable */
 .usa-sign_up-block {
-  padding-bottom: 2rem;
-  padding-left: 2.5rem;
-  padding-right: 2.5rem;
+  padding-bottom: 4.5rem;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
 }
 
 @media screen and (min-width: 600px) {
@@ -2887,8 +3070,8 @@ li.usa-footer-primary-content:last-child {
 
 .usa-footer-secondary_section {
   background-color: #d6d7d9;
-  padding-bottom: 3rem;
-  padding-top: 3rem;
+  padding-bottom: 2rem;
+  padding-top: 2rem;
 }
 
 .usa-footer-secondary_section a {
@@ -2897,7 +3080,8 @@ li.usa-footer-primary-content:last-child {
 
 @media screen and (min-width: 600px) {
   .usa-footer-big-secondary-section {
-    padding-top: 5rem;
+    padding-top: 2rem;
+    padding-bottom: 2rem;
   }
 }
 
@@ -2911,6 +3095,36 @@ li.usa-footer-primary-content:last-child {
   text-decoration: none;
 }
 
+.usa-footer-big .usa-footer-contact_info {
+  display: block;
+}
+
+.usa-footer-big .usa-footer-contact_info p {
+  margin: 0 1rem 0 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-big .usa-footer-contact_info p {
+    margin: 0.5rem 0 0 1rem;
+  }
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-big .usa-footer-contact-links {
+    padding-top: 2rem;
+  }
+}
+
+.usa-footer-big .usa-footer-logo {
+  padding: 1rem 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-big .usa-footer-logo {
+    padding: 2rem 0;
+  }
+}
+
 @media screen and (min-width: 600px) {
   .usa-footer-big .usa-footer-primary-section {
     padding-bottom: 4rem;
@@ -2918,8 +3132,38 @@ li.usa-footer-primary-content:last-child {
   }
 }
 
+.usa-footer-big .usa-footer-primary-section > .usa-grid {
+  padding: 0;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-big .usa-footer-primary-section > .usa-grid {
+    padding-left: 3rem;
+    padding-right: 3rem;
+  }
+}
+
+.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {
+  margin-left: 1.5rem;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {
+    margin-left: 0;
+  }
+}
+
+.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {
+  margin-left: 0;
+}
+
 .usa-footer-big ul {
-  padding-bottom: 2.5rem;
+  padding-bottom: 2.4rem;
 }
 
 @media screen and (min-width: 600px) {
@@ -2929,7 +3173,7 @@ li.usa-footer-primary-content:last-child {
 }
 
 .usa-footer-big ul:last-child {
-  border-bottom: 1px solid #212121;
+  border-bottom: 1px solid #aeb0b5;
 }
 
 @media screen and (min-width: 600px) {
@@ -2938,8 +3182,10 @@ li.usa-footer-primary-content:last-child {
   }
 }
 
-.usa-footer-big ul li {
-  line-height: 2em;
+.usa-footer-big ul li:not(.usa-footer-primary-link) {
+  line-height: 1.3;
+  padding-bottom: 0.35em;
+  padding-top: 0.35em;
 }
 
 .usa-footer-big ul .usa-footer-primary-link {
@@ -3003,37 +3249,60 @@ li.usa-footer-primary-content:last-child {
 }
 
 .usa-footer-logo-img {
-  max-width: 14rem;
+  max-width: 8rem;
+}
+
+@media screen and (min-width: 600px) {
+  .usa-footer-logo-img {
+    float: left;
+  }
+}
+
+.usa-footer-big-logo-img {
+  max-width: 10rem;
 }
 
 .usa-footer-slim-logo-img {
   float: left;
-  max-width: 10rem;
+  max-width: 5rem;
 }
 
 .usa-footer-logo-heading {
-  margin-top: 2rem;
+  display: block;
+  margin-top: 1rem;
 }
 
-.usa-footer-contact-heading {
-  margin-top: 0;
+@media screen and (min-width: 600px) {
+  .usa-footer-logo-heading {
+    display: inline-block;
+    margin-top: 3rem;
+    padding-left: 1.5rem;
+  }
+}
+
+.usa-footer-big-logo-heading {
+  margin-top: 1.5rem;
 }
 
 @media screen and (min-width: 600px) {
-  .usa-footer-contact-heading {
-    margin-top: 1rem;
+  .usa-footer-big-logo-heading {
+    margin-top: 2rem;
   }
 }
 
 .usa-footer-slim-logo-heading {
-  display: block;
-  padding-top: 1rem;
+  display: inline-block;
+  margin-top: 1.5rem;
+  padding-left: 1.5rem;
+}
+
+.usa-footer-contact-heading {
+  margin-top: 0;
 }
 
 @media screen and (min-width: 600px) {
-  .usa-footer-slim-logo-heading {
-    display: inline-block;
-    padding-left: 1em;
+  .usa-footer-contact-heading {
+    margin-top: 1rem;
   }
 }
 
@@ -3052,8 +3321,8 @@ li.usa-footer-primary-content:last-child {
 
 @media screen and (min-width: 600px) {
   .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {
-    margin: 0 0 0 1rem;
-    left: 1.2rem;
+    margin: 0 0 0 0.5rem;
+    left: 1.5rem;
   }
 }
 
@@ -3283,7 +3552,7 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-header {
-    border-bottom: 1px solid #aeb0b5;
+    border-bottom: 1px solid #d6d7d9;
   }
 }
 
@@ -3291,14 +3560,9 @@ input.usa-input-medium {
   border-bottom: none;
 }
 
-.usa-header .usa-search {
-  margin-bottom: 1.5rem;
-}
-
 @media screen and (min-width: 951px) {
   .usa-header .usa-search {
     float: right;
-    margin-bottom: 0;
     max-width: 21.5rem;
   }
 }
@@ -3354,7 +3618,6 @@ input.usa-input-medium {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
@@ -3411,7 +3674,7 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-header-basic .usa-logo {
-    bottom: 1.9rem;
+    bottom: 0;
     position: absolute;
   }
 }
@@ -3463,7 +3726,7 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav {
-    border-top: 1px solid #aeb0b5;
+    border-top: 1px solid #d6d7d9;
     float: none;
     padding: 0;
     width: 100%;
@@ -3476,7 +3739,7 @@ input.usa-input-medium {
     margin-left: auto;
     margin-right: auto;
     padding-right: 3rem;
-    padding-left: 2rem;
+    padding-left: 1.5rem;
     margin-top: -1px;
     max-width: 1040px;
     position: relative;
@@ -3503,13 +3766,14 @@ input.usa-input-medium {
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {
     /* stylelint-disable-line selector-no-qualifying-type */
-    background-position: right 1.5rem top 50%;
+    background-position: right 1.5rem top 53%;
   }
 }
 
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-link {
-    padding-top: 1.9rem;
+    padding-top: 1.8rem;
+    padding-bottom: 1.8rem;
   }
 }
 
@@ -3554,13 +3818,7 @@ input.usa-input-medium {
 
 .usa-hero-callout > *:first-child {
   margin-top: 0;
-  margin-bottom: 3rem;
-}
-
-.usa-hero-callout .usa-button {
-  font-size: 1.4rem;
-  margin-top: 7rem;
-  width: 100%;
+  margin-bottom: 2rem;
 }
 
 .usa-hero-callout-alt {
@@ -3633,7 +3891,7 @@ input.usa-input-medium {
   .usa-navbar {
     border-bottom: none;
     display: inline-block;
-    height: 10.3rem;
+    height: 7.8rem;
   }
 }
 
@@ -3644,8 +3902,15 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-nav-link:hover span {
-    border-bottom: 0.7rem solid #0071bc;
-    padding-bottom: 1rem;
+    border-bottom: 0.4rem solid #0071bc;
+    padding-bottom: 0.6rem;
+  }
+}
+
+@media screen and (min-width: 951px) {
+  .usa-nav-link.usa-accordion-button span {
+    margin-right: 0;
+    padding-right: 1.5rem;
   }
 }
 
@@ -3692,7 +3957,7 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-nav {
-    padding-top: 5rem;
+    padding-top: 4.5rem;
     padding-right: 0;
     padding-bottom: 0;
     border-left: none;
@@ -3732,6 +3997,12 @@ input.usa-input-medium {
   padding-left: 1.4rem;
 }
 
+@media screen and (min-width: 951px) {
+  .usa-nav .usa-current {
+    color: #212121;
+  }
+}
+
 .usa-nav .usa-button {
   width: 100%;
 }
@@ -3739,6 +4010,7 @@ input.usa-input-medium {
 @media screen and (min-width: 951px) {
   .usa-nav .usa-search {
     margin-left: 1.5rem;
+    top: 4px;
   }
 }
 
@@ -3747,6 +4019,7 @@ input.usa-input-medium {
   margin-bottom: 0;
   list-style-type: none;
   padding-left: 0;
+  margin-top: 1.5rem;
   -webkit-box-ordinal-group: 3;
   -ms-flex-order: 2;
   order: 2;
@@ -3783,6 +4056,7 @@ input.usa-input-medium {
 }
 
 .usa-nav-primary a:focus {
+  outline-offset: 0;
   position: relative;
   z-index: 1;
 }
@@ -3819,11 +4093,11 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-nav-primary > li > a {
-    padding: 1.3rem 1.5rem 1.7rem;
+    padding: 1.3rem 1.5rem 2.2rem;
     color: #5b616b;
     font-size: 1.5rem;
     font-weight: 700;
-    line-height: 1.2;
+    line-height: 1;
   }
 }
 
@@ -3833,20 +4107,27 @@ input.usa-input-medium {
   }
 }
 
+@media screen and (min-width: 951px) {
+  .usa-nav-primary a {
+    padding-top: 0.75rem;
+    padding-bottom: 0.75rem;
+  }
+}
+
 .usa-nav-primary button {
   background-color: transparent;
   border: 0;
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   font-weight: 400;
-  padding: 1.4rem 1.5rem 1rem 1.8rem;
+  line-height: 1.3;
+  padding: 0.85rem 1.5rem 0.85rem 1.8rem;
 }
 
 .usa-nav-primary button:hover {
@@ -3855,18 +4136,17 @@ input.usa-input-medium {
 
 @media screen and (min-width: 951px) {
   .usa-nav-primary button {
-    padding-right: 3rem;
-    padding-bottom: 1.9rem;
-    padding-left: 1.5rem;
+    padding: 1.3rem 1.5rem 2.2rem;
     color: #5b616b;
     font-size: 1.5rem;
     font-weight: 700;
+    line-height: 1;
     width: initial;
   }
 }
 
 .usa-nav-primary button:focus, .usa-nav-primary button:active {
-  box-shadow: 0 0 3px #3e94cf, 0 0 7px #3e94cf;
+  box-shadow: 2px dotted #aeb0b5;
 }
 
 .usa-nav-primary button:hover {
@@ -3893,7 +4173,14 @@ input.usa-input-medium {
   .usa-nav-primary button[aria-expanded=false] {
     background-image: url("../img/angle-arrow-down.png");
     background-image: url("../img/angle-arrow-down.svg");
-    background-position: right 1.5rem top 44%;
+    background-position: right 1.5rem top 40%;
+  }
+}
+
+@media screen and (min-width: 951px) {
+  .usa-nav-primary button[aria-expanded=false]:hover {
+    background-image: url("../img/angle-arrow-down-primary.png");
+    background-image: url("../img/angle-arrow-down-primary.svg");
   }
 }
 
@@ -3912,30 +4199,68 @@ input.usa-input-medium {
     color: #ffffff;
     background-image: url("../img/angle-arrow-down-hover.png");
     background-image: url("../img/angle-arrow-down-hover.svg");
-    background-position: right 1.5rem top 44%;
+    background-position: right 1.5rem top 40%;
   }
   .usa-nav-primary button[aria-expanded=true]:hover {
     background-color: #112e51;
   }
   .usa-nav-primary button[aria-expanded=true] span {
-    border-bottom: 0.7rem solid #0071bc;
-    padding-bottom: 1rem;
+    border-bottom: 0.4rem solid #0071bc;
+    padding-bottom: 0.6rem;
+    color: #ffffff;
   }
 }
 
 @media screen and (min-width: 951px) {
-  .usa-nav-primary a.usa-current {
+  .usa-nav-primary a.usa-current,
+  .usa-nav-primary .usa-current {
     border-left: 0;
     padding-left: 1.5rem;
   }
-  .usa-nav-primary a.usa-current span {
+  .usa-nav-primary a.usa-current:hover span,
+  .usa-nav-primary .usa-current:hover span {
+    color: #0071bc;
+  }
+  .usa-nav-primary a.usa-current span,
+  .usa-nav-primary .usa-current span {
+    border-bottom: 0.4rem solid #0071bc;
+    padding-bottom: 0.6rem;
+    color: #212121;
+  }
+}
+
+@media screen and (min-width: 951px) {
+  .usa-header-extended .usa-nav-link:hover span {
+    border-bottom: 0.7rem solid #0071bc;
+    padding-bottom: 0.9rem;
+  }
+}
+
+.usa-header-extended .usa-nav-primary button[aria-expanded=true] {
+  /* stylelint-disable-line selector-no-qualifying-type */
+}
+
+@media screen and (min-width: 951px) {
+  .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {
+    border-bottom: 0.7rem solid #0071bc;
+    padding-bottom: 0.9rem;
+  }
+}
+
+@media screen and (min-width: 951px) {
+  .usa-header-extended .usa-nav-primary .usa-current span {
     border-bottom: 0.7rem solid #0071bc;
-    padding-bottom: 1rem;
+    padding-bottom: 0.9rem;
   }
 }
 
+.usa-nav-secondary {
+  margin-top: 1.5rem;
+}
+
 @media screen and (min-width: 951px) {
   .usa-nav-secondary {
+    margin-top: 0;
     position: absolute;
     right: 3rem;
     top: -5.7rem;
@@ -3943,36 +4268,42 @@ input.usa-input-medium {
 }
 
 .usa-nav-secondary .usa-search {
-  margin-top: 3rem;
-  margin-bottom: 3rem;
+  margin-top: 1.5rem;
+  margin-bottom: 0;
 }
 
 @media screen and (min-width: 951px) {
   .usa-nav-secondary .usa-search {
-    margin-top: -0.2rem;
+    margin-top: -0.9rem;
     margin-bottom: 0;
     margin-left: 0;
     float: left;
   }
 }
 
+.usa-nav-secondary-links {
+  margin-top: 2.4rem;
+}
+
 @media screen and (min-width: 951px) {
   .usa-nav-secondary-links {
     float: left;
+    margin-top: 0;
   }
 }
 
 @media screen and (min-width: 951px) {
   .usa-nav-secondary-links li {
     display: inline;
-    padding-left: 1rem;
+    padding-left: 0.5rem;
   }
 }
 
 @media screen and (min-width: 951px) {
   .usa-nav-secondary-links li:not(:last-child)::after {
+    color: #d6d7d9;
     content: '|';
-    padding-left: 1rem;
+    padding-left: 0.5rem;
   }
 }
 
@@ -3987,6 +4318,7 @@ input.usa-input-medium {
 .usa-nav-secondary-links a:hover,
 .usa-nav-secondary-links .usa-header-search-button:hover {
   color: #0071bc;
+  text-decoration: underline;
 }
 
 .usa-nav-secondary-links .usa-header-search-button {
@@ -3995,7 +4327,6 @@ input.usa-input-medium {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
@@ -4031,17 +4362,57 @@ input.usa-input-medium {
   }
 }
 
+.usa-nav-submenu {
+  margin-top: 0;
+  margin-bottom: 0;
+  list-style-type: none;
+  padding-left: 0;
+  margin: 0;
+  width: 100%;
+}
+
+.usa-nav-submenu > li {
+  margin-bottom: 0;
+}
+
+.usa-nav-submenu li {
+  border: none;
+  font-size: 1.5rem;
+}
+
+.usa-nav-submenu a {
+  padding-left: 2.8rem;
+  line-height: 1.3;
+}
+
+.usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {
+  /* stylelint-disable-line selector-no-qualifying-type */
+  border: none;
+  padding-left: 2.8rem;
+}
+
+.usa-nav-submenu .usa-sidenav-sub_list a {
+  padding-left: 3.8rem;
+}
+
+.usa-nav-submenu .usa-sidenav-sub_list a:focus {
+  outline-offset: 0;
+}
+
+.usa-nav-submenu .usa-sidenav-sub_list a:hover {
+  padding-left: 3.8rem;
+}
+
 @media screen and (min-width: 951px) {
   .usa-nav-submenu {
     margin-top: 0;
     margin-bottom: 0;
     list-style-type: none;
     padding-left: 0;
-    padding-top: 1.15rem;
-    padding-bottom: 1.15rem;
+    padding-top: 0.75rem;
+    padding-bottom: 0.9rem;
     background-color: #112e51;
-    min-width: 21.5rem;
-    width: auto;
+    width: 21.5rem;
     position: absolute;
   }
   .usa-nav-submenu > li {
@@ -4064,6 +4435,7 @@ input.usa-input-medium {
   .usa-nav-submenu a:hover {
     background-color: #112e51;
     color: #ffffff;
+    padding-left: 1.5rem;
     text-decoration: underline;
   }
 }
@@ -4079,11 +4451,10 @@ input.usa-input-medium {
   border-radius: 0;
   font-weight: 400;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
-  margin: -1.2rem -1.5rem 2.4rem auto;
+  margin: -1.2rem -1.5rem 1.5rem auto;
   float: right;
   height: 4.4rem;
   text-align: center;
@@ -4104,6 +4475,10 @@ input.usa-input-medium {
   width: 1.3rem;
 }
 
+.usa-nav-close + * {
+  clear: both;
+}
+
 .usa-mobile_nav-active {
   overflow: hidden;
 }
@@ -4165,7 +4540,7 @@ input.usa-input-medium {
   .usa-header-basic-megamenu .usa-nav-inner {
     display: block;
     float: right;
-    margin-top: -4.8rem;
+    margin-top: -3.8rem;
   }
 }
 
@@ -4221,29 +4596,6 @@ input.usa-input-medium {
   display: block;
 }
 
-.usa-search [type=search],
-.usa-search .usa-search-input {
-  padding-top: 0;
-  padding-bottom: 0;
-  -webkit-appearance: none;
-  border-bottom-right-radius: 0;
-  border-right: none;
-  border-top-right-radius: 0;
-  box-sizing: border-box;
-  float: left;
-  font-size: 1.4rem;
-  height: 3.3rem;
-  margin: 0;
-  width: calc(100% - 4.5rem);
-}
-
-@media screen and (min-width: 481px) {
-  .usa-search [type=search],
-  .usa-search .usa-search-input {
-    width: calc(100% - 8.5rem);
-  }
-}
-
 .usa-search [type=submit],
 .usa-search .usa-search-submit {
   background-image: url("../img/search.png");
@@ -4266,16 +4618,6 @@ input.usa-input-medium {
   }
 }
 
-.usa-search .usa-search-submit-text {
-  display: none;
-}
-
-@media screen and (min-width: 481px) {
-  .usa-search .usa-search-submit-text {
-    display: block;
-  }
-}
-
 @media screen and (min-width: 481px) {
   .usa-search.usa-search-big [type=search],
   .usa-search.usa-search-big .usa-search-input {
@@ -4313,6 +4655,45 @@ input.usa-input-medium {
   }
 }
 
+input[type=search] {
+  /* stylelint-disable-line selector-no-qualifying-type */
+  box-sizing: border-box;
+  -webkit-appearance: none;
+}
+
+[type=search],
+.usa-search-input {
+  padding-top: 0;
+  padding-bottom: 0;
+  border-bottom-right-radius: 0;
+  border-right: none;
+  border-top-right-radius: 0;
+  box-sizing: border-box;
+  float: left;
+  font-size: 1.4rem;
+  height: 3.3rem;
+  margin: 0;
+  width: calc(100% - 4.5rem);
+}
+
+@media screen and (min-width: 481px) {
+  [type=search],
+  .usa-search-input {
+    width: calc(100% - 8.5rem);
+  }
+}
+
+.usa-search-submit-text {
+  position: absolute;
+  left: -999em;
+}
+
+@media screen and (min-width: 481px) {
+  .usa-search-submit-text {
+    position: static;
+  }
+}
+
 .usa-section {
   padding-top: 3rem;
   padding-bottom: 3rem;
@@ -4393,6 +4774,7 @@ input.usa-input-medium {
 }
 
 .usa-sidenav-list a:focus {
+  outline-offset: 0;
   position: relative;
   z-index: 1;
 }
@@ -4438,6 +4820,10 @@ input.usa-input-medium {
   padding-left: 3.8rem;
 }
 
+.usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {
+  outline-offset: 0;
+}
+
 .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {
   padding-left: 3.8rem;
 }