merge latest from origin

50 files changed, 121 insertions, 169 deletions

diff --git a/assets/images/homepage-background-small.jpg b/assets/images/homepage-background-small.jpg
index 2bf1d52..c503d25 100644
--- a/assets/images/homepage-background-small.jpg
+++ b/assets/images/homepage-background-small.jpg
diff --git a/assets/images/homepage-background.jpg b/assets/images/homepage-background.jpg
index 698dfc3..426485d 100644
--- a/assets/images/homepage-background.jpg
+++ b/assets/images/homepage-background.jpg
diff --git a/assets/images/icon_application_octet-stream_large.png b/assets/images/icon_application_octet-stream_large.png
index 33e6a38..02347f1 100644
--- a/assets/images/icon_application_octet-stream_large.png
+++ b/assets/images/icon_application_octet-stream_large.png
diff --git a/assets/images/icon_application_pdf_large.png b/assets/images/icon_application_pdf_large.png
index 4158629..1374851 100644
--- a/assets/images/icon_application_pdf_large.png
+++ b/assets/images/icon_application_pdf_large.png
diff --git a/assets/images/icon_application_rtf_large.png b/assets/images/icon_application_rtf_large.png
index d09e93b..fbed2e9 100644
--- a/assets/images/icon_application_rtf_large.png
+++ b/assets/images/icon_application_rtf_large.png
diff --git a/assets/images/icon_application_vnd.ms-excel_large.png b/assets/images/icon_application_vnd.ms-excel_large.png
index fe5dbca..86e1ee4 100644
--- a/assets/images/icon_application_vnd.ms-excel_large.png
+++ b/assets/images/icon_application_vnd.ms-excel_large.png
diff --git a/assets/images/icon_application_vnd.ms-powerpoint_large.png b/assets/images/icon_application_vnd.ms-powerpoint_large.png
index 81f834b..6374b3b 100644
--- a/assets/images/icon_application_vnd.ms-powerpoint_large.png
+++ b/assets/images/icon_application_vnd.ms-powerpoint_large.png
diff --git a/assets/images/icon_application_vnd.ms-word_large.png b/assets/images/icon_application_vnd.ms-word_large.png
index c45c6b8..5a2916a 100644
--- a/assets/images/icon_application_vnd.ms-word_large.png
+++ b/assets/images/icon_application_vnd.ms-word_large.png
diff --git a/assets/images/icon_application_zip_large.png b/assets/images/icon_application_zip_large.png
index bdb7b9c..042d8c7 100644
--- a/assets/images/icon_application_zip_large.png
+++ b/assets/images/icon_application_zip_large.png
diff --git a/assets/images/icon_image_img_large.png b/assets/images/icon_image_img_large.png
index f860fd3..06e263d 100644
--- a/assets/images/icon_image_img_large.png
+++ b/assets/images/icon_image_img_large.png
diff --git a/assets/images/icon_image_tiff_large.png b/assets/images/icon_image_tiff_large.png
index 2d574a1..be2029a 100644
--- a/assets/images/icon_image_tiff_large.png
+++ b/assets/images/icon_image_tiff_large.png
diff --git a/assets/images/icon_message_delivery-status_large.png b/assets/images/icon_message_delivery-status_large.png
index a4d13f7..8a895bc 100644
--- a/assets/images/icon_message_delivery-status_large.png
+++ b/assets/images/icon_message_delivery-status_large.png
diff --git a/assets/images/icon_text_html_large.png b/assets/images/icon_text_html_large.png
index eb1214a..f772ea3 100644
--- a/assets/images/icon_text_html_large.png
+++ b/assets/images/icon_text_html_large.png
diff --git a/assets/images/icon_text_plain_large.png b/assets/images/icon_text_plain_large.png
index 98cdddb..fe31dc4 100644
--- a/assets/images/icon_text_plain_large.png
+++ b/assets/images/icon_text_plain_large.png
diff --git a/assets/images/icon_text_x-vcard_large.png b/assets/images/icon_text_x-vcard_large.png
index 75d7dc0..112ffb1 100644
--- a/assets/images/icon_text_x-vcard_large.png
+++ b/assets/images/icon_text_x-vcard_large.png
diff --git a/assets/images/icon_unknown.png b/assets/images/icon_unknown.png
index 71fc306..a10dd3d 100644
--- a/assets/images/icon_unknown.png
+++ b/assets/images/icon_unknown.png
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 36f5f38..cfcfa0a 100644
--- a/assets/images/logo.png
+++ b/assets/images/logo.png
diff --git a/assets/images/logo@2.png b/assets/images/logo@2.png
new file mode 100644
index 0000000..9de341c
--- /dev/null
+++ b/assets/images/logo@2.png
diff --git a/assets/images/status/classification.png b/assets/images/status/classification.png
index 32d8067..5ffd8af 100644
--- a/assets/images/status/classification.png
+++ b/assets/images/status/classification.png
diff --git a/assets/images/status/classification@2x.png b/assets/images/status/classification@2x.png
index f3991db..c5e9ba8 100644
--- a/assets/images/status/classification@2x.png
+++ b/assets/images/status/classification@2x.png
diff --git a/assets/images/status/delayed.png b/assets/images/status/delayed.png
index 515e42c..e2c3a29 100644
--- a/assets/images/status/delayed.png
+++ b/assets/images/status/delayed.png
diff --git a/assets/images/status/delayed@2x.png b/assets/images/status/delayed@2x.png
index d08d207..9de5293 100644
--- a/assets/images/status/delayed@2x.png
+++ b/assets/images/status/delayed@2x.png
diff --git a/assets/images/status/delivery_error.png b/assets/images/status/delivery_error.png
index a6d7280..cd93f43 100644
--- a/assets/images/status/delivery_error.png
+++ b/assets/images/status/delivery_error.png
diff --git a/assets/images/status/delivery_error@2x.png b/assets/images/status/delivery_error@2x.png
index 8bb2400..10fcb0e 100644
--- a/assets/images/status/delivery_error@2x.png
+++ b/assets/images/status/delivery_error@2x.png
diff --git a/assets/images/status/locked.png b/assets/images/status/locked.png
index 7201f26..b932609 100644
--- a/assets/images/status/locked.png
+++ b/assets/images/status/locked.png
diff --git a/assets/images/status/locked@2x.png b/assets/images/status/locked@2x.png
index 772fd2d..5f4ac75 100644
--- a/assets/images/status/locked@2x.png
+++ b/assets/images/status/locked@2x.png
diff --git a/assets/images/status/notheld.png b/assets/images/status/notheld.png
index 5a41cfb..042ecb3 100644
--- a/assets/images/status/notheld.png
+++ b/assets/images/status/notheld.png
diff --git a/assets/images/status/notheld@2x.png b/assets/images/status/notheld@2x.png
index d90b2fb..bf1c1e8 100644
--- a/assets/images/status/notheld@2x.png
+++ b/assets/images/status/notheld@2x.png
diff --git a/assets/images/status/overdue.png b/assets/images/status/overdue.png
index 29bf083..aa1a391 100644
--- a/assets/images/status/overdue.png
+++ b/assets/images/status/overdue.png
diff --git a/assets/images/status/overdue@2x.png b/assets/images/status/overdue@2x.png
index fcaa662..96e3b95 100644
--- a/assets/images/status/overdue@2x.png
+++ b/assets/images/status/overdue@2x.png
diff --git a/assets/images/status/partiallysuccessful.png b/assets/images/status/partiallysuccessful.png
index 0368a2e..99cecad 100644
--- a/assets/images/status/partiallysuccessful.png
+++ b/assets/images/status/partiallysuccessful.png
diff --git a/assets/images/status/partiallysuccessful@2x.png b/assets/images/status/partiallysuccessful@2x.png
index 81688d9..f429896 100644
--- a/assets/images/status/partiallysuccessful@2x.png
+++ b/assets/images/status/partiallysuccessful@2x.png
diff --git a/assets/images/status/postal.png b/assets/images/status/postal.png
index 589cd9b..ff53de6 100644
--- a/assets/images/status/postal.png
+++ b/assets/images/status/postal.png
diff --git a/assets/images/status/postal@2x.png b/assets/images/status/postal@2x.png
index e08aea5..51c4036 100644
--- a/assets/images/status/postal@2x.png
+++ b/assets/images/status/postal@2x.png
diff --git a/assets/images/status/refused.png b/assets/images/status/refused.png
index a184e72..b49f73f 100644
--- a/assets/images/status/refused.png
+++ b/assets/images/status/refused.png
diff --git a/assets/images/status/refused@2x.png b/assets/images/status/refused@2x.png
index 7605335..ea18dff 100644
--- a/assets/images/status/refused@2x.png
+++ b/assets/images/status/refused@2x.png
diff --git a/assets/images/status/reported.png b/assets/images/status/reported.png
index f61b364..c86c635 100644
--- a/assets/images/status/reported.png
+++ b/assets/images/status/reported.png
diff --git a/assets/images/status/reported@2x.png b/assets/images/status/reported@2x.png
index 0139ecd..5aab446 100644
--- a/assets/images/status/reported@2x.png
+++ b/assets/images/status/reported@2x.png
diff --git a/assets/images/status/review.png b/assets/images/status/review.png
index f1412b9..95b9c31 100644
--- a/assets/images/status/review.png
+++ b/assets/images/status/review.png
diff --git a/assets/images/status/review@2x.png b/assets/images/status/review@2x.png
index 5013074..0f95e0d 100644
--- a/assets/images/status/review@2x.png
+++ b/assets/images/status/review@2x.png
diff --git a/assets/images/status/successful.png b/assets/images/status/successful.png
index 042bea9..097035d 100644
--- a/assets/images/status/successful.png
+++ b/assets/images/status/successful.png
diff --git a/assets/images/status/successful@2x.png b/assets/images/status/successful@2x.png
index b311012..f863675 100644
--- a/assets/images/status/successful@2x.png
+++ b/assets/images/status/successful@2x.png
diff --git a/assets/images/status/unusual.png b/assets/images/status/unusual.png
index abca813..3a83785 100644
--- a/assets/images/status/unusual.png
+++ b/assets/images/status/unusual.png
diff --git a/assets/images/status/unusual@2x.png b/assets/images/status/unusual@2x.png
index 2e47740..07e0bd9 100644
--- a/assets/images/status/unusual@2x.png
+++ b/assets/images/status/unusual@2x.png
diff --git a/assets/images/status/waiting.png b/assets/images/status/waiting.png
index 7af9696..a668f70 100644
--- a/assets/images/status/waiting.png
+++ b/assets/images/status/waiting.png
diff --git a/assets/images/status/waiting@2x.png b/assets/images/status/waiting@2x.png
index 174fd7d..4e84eb9 100644
--- a/assets/images/status/waiting@2x.png
+++ b/assets/images/status/waiting@2x.png
diff --git a/assets/images/status/withdrawn.png b/assets/images/status/withdrawn.png
index c629418..1a68146 100644
--- a/assets/images/status/withdrawn.png
+++ b/assets/images/status/withdrawn.png
diff --git a/assets/images/status/withdrawn@2x.png b/assets/images/status/withdrawn@2x.png
index 164056c..f023e7a 100644
--- a/assets/images/status/withdrawn@2x.png
+++ b/assets/images/status/withdrawn@2x.png
diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss
index 045085b..6bf0cb8 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/assets/stylesheets/responsive/custom.scss
@@ -1,76 +1,37 @@
-$color_sand: #f7eee1;
-$color_light_blue: #67848C;
-$color_blue: #336C86;
-$color_dark_blue: #2c5d74;
-$color_darker_blue: #354C56;
-$color_red: #8c6673;
-$color_dark_red: #A1432C;
-$color_teal: #6d918d;
-$color_green: #8b9352;
-$color_bright_green: #839310;
-$color_light_green: #AAB26E;
-$color_pale_green: #D7DABD;
-$color_orange: #CC8245;
-$color_bright_orange: #FF7959;
-$color_pale_orange: #EBC3A9;
-$color_yellow: #E69E5D;
-$color_pale_yellow: #EDD3B8;
-$color_black_alt: #3d3b38;
+$color_sand: #f3f1eb;
 $color_black: #333333;
