@@ -2,7 +2,7 @@
 
 ## Our security policies and procedures
 
-We follow GSA's [IT security policy](https://www.gsa.gov/directive/gsa-information-technology-%28it%29-security-policy) to ensure the confidentiality, integrity, and availability of USWDS.
+We follow GSA's [IT security policy](https://www.gsa.gov/policy-regulations/policy/information-integrity-and-access/gsa-it-security-policies) to ensure the confidentiality, integrity, and availability of USWDS.
 
 We use [Snyk](https://snyk.io) to find, fix, and prevent vulnerabilities in USWDS dependencies. We run Snyk checks locally during development and automatically on all pull requests.
 
 
@@ -134,6 +134,7 @@ Below are a list of websites and applications currently using the U.S. Web Desig
 - [U.S. Army Medical Center of Excellence (MEDCoE)](https://medcoe.army.mil)
 - [U.S. Data Federation](http://federation.data.gov/)
 - [U.S. Department of Agriculture (USDA)](https://www.usda.gov/)
+- [U.S. Department of Justice - Civil Rights Division](https://civilrights.justice.gov/)
 - [U.S. Department of Labor](https://www.dol.gov/)
 - [U.S. Department of the Treasury](https://treasury.gov)
 - [U.S. Department of Veterans Affairs](https://va.gov)
 
@@ -1,6 +1,6 @@
 <ul class="usa-collection">
   <li class="usa-collection__item">
-    <div class="usa-collection__calendar-date" href="https://www.performance.gov/presidents-winners-press-release/">
+    <div class="usa-collection__calendar-date">
       <time datetime="2020-09-30T12:00:00+01:00">
         <span class="usa-collection__calendar-date-month">SEP</span>
         <span class="usa-collection__calendar-date-day">30</span>
@@ -14,7 +14,7 @@
     </div>
   </li>
   <li class="usa-collection__item">
-    <div class="usa-collection__calendar-date" href="https://www.performance.gov/sba-wosb-dashboard/">
+    <div class="usa-collection__calendar-date">
       <time datetime="2020-09-30T12:00:00+01:00">
         <span class="usa-collection__calendar-date-month">SEP</span>
         <span class="usa-collection__calendar-date-day">30</span>
@@ -28,7 +28,7 @@
     </div>
   </li>
   <li class="usa-collection__item">
-    <div class="usa-collection__calendar-date" href="https://www.performance.gov/September-2020-Updates-Show-Progress/">
+    <div class="usa-collection__calendar-date">
       <time datetime="2020-09-17T12:00:00+01:00">
         <span class="usa-collection__calendar-date-month">SEP</span>
         <span class="usa-collection__calendar-date-day">17</span>
 
@@ -359,7 +359,8 @@ const preventInvalidFiles = (e, fileInputEl, instructions, dropTarget) => {
       removeOldPreviews(dropTarget, instructions);
       fileInputEl.value = ""; // eslint-disable-line no-param-reassign
       dropTarget.insertBefore(errorMessage, fileInputEl);
-      errorMessage.innerHTML = `This is not a valid file type.`;
+      errorMessage.textContent =
+        fileInputEl.dataset.errormessage || `This is not a valid file type.`
       errorMessage.classList.add(ACCEPTED_FILE_MESSAGE_CLASS);
       dropTarget.classList.add(INVALID_FILE_CLASS);
       TYPE_IS_VALID = false;
 
@@ -1,13 +1,16 @@
-@mixin external-link(
-  $external-link,
-  $external-link-hover,
-  $image-path: $theme-image-path
-) {
+$external-link-size: 1.75ex;
+
+$icon-object: (
+  "name": "launch",
+  "color": currentColor,
+  "height": $external-link-size,
+  "svg-height": 24,
+  "svg-width": 24,
+);
+
+@mixin external-link($contrast-bg: "default") {
   &::after {
-    $external-link-size: 1.75ex;
-    background-image: url("#{$image-path}/#{$external-link}.svg");
-    background-repeat: no-repeat;
-    background-size: 100%;
+    @include add-color-icon($icon-object, $contrast-bg);
     content: "";
     height: $external-link-size;
     margin-left: units(2px);
@@ -17,8 +20,4 @@
     padding-left: $external-link-size;
     vertical-align: middle;
   }
-
-  &:hover::after {
-    @include add-background-svg("#{$external-link-hover}", $image-path);
-  }
 }
@@ -139,7 +139,7 @@
   // Mask supported styles
   @supports (mask: url("")) {
     background: none;
-    background-color: color($color);
+    background-color: if($color == currentColor, $color, color($color));
     mask: $mask-props;
     @if $color-hover {
       &:hover {
 
@@ -7,15 +7,9 @@
 // [href^='https:']:not([href*='my-domain.com'])
 
 .usa-link--external {
-  @include external-link(
-    usa-icons-bg/launch--blue-60v,
-    usa-icons-bg/launch--blue-70v
-  );
+  @include external-link();
 
   &.usa-link--alt {
-    @include external-link(
-      usa-icons-bg/launch--gray-5,
-      usa-icons-bg/launch--white
-    );
+    @include external-link($contrast-bg: "base-darker");
   }
 }