-$color_mid_grey: #999999;
-$color_light_grey: #CCCCCC;
-$color_lighter_grey: #D3D3D3;
-$color_mid_cold_grey: #9AA6AB;
+$color_orange: #f4a140;
+$color_blue: #4faded;
+$color_green: #62b356;
+$color_yellow: #ffd836;
+$color_red: #e04b4b;
+$color_violet: #a94ca6;
+$color_purple: #5c377f;
 $color_white: #ffffff;
 
-$body-bg: $color_sand;
+$color_neutral_light: $color_sand;
+$color_neutral_dark: $color_black;
+$color_primary: $color_violet;
+$color_secondary: $color_orange;
 
-$locale-bg: $color_black;
-$locale-color: $color_mid_grey;
-$locale-hover-color: $color_white;
+$body-bg: $color_neutral_light;
 
-$body-font-color: $color_black;
-$link-color: $color-blue;
-$heading-color: $color_black-alt;
-$font-family: "Roboto Slab", Georgia, serif;
-$sans-serif-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+$body-font-color: $color_neutral_dark;
+$link-color: darken($color_blue, 20%);
+$action-color: $color_green;
+$font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $form_input-bg: $color_white;
 
-$button-bg: $color_green;
+$button-bg: $action-color;
 $button-color: $color_white;
 
-$banner_bg: $color_darker_blue;
+$status-success: $color_green;
+$status-failure: $color_red;
+$status-pending: $color_orange;
 
-$main_menu-bg: $color_dark_blue;
-$main_menu-search_text: $color_black;
-$main_menu-link_text: $color_white;
-$main_menu-search_bg: $color_light_blue;
-$main_menu-link_bg: $color_dark_blue;
-$main_menu-active_link_text: $main_menu-link_bg;
-$main_menu-active_link_bg: $body-bg;
-$submenu-color: $color_mid_cold_grey;
-
-$footer-bg: $color_black;
-$footer-color: $color_light_grey;
-$footer-link-color: $color_white;
-
-$incoming-correspondence-color: $color_red;
-$outgoing-correspondence-color: $color_teal;
-$correspondence-bg: $color_white;
-$correspondence-shadow: $color_light_grey;
-
-$status-success: $color_light_green;
-$status-failure: $color_bright_orange;
-$status-pending: $color_yellow;
-
-$notice-bg: $color_pale_green;
-$notice-border: $color_bright_green;
-
-$error-bg: $color_pale_orange;
-$error-border: $color_dark_red;
-
-$action-bg: $color_pale_yellow;
-$action-border: $color_orange;
+$notice-color: $color_green;
+$error-color: $color_red;
+$action-color: $color_orange;
 
 /* Mixin styles */
 
@@ -84,16 +45,14 @@ $action-border: $color_orange;
 /* General styling of nav menu items */
 %menu-item {
   text-decoration: none;
-  background-color: $main_menu-link_bg;
-  color: transparentize($main_menu-link_text, 0.2);
+  color: transparentize($color_white, 0.2);
   @include ie8 {
-    color: $main_menu-link_text;
+    color: $color_white;
   }
   transition: background-color 0.5s ease-out;
-
   &:hover{
-      background-color: darken($main_menu-bg, 5%);
-      color: transparentize($main_menu-link_text, 0);
+    background-color: darken($color_primary, 15%);
+    color: $color_white;
   }
 
 }
@@ -101,22 +60,10 @@ $action-border: $color_orange;
 /* Selected menu item */
 %selected-menu-item {
   font-weight: bold;
-  color: $main_menu-active_link_text;
-  background-color: $main_menu-active_link_bg;
+  color: $color_primary;
+  background-color: $color_neutral_light;
   &:hover{
-      background-color: $main_menu-active_link_bg;
-  }
-}
-
-/* Styling if not part of the main menu on larger screens */
-%sub-menu-item {
-  @include respond-min( $main_menu-mobile_menu_cutoff ){
-    background-color: $banner_bg;
-    color: $submenu-color;
-    &:hover{
-        background-color: $banner_bg;
-        color: transparentize($main_menu-link_text, 0);
-    }
+      background-color: $color_neutral_light;
   }
 }
 
@@ -130,13 +77,16 @@ body{
   font-family: $font-family;
 }
 
-a{
-  color: $link-color;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color: $heading-color;
-  font-family: $font-family;
+a {
+  &:link,
+  &:visited {
+    color: $link-color;
+  }
+  &:hover,
+  &:active,
+  &:focus {
+    color: darken($link-color, 10%);
+  }
 }
 
 /* Let h1s be a little smaller on small screens */
@@ -261,19 +211,19 @@ a.link_button_green_large {
 /* Popups */
 
 .popup {
-  background-color: $notice-bg;
-  border: 3px solid $notice-border;
+  background-color: desaturate(lighten($notice-color, 30%),10%);
+  border: 3px solid $notice-color;
 }
 
 
 /* Header */
 
 #banner_inner {
-  background-color: $banner-bg;
+  background-color: $color_primary;
 }
 
 #topnav {
-  background-color: $main_menu-bg;
+  background-color: darken($color_primary, 10%);
 }
 
 #navigation{
@@ -308,15 +258,12 @@ a.link_button_green_large {
   }
 
   #navigation_search_button{
-    background-color: mix($main_menu-search_bg, $main_menu-bg, 50%);
+    background-color: $color_white;
     border: none;
     transition: all 0.3s ease-out;
-    color: $main_menu-search_text;
+    color: $color_primary;
     border-radius: 0;
     font-size: inherit;
-    &:focus{
-        background-color: $form_input-bg;
-    }
   }
 }
 
@@ -327,8 +274,7 @@ a.link_button_green_large {
 
 #notice, #error, .errorExplanation, #request_header_text, #hidden_request, .describe_state_form form, .undescribed_requests, .warning {
   border-top: 10px solid;
-  font-size: 1.2em;
-  border-radius: 0;
+  font-size: 1em;
   margin:1em 0;
   padding: 1.5em;
 
@@ -346,31 +292,37 @@ a.link_button_green_large {
 }
 
 #notice, #request_header_text {
-  background-color: $notice-bg;
-  border-color: $notice-border;
+  background-color: desaturate(lighten($notice-color, 30%),10%);
+  border-color: $notice-color;
 }
 
 #error, .errorExplanation, #hidden_request, .warning {
-  background-color: $error-bg;
-  border-color: $error-border;
+  background-color: desaturate(lighten($error-color, 30%),10%);
+  border-color: $error-color;
 
 }
 
 .undescribed_requests {
-  background-color: $action-bg;
-  border-color: $action-border;
+  background-color: desaturate(lighten($action-color, 30%),10%);
+  border-color: $action-color;
 }
 
 /* Logged and local options act like submenus */
 #logged_in_bar{
   a {
     @extend %menu-item;
-    @extend %sub-menu-item;
+    background-color: transparent;
     font-weight: normal;
+    color: $color_white;
+    &:hover,
+    &:active,
+    &:focus {
+      background-color: transparent;
+    }
   }
   #logged_in_links {
     top: 2em;
-    .greeting, a {
+    a {
       font-weight: normal;
     }
   }
@@ -378,7 +330,7 @@ a.link_button_green_large {
 
 /* LANGUAGE SWITCHER */
 #user_locale_switcher {
-  background-color: $main_menu-bg;
+  background-color: $color_primary;
   @include respond-min($main_menu-mobile_menu_cutoff) {
     background-color: transparent;
     right: auto;
@@ -400,7 +352,7 @@ a.link_button_green_large {
     color: transparentize($color_white, 0.8);
     @include respond-min($main_menu-mobile_menu_cutoff) {
       margin-top: 0;
-      border: 1px solid desaturate(lighten($main_menu-bg, 3%), 5%);
+      border: 1px solid desaturate(lighten($color_primary, 5%), 5%);
       border-radius: 3px;
       color: $link-color;
       padding: 0;
@@ -453,7 +405,7 @@ a.link_button_green_large {
   font-size: 0.8125em;
   @include respond-min($main_menu-mobile_menu_cutoff) {
     position: absolute;
-    top: 30px;
+    top: 2em;
     left: 0;
     z-index: 1000;
     border-radius: 3px;
@@ -465,9 +417,9 @@ a.link_button_green_large {
 
 .locale-list li {
   list-style-type: none;
-  border-bottom: 1px solid desaturate(lighten($main_menu-bg, 3%), 5%);
+  border-bottom: 1px solid desaturate(lighten($color_primary, 3%), 5%);
   @include respond-min($main_menu-mobile_menu_cutoff) {
-    border-bottom-color: darken($color_mid_grey,30%);
+    border-bottom-color: $color_neutral_dark;
     display: block;
   }
   &:last-child {
@@ -485,16 +437,16 @@ a.link_button_green_large {
 .locale-list .available-languages a:link,
 .locale-list .available-languages a:visited {
   display: block;
-  background-color: $main_menu-bg;
+  background-color: $color_primary;
   padding: 0.66em 1em;
   width: 100%;
   text-decoration: none;
-  color: transparentize($main_menu-link_text, 0.2);
+  color: transparentize($color_white, 0.2);
   @include ie8 {
-    color: $main_menu-link_text;
+    color: $color_white;
   }
   @include respond-min($main_menu-mobile_menu_cutoff) {
-    background-color: lighten($color_black, 6%);
+    background-color: lighten($color_neutral_dark, 6%);
   }
   transition: background-color 0.5s ease-out;
 }
@@ -502,9 +454,9 @@ a.link_button_green_large {
 .locale-list .available-languages a:hover,
 .locale-list .available-languages a:focus {
   border-bottom: none;
-  background-color: darken($main_menu-bg, 5%);
+  background-color: darken($color_primary, 5%);
   @include respond-min($main_menu-mobile_menu_cutoff) {
-    background-color: darken($color_mid_grey, 20%);
+    background-color: $color_neutral_dark
   }
   color: $color_white;
 
@@ -517,12 +469,12 @@ a.link_button_green_large {
 }
 
 .locale-list.active .current-locale {
-  background-color: $main_menu-bg;
+  background-color: $color_primary;
   color: $color_white;
-  border-color: $main_menu-bg;
+  border-color: $color_primary;
   @include respond-min($main_menu-mobile_menu_cutoff) {
-    background-color: lighten($color_black, 6%);
-    border-color: $color_black;
+    background-color: lighten($color_neutral_dark, 6%);
+    border-bottom: 1px solid lighten($color_neutral_dark, 2%);
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
   }
@@ -538,16 +490,14 @@ a.link_button_green_large {
 
 .locale-list.active .locale-list-trigger {
   border-color: transparent;
+  @include respond-min($main_menu-mobile_menu_cutoff) {
+    border-color: $color_neutral_dark;
+  }
 }
 
 
 #banner {
 
-  /* locale border */
-  @include respond-min( $main_menu-mobile_menu_cutoff ){
-    border-top: 4px solid $locale-bg;
-  }
-
   /* Hide the greeting on smaller devices */
   .greeting {
     display: none;
@@ -594,15 +544,15 @@ a.link_button_green_large {
 
 /* Footer */
 #footer {
-  background-color: $color_black;
-  color: $color_mid_grey;
+  background-color: $color_neutral_dark;
+  color: darken($color_neutral_light, 10%);
   a {
     text-decoration: none;
     color: $color_white;
     &:hover,
     &:active,
     &:focus {
-      color: $color_bright_green;
+      color: lighten($color_primary, 10%);
       text-decoration: underline;
     }
   }
@@ -616,30 +566,33 @@ a.link_button_green_large {
 
 .footer__final {
   .row {
-    border-top: 1px solid lighten($color_black, 6%);
+    border-top: 1px solid lighten($color_neutral_dark, 6%);
   }
 }
 
 /* Request page */
 div.correspondence {
-  background-color: $correspondence-bg;
+  background-color: $color_white;
+  box-shadow: 0 2px 2px transparentize($color_black, 0.8);
+  border: none;
+  border-radius: 5px;
+  margin-bottom: 2em;
 }
 
 .incoming.correspondence {
-  border: none;
-  border-top: 8px solid $incoming-correspondence-color;
-  box-shadow: 0 3px 3px $correspondence-shadow;
+  border-top: 8px solid $color_secondary;
+  a {
+    color: $color_secondary;
+  }
   a.link_to_this {
-    background-color: $incoming-correspondence-color;
+    background-color: $color_secondary;
   }
 }
 
 .outgoing.correspondence {
-  border: none;
-  border-top: 8px solid $outgoing-correspondence-color;
-  box-shadow: 0 3px 3px $correspondence-shadow;
+  border-top: 8px solid $color_primary;
   a.link_to_this {
-    background-color: $outgoing-correspondence-color;
+    background-color: $color_primary;
   }
 }
 
@@ -654,7 +607,7 @@ a.link_to_this {
   }
   background-position: center center;
   background-repeat: no-repeat;
-  background-size: 70% 70%;
+  background-size: 14px;
   border-radius: 50%;
   height: 20px;
   width: 20px;
@@ -663,9 +616,9 @@ a.link_to_this {
 #link_box {
   font-family: $font-family;
   border-radius: 0;
-  border: 1px solid $heading-color;
+  border: 1px solid $color_neutral_dark;
   .close-button {
-    background-color: $correspondence-bg;
+    background-color: $color_secondary;
     float: right;
   }
 }
@@ -674,13 +627,13 @@ a.link_to_this {
   padding: 0;
 
   form{
-    background-color: $action-bg;
-    border-color: $action-border;
+    background-color: desaturate(lighten($action-color, 30%),10%);
+    border-color: $action-color;
     h2 {
       margin-top: 0;
     }
     hr {
-      border-color: $action-border;
+      border-color: $action-color;
     }
   }
 }
@@ -723,13 +676,13 @@ a.link_to_this {
 
 .view_html_prefix {
   font-family: $font-family;
-  background-color: $banner-bg;
-  color: transparentize($main_menu-link_text, 0.2);
+  background-color: $color_primary;
+  color: transparentize($color_white, 0.2);
   @include ie8 {
-    color: $main_menu-link_text;
+    color: $color_white;
   }
   a {
-    color: $main_menu-link_text;
+    color: $color_white;
   }
   .view_html_logo, .view_html_description {
     padding-top: 1em;
@@ -752,7 +705,6 @@ a.link_to_this {
 /* Help pages */
 
 dt {
-  color: $heading-color;
   font-weight: 700;
   @include respond-min( $main_menu-mobile_menu_cutoff ){
     font-size: 2em;
@@ -793,14 +745,14 @@ dt {
   }
   p {
     line-height: 1.5em;
-    color: $color_black_alt;
+    color: $color_neutral_dark;
   }
 }
 
 .steps__step-number {
   height: 3.5em;
   width: 3.5em;
-  background-color: $color_green;
+  background-color: $color_primary;
   box-shadow: 0 1px 2px transparentize($color_black, 0.75);
   padding: 1em;
   border-radius: 100%;
@@ -813,15 +765,12 @@ dt {
   }
 }
 
-li:nth-child(2) {
-  .steps__step-number {
-    background-color: $color_blue;
+.learn-more-foi {
+  @include respond-min( $main_menu-mobile_menu_cutoff ){
+    margin-top: 3em;
   }
-}
-
-li:nth-child(3) {
-  .steps__step-number {
-    background-color: $color_orange;
+  a {
+    @include button-secondary;
   }
 }
 
@@ -857,10 +806,10 @@ li:nth-child(3) {
 }
 
 .homepage-hero {
-  background-color: $color_black;
+  background-color: $color_neutral_dark;
   background-image: image-url('homepage-background-small.jpg');
   background-repeat: no-repeat;
-  background-position: center;
+  background-position: center top;
   background-size: cover;
   color: $color_white;
   padding: 2em 0 5em;
@@ -871,7 +820,7 @@ li:nth-child(3) {
   }
 
   a {
-    color: $color_yellow;
+    color: $color_secondary;
     &:hover,
     &:active,
     &:focus {
@@ -897,7 +846,7 @@ li:nth-child(3) {
 }
 
 .new-request__content {
-  background-color: $color_black;
+  background-color: $color_neutral_dark;
   border-radius: 5px;
   padding: 1.888888889em;
 }
@@ -910,4 +859,7 @@ li:nth-child(3) {
 
 .new-request__description {
   color: transparentize($color_white, 0.2);
+  @include ie8 {
+    color: $color_white;
+  }
 }
diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
index 19a54a0..b6794e4 100644
--- a/lib/views/general/_before_head_end.html.erb
+++ b/lib/views/general/_before_head_end.html.erb
@@ -1 +1 @@
- <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto+Slab:400,700&subset=latin,latin-ext,cyrillic,cyrillic-ext">
+<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>