diff --git a/frontend/nrel-app-template/img/alliance-logo-black.svg b/frontend/nrel-app-template/img/alliance-logo-black.svg
index be59986f..bd213fbe 100644
--- a/frontend/nrel-app-template/img/alliance-logo-black.svg
+++ b/frontend/nrel-app-template/img/alliance-logo-black.svg
@@ -1,59 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 340.7 123.6">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 253 83.4">
+  <!-- Generator: Adobe Illustrator 30.1.0, SVG Export Plug-In . SVG Version: 2.1.1 Build 136)  -->
   <defs>
     <style>
-      .cls-1 {
-        fill: #cdcdcd;
-      }
-
-      .cls-1, .cls-2, .cls-3 {
-        stroke-width: 0px;
-      }
-
-      .cls-1, .cls-3 {
+      .st0 {
+        fill: gray;
         fill-rule: evenodd;
       }
-
-      .cls-2, .cls-3 {
-        fill: #231f20;
-      }
     </style>
   </defs>
-  <g>
-    <path class="cls-3" d="M55.1,77.5l1.5,5.6h4.8l-6.1-21.8h-5.8l-6,21.8h4.6l1.4-5.6h5.6ZM50.1,73.8l1.2-4.6c.3-1.3.6-2.9.9-4.2h0c.3,1.3.6,2.9,1,4.2l1.2,4.6h-4.3Z"/>
-    <rect class="cls-2" x="63.4" y="60.1" width="4.4" height="23"/>
-    <rect class="cls-2" x="71.1" y="60.1" width="4.4" height="23"/>
-    <path class="cls-3" d="M83.2,83.1v-15.8h-4.4v15.8h4.4ZM81,60.4c-1.4,0-2.4,1.1-2.3,2.5,0,1.4.9,2.5,2.3,2.5s2.4-1.1,2.4-2.5c0-1.4-.9-2.5-2.4-2.5Z"/>
-    <path class="cls-3" d="M98.4,73.7c0-3.7-1.5-6.8-6.3-6.8s-4.5.8-5.5,1.4l.8,3.2c.9-.6,2.5-1.2,3.9-1.2,2.2,0,2.6,1.2,2.6,2v.2c-5,0-8.4,1.9-8.4,6s1.7,4.8,4.6,4.8,3.1-.7,4.1-1.9h0l.3,1.6h4c-.1-.9-.2-2.3-.2-3.8v-5.5ZM94.1,77.3c0,.3,0,.6,0,.8-.3,1-1.2,1.8-2.3,1.8s-1.7-.6-1.7-1.9c0-1.9,1.8-2.5,4.1-2.5v1.7Z"/>
-    <path class="cls-3" d="M101.6,83.1h4.4v-9.1c0-.5,0-.9.2-1.2.3-.9,1-1.8,2.2-1.8s2.2,1.4,2.2,3.4v8.8h4.4v-9.4c0-4.7-2.2-6.8-5.1-6.8s-3.8,1.5-4.4,2.5h0l-.2-2.2h-3.8c0,1.4.1,3.1.1,5v10.8Z"/>
-    <path class="cls-3" d="M128.5,79c-.7.3-1.5.5-2.5.5-2.2,0-3.9-1.5-3.9-4.4,0-2.6,1.5-4.4,3.8-4.4s1.9.2,2.5.5l.7-3.7c-.9-.4-2.2-.6-3.4-.6-5.3,0-8.1,3.8-8.1,8.4s2.9,8.1,7.5,8.1,3.2-.4,4-.7l-.5-3.7Z"/>
-    <path class="cls-3" d="M143.4,76.7c0-.4.1-1.1.1-1.9,0-3.9-1.7-7.9-6.3-7.9s-7.2,4.4-7.2,8.4,2.8,8.1,7.6,8.1,3.7-.4,5.2-1l-.6-3.3c-1.2.4-2.4.6-3.9.6s-3.9-1-4-3h9.2ZM134.2,73.4c.1-1.3.9-3.2,2.7-3.2s2.5,2,2.5,3.2h-5.2Z"/>
-    <path class="cls-3" d="M156.5,83.1v-12.2h2.8v-3.6h-2.9v-.8c0-1.6.6-2.8,2.1-2.8s1,0,1.4.2l.2-3.8c-.6-.2-1.4-.3-2.4-.3s-2.8.4-3.9,1.6c-1.3,1.3-1.8,3.4-1.8,5.3v.6h-1.9v3.6h1.9v12.2h4.5Z"/>
-    <path class="cls-3" d="M167.6,66.9c-4.6,0-7.6,3.3-7.6,8.4s3.2,8.1,7.4,8.1,7.5-2.7,7.5-8.4-2.9-8.1-7.3-8.1ZM167.5,70.4c2,0,2.8,2.4,2.8,4.8s-1.1,4.8-2.8,4.8-2.9-2-2.9-4.8.8-4.8,2.9-4.8Z"/>
-    <path class="cls-3" d="M177.4,83.1h4.4v-8c0-.4,0-.8,0-1.1.3-1.5,1.4-2.5,3-2.5s.9,0,1.2.2v-4.7c-.3,0-.5,0-.9,0-1.4,0-3.1,1-3.8,3.3h-.1v-2.9h-4c0,1.4.1,2.9.1,5.2v10.6Z"/>
-    <path class="cls-3" d="M193.1,82.1c1.1.7,3.3,1.4,5.6,1.4,5.4,0,7.9-3.1,7.9-6.8s-1.6-5.1-5.1-6.5c-2.5-1.1-3.6-1.7-3.6-3.1s.9-2.1,2.9-2.1,3.3.6,4.1,1l1-3.9c-1.2-.6-2.8-1.1-5-1.1-4.6,0-7.4,2.8-7.4,6.6s2.1,5.2,5.4,6.4c2.4.9,3.3,1.7,3.3,3.1s-1.1,2.4-3.1,2.4-3.7-.7-4.9-1.4l-.9,4.1Z"/>
-    <path class="cls-3" d="M222.5,67.3h-4.5v9.4c0,.4,0,.8-.1,1.1-.3.8-1,1.7-2.2,1.7s-2.2-1.4-2.2-3.7v-8.5h-4.5v9.3c0,4.9,2.1,6.9,5,6.9s3.9-1.6,4.5-2.6h0l.2,2.2h3.8c0-1.3-.1-3-.1-5.1v-10.7Z"/>
-    <path class="cls-3" d="M225,82.3c1.1.6,2.7,1.1,4.6,1.1,4.1,0,6.2-2.2,6.2-5.1,0-2.3-1.2-3.8-3.9-4.9-1.7-.7-2.3-1.1-2.3-1.8s.6-1.3,1.7-1.3,2.4.5,3.1.9l.8-3.4c-.9-.5-2.4-.9-4-.9-3.5,0-5.8,2.2-5.8,5.2,0,1.8,1.1,3.6,4,4.7,1.7.6,2.1,1,2.1,1.8s-.6,1.3-1.9,1.3-3-.6-3.8-1.2l-.8,3.5Z"/>
-    <path class="cls-3" d="M238.8,64.3v3h-1.9v3.6h1.9v6.5c0,2.2.4,3.7,1.2,4.7.7.8,1.9,1.4,3.3,1.4s2.3-.2,2.9-.5v-3.7c-.5,0-.7.1-1.3.1-1.3,0-1.7-.9-1.7-2.8v-5.7h3.2v-3.6h-3.2v-4.3l-4.3,1.3Z"/>
-    <path class="cls-3" d="M260.4,73.7c0-3.7-1.5-6.8-6.3-6.8s-4.5.8-5.5,1.4l.8,3.2c.9-.6,2.5-1.2,3.9-1.2,2.2,0,2.6,1.2,2.6,2v.2c-5,0-8.4,1.9-8.4,6s1.7,4.8,4.6,4.8,3.1-.7,4.1-1.9h0l.3,1.6h4c-.1-.9-.2-2.3-.2-3.8v-5.5ZM256.1,77.3c0,.3,0,.6,0,.8-.3,1-1.2,1.8-2.3,1.8s-1.7-.6-1.7-1.9c0-1.9,1.8-2.5,4.1-2.5v1.7Z"/>
-    <path class="cls-3" d="M268,83.1v-15.8h-4.4v15.8h4.4ZM265.8,60.4c-1.4,0-2.4,1.1-2.3,2.5,0,1.4.9,2.5,2.3,2.5s2.4-1.1,2.4-2.5c0-1.4-.9-2.5-2.4-2.5Z"/>
-    <path class="cls-3" d="M271.3,83.1h4.4v-9.1c0-.5,0-.9.2-1.2.3-.9,1-1.8,2.2-1.8s2.2,1.4,2.2,3.4v8.8h4.4v-9.4c0-4.7-2.2-6.8-5.1-6.8s-3.8,1.5-4.4,2.5h0l-.2-2.2h-3.8c0,1.4.1,3.1.1,5v10.8Z"/>
-    <path class="cls-3" d="M299.9,73.7c0-3.7-1.5-6.8-6.3-6.8s-4.5.8-5.5,1.4l.8,3.2c.9-.6,2.5-1.2,3.9-1.2,2.2,0,2.6,1.2,2.6,2v.2c-5,0-8.4,1.9-8.4,6s1.7,4.8,4.6,4.8,3.1-.7,4.1-1.9h0l.3,1.6h4c-.1-.9-.2-2.3-.2-3.8v-5.5ZM295.6,77.3c0,.3,0,.6,0,.8-.3,1-1.2,1.8-2.3,1.8s-1.7-.6-1.7-1.9c0-1.9,1.8-2.5,4.1-2.5v1.7Z"/>
-    <path class="cls-3" d="M303.1,78.4c0,1.8,0,3.7-.1,4.7h3.8l.2-2.2h0c1,1.9,2.6,2.6,4.3,2.6,3.3,0,6.5-2.8,6.5-8.5,0-4.8-2.5-8-5.9-8s-3.5.9-4.3,2.2h0v-9.1h-4.4v18.3ZM307.5,74c0-.3,0-.6,0-.9.3-1.4,1.4-2.4,2.6-2.4,2.1,0,3.1,1.9,3.1,4.4s-1.2,4.5-3.1,4.5-2.3-1-2.6-2.3c0-.3,0-.6,0-.9v-2.3Z"/>
-    <rect class="cls-2" x="320.2" y="60.1" width="4.4" height="23"/>
-    <path class="cls-3" d="M340.5,76.7c0-.4.1-1.1.1-1.9,0-3.9-1.7-7.9-6.3-7.9s-7.2,4.4-7.2,8.4,2.8,8.1,7.6,8.1,3.7-.4,5.2-1l-.6-3.3c-1.2.4-2.4.6-3.9.6s-3.9-1-4-3h9.2ZM331.3,73.4c.1-1.3.9-3.2,2.7-3.2s2.5,2,2.5,3.2h-5.2Z"/>
-  </g>
-  <g>
-    <polygon class="cls-3" points="164.8 103.2 157.6 103.2 157.6 98.7 165.3 98.7 165.3 94.6 153.2 94.6 153.2 116.4 165.7 116.4 165.7 112.4 157.6 112.4 157.6 107.2 164.8 107.2 164.8 103.2"/>
-    <path class="cls-3" d="M168.3,116.4h4.4v-9.1c0-.5,0-.9.2-1.2.3-.9,1-1.8,2.2-1.8s2.2,1.4,2.2,3.4v8.8h4.4v-9.4c0-4.7-2.2-6.8-5.1-6.8s-3.8,1.5-4.4,2.5h0l-.2-2.2h-3.8c0,1.4.1,3.1.1,5v10.8Z"/>
-    <path class="cls-3" d="M197.6,110.1c0-.4.1-1.1.1-1.9,0-3.9-1.7-7.9-6.3-7.9s-7.2,4.4-7.2,8.4,2.8,8.1,7.6,8.1,3.7-.4,5.1-1l-.6-3.3c-1.2.4-2.4.6-3.9.6s-3.9-1-4-3h9.2ZM188.4,106.7c.1-1.3.9-3.2,2.7-3.2s2.5,2,2.5,3.2h-5.2Z"/>
-    <path class="cls-3" d="M200.1,116.4h4.4v-8c0-.4,0-.8,0-1.1.3-1.5,1.4-2.5,3-2.5s.9,0,1.2.2v-4.7c-.3,0-.5,0-.9,0-1.4,0-3.1,1-3.8,3.3h-.1v-2.9h-4c0,1.4.1,2.9.1,5.2v10.6Z"/>
-    <path class="cls-3" d="M224.1,105.3c0-2.4,0-3.7.1-4.7h-3.8v1.9h-.2c-.7-1.3-2-2.2-3.9-2.2-3.5,0-6.5,3.2-6.5,8.3s2.5,7.7,6,7.7,3-.7,3.8-2.1h0v1c0,2.9-1.6,4.2-3.7,4.2s-3.2-.6-4.1-1.2l-.9,3.7c1.3.8,3.3,1.2,5.1,1.2s4.2-.5,5.8-1.9c1.6-1.6,2.2-4.1,2.2-7.1v-8.8ZM219.7,109.4c0,.4,0,.9-.1,1.3-.3,1.2-1.2,2-2.3,2-1.9,0-2.9-1.8-2.9-4.2s1.3-4.5,2.9-4.5,2.1.9,2.4,2.2c0,.3,0,.6,0,.9v2.3Z"/>
-    <path class="cls-3" d="M225.8,100.6l5.2,14.5c.2.4.2.6.2.8s0,.5-.2.7c-.4.8-1.2,1.6-1.8,2-.7.5-1.4.7-1.9.8l.9,4.2c1.1-.2,2.7-.7,4.3-2.2,1.6-1.6,3-4.1,5-10.4l3.3-10.4h-4.7l-1.7,7.8c-.2.9-.4,2.1-.6,2.9h0c-.2-.8-.5-2-.7-2.9l-2.1-7.8h-4.9Z"/>
-    <path class="cls-3" d="M242.1,120c1.4-2.5,2.7-5.9,3.7-9.2l-4.5.3c-.4,2.9-1.2,6.3-2.1,9.2l2.9-.3Z"/>
-    <polygon class="cls-3" points="253.9 116.4 266.2 116.4 266.2 112.3 258.4 112.3 258.4 94.6 253.9 94.6 253.9 116.4"/>
-    <polygon class="cls-3" points="268.5 116.4 280.7 116.4 280.7 112.3 272.9 112.3 272.9 94.6 268.5 94.6 268.5 116.4"/>
-    <path class="cls-3" d="M295.7,112c-.9.4-2.4.7-3.7.7-4,0-6.3-2.7-6.3-7.1s2.7-7.2,6.3-7.2,2.8.4,3.7.8l.9-3.9c-.8-.5-2.5-1-4.8-1-5.9,0-10.7,4.1-10.7,11.6s3.5,10.9,10.3,10.9,4.2-.5,5-1l-.7-3.8Z"/>
-  </g>
-  <path class="cls-1" d="M200.8,31.1S232.4-3.2,285.7.2c39.5,2.5,22.9,37.4-12.8,46.1-33.8,8.2-73.9,7.5-130.8-.2-75.4-10.3-117.6.5-120.3,26.3-3.4,32.9,65.8,34.6,103.2,22.8-13.2,7.7-63,24.4-103.7,5.3C-24.9,78.7,9.3,30.5,73.6,28.1c48-1.8,94.3,11.4,156,13,62.6,1.6,87.5-32.2,53.2-35.2-44.3-3.8-82,25.1-82,25.1Z"/>
+  <path class="st0" d="M130.3,24s19.4-20.9,52-18.8c24.2,1.5,14.1,22.8-7.8,28.1-20.7,5-45.3,4.6-80.1-.1-46.1-6.3-72.1.3-73.7,16-2.1,20,40.3,21.1,63.2,13.9-8.1,4.7-38.6,14.9-63.5,3.2C-7.9,53,13,23.7,52.4,22.2c29.4-1.1,57.8,7,95.5,7.9,38.3,1,53.6-19.6,32.6-21.4-27.1-2.3-50.2,15.3-50.2,15.3"/>
+  <path d="M36.9,52.5l-1,3.6h-3.3l4.3-14h4.2l4.3,14h-3.4l-1.1-3.6h-4ZM40.4,50.1l-.9-3c-.2-.8-.5-1.9-.7-2.7h0c-.2.8-.4,1.9-.6,2.7l-.8,3h3.1Z"/>
+  <rect x="47" y="41.3" width="3.2" height="14.7"/>
+  <rect x="52.8" y="41.3" width="3.2" height="14.7"/>
+  <path d="M61.8,43.1c0,.9-.7,1.6-1.7,1.6s-1.7-.7-1.6-1.6c0-.9.6-1.6,1.7-1.6s1.7.7,1.7,1.6M58.5,45.9h3.2v10.1h-3.2v-10.1Z"/>
+  <path d="M70,56.1l-.2-1h0c-.7.8-1.7,1.2-2.9,1.2-2.1,0-3.3-1.5-3.3-3.1,0-2.6,2.4-3.9,6-3.9h0c0-.7-.3-1.5-1.9-1.5s-2.1.4-2.8.8l-.6-2c.7-.4,2.1-.9,4-.9,3.4,0,4.5,2,4.5,4.4v3.5c0,1,0,1.9.1,2.5h-2.9ZM69.6,51.3c-1.7,0-3,.4-3,1.6s.5,1.2,1.2,1.2,1.4-.5,1.6-1.2c0-.2,0-.4,0-.5v-1.1Z"/>
+  <path d="M75.2,49.1c0-1.3,0-2.3,0-3.2h2.7v1.4h.2c.4-.6,1.5-1.6,3.1-1.6s3.6,1.4,3.6,4.4v6h-3.2v-5.6c0-1.3-.5-2.2-1.6-2.2s-1.4.6-1.6,1.2c0,.2-.1.5-.1.8v5.8h-3.2v-6.9Z"/>
+  <path d="M95,55.8c-.6.2-1.6.5-2.8.5-3.3,0-5.4-2-5.4-5.2s2-5.4,5.8-5.4,1.8.1,2.4.4l-.5,2.3c-.4-.2-.9-.3-1.8-.3-1.7,0-2.7,1.2-2.7,2.8,0,1.9,1.2,2.8,2.8,2.8s1.3-.1,1.8-.3l.4,2.3Z"/>
+  <path d="M99,52c.1,1.3,1.4,1.9,2.9,1.9s2-.1,2.8-.4l.4,2.1c-1,.4-2.3.6-3.7.6-3.5,0-5.4-2-5.4-5.2s1.6-5.4,5.1-5.4,4.5,2.5,4.5,5.1,0,1-.1,1.2h-6.6ZM102.7,49.8c0-.8-.3-2.1-1.8-2.1s-1.9,1.2-2,2.1h3.7Z"/>
+  <path d="M112.1,56.1v-7.8h-1.3v-2.3h1.3v-.4c0-1.2.4-2.6,1.3-3.4.8-.7,1.9-1,2.8-1s1.2,0,1.7.2v2.4c-.4,0-.7-.1-1.1-.1-1,0-1.5.8-1.5,1.8v.5h2v2.3h-2v7.8h-3.2Z"/>
+  <path d="M128.7,50.9c0,3.7-2.6,5.4-5.4,5.4s-5.3-1.9-5.3-5.2,2.2-5.4,5.4-5.4,5.2,2.1,5.2,5.2M121.3,51c0,1.7.7,3,2.1,3s2-1.2,2-3-.6-3-2-3-2.1,1.6-2.1,3"/>
+  <path d="M130.7,49.3c0-1.5,0-2.5,0-3.3h2.7v1.9h.2c.5-1.5,1.8-2.1,2.7-2.1s.4,0,.7,0v3c-.2,0-.5,0-.9,0-1.2,0-2,.6-2.2,1.6,0,.2,0,.5,0,.7v5.1h-3.2v-6.8Z"/>
+  <polygon points="151.2 50.1 146.1 50.1 146.1 53.5 151.8 53.5 151.8 56.1 142.9 56.1 142.9 42.1 151.5 42.1 151.5 44.7 146.1 44.7 146.1 47.6 151.2 47.6 151.2 50.1"/>
+  <path d="M153.9,49.1c0-1.3,0-2.3,0-3.2h2.7v1.4h.2c.4-.6,1.5-1.6,3.1-1.6s3.6,1.4,3.6,4.4v6h-3.2v-5.6c0-1.3-.5-2.2-1.6-2.2s-1.4.6-1.6,1.2c0,.2-.1.5-.1.8v5.8h-3.2v-6.9Z"/>
+  <path d="M168.5,52c.1,1.3,1.4,1.9,2.9,1.9s2-.1,2.8-.4l.4,2.1c-1,.4-2.3.6-3.7.6-3.5,0-5.4-2-5.4-5.2s1.6-5.4,5.1-5.4,4.5,2.5,4.5,5.1,0,1-.1,1.2h-6.6ZM172.3,49.8c0-.8-.3-2.1-1.8-2.1s-1.9,1.2-2,2.1h3.7Z"/>
+  <path d="M177.1,49.3c0-1.5,0-2.5,0-3.3h2.7v1.9h.2c.5-1.5,1.8-2.1,2.7-2.1s.4,0,.7,0v3c-.2,0-.5,0-.9,0-1.2,0-2,.6-2.2,1.6,0,.2,0,.5,0,.7v5.1h-3.2v-6.8Z"/>
+  <path d="M194.6,45.9c0,.6,0,1.5,0,3v5.7c0,1.9-.4,3.5-1.5,4.6-1.1,1-2.6,1.2-4.1,1.2s-2.7-.3-3.7-.8l.6-2.4c.6.4,1.8.8,3,.8s2.6-.8,2.6-2.7v-.7h0c-.6.9-1.6,1.3-2.7,1.3-2.5,0-4.3-2-4.3-5s2.1-5.3,4.6-5.3,2.3.6,2.8,1.4h0v-1.2h2.9ZM191.3,50c0-.2,0-.4,0-.6-.2-.8-.8-1.4-1.7-1.4s-2.1,1-2.1,2.9.7,2.7,2.1,2.7,1.5-.5,1.7-1.3c0-.2.1-.6.1-.8v-1.5Z"/>
+  <path d="M199.4,45.9l1.5,5c.2.6.4,1.3.5,1.9h0c.1-.5.3-1.3.5-1.9l1.2-5h3.4l-2.4,6.7c-1.5,4-2.4,5.6-3.6,6.7-1.1,1-2.3,1.3-3.1,1.4l-.7-2.7c.4,0,.9-.2,1.4-.5.5-.2,1-.7,1.3-1.3.1-.1.2-.3.2-.5s0-.3-.1-.5l-3.7-9.3h3.5Z"/>
+  <rect x="105.1" y="62.2" width="3.2" height="14"/>
+  <path d="M111,69.3c0-1.3,0-2.3,0-3.2h2.7v1.4h.2c.4-.6,1.5-1.6,3.1-1.6s3.6,1.4,3.6,4.4v6h-3.2v-5.6c0-1.3-.5-2.2-1.6-2.2s-1.4.6-1.6,1.2c0,.2-.1.5-.1.8v5.8h-3.2v-6.9Z"/>
+  <path d="M123.2,69.3c0-1.3,0-2.3,0-3.2h2.7v1.4h.2c.4-.6,1.5-1.6,3.1-1.6s3.6,1.4,3.6,4.4v6h-3.2v-5.6c0-1.3-.5-2.2-1.6-2.2s-1.4.6-1.6,1.2c0,.2-.1.5-.1.8v5.8h-3.2v-6.9Z"/>
+  <path d="M145.5,71c0,3.7-2.6,5.4-5.4,5.4s-5.3-1.9-5.3-5.2,2.2-5.4,5.4-5.4,5.2,2.1,5.2,5.2M138.1,71.1c0,1.7.7,3,2.1,3s2-1.2,2-3-.6-3-2-3-2.1,1.6-2.1,3"/>
+  <path d="M149.6,66l1.4,4.7c.3.8.4,1.7.6,2.5h0c.2-.8.3-1.6.6-2.5l1.3-4.7h3.3l-3.8,10.1h-3.2l-3.7-10.1h3.4Z"/>
+  <path d="M163.9,76.2l-.2-1h0c-.7.8-1.7,1.2-2.9,1.2-2.1,0-3.3-1.5-3.3-3.1,0-2.6,2.4-3.9,6-3.9h0c0-.7-.3-1.5-1.9-1.5s-2.1.4-2.8.8l-.6-2c.7-.4,2.1-.9,4-.9,3.4,0,4.5,2,4.5,4.4v3.5c0,1,0,1.9.1,2.5h-2.9ZM163.5,71.4c-1.7,0-3,.4-3,1.6s.5,1.2,1.2,1.2,1.4-.5,1.6-1.2c0-.2,0-.4,0-.5v-1.1Z"/>
+  <path d="M172.5,63.1v2.9h2.3v2.3h-2.3v3.7c0,1.2.3,1.8,1.2,1.8s.7,0,.9,0v2.4c-.4.2-1.1.3-2,.3s-1.9-.4-2.4-.9c-.6-.6-.9-1.6-.9-3v-4.1h-1.4v-2.3h1.4v-2.2l3.1-.7Z"/>
+  <path d="M179.9,63.2c0,.9-.7,1.6-1.7,1.6s-1.7-.7-1.6-1.6c0-.9.6-1.6,1.7-1.6s1.7.7,1.7,1.6M176.6,66h3.2v10.1h-3.2v-10.1Z"/>
+  <path d="M192.4,71c0,3.7-2.6,5.4-5.4,5.4s-5.3-1.9-5.3-5.2,2.2-5.4,5.4-5.4,5.2,2.1,5.2,5.2M185,71.1c0,1.7.7,3,2.1,3s2-1.2,2-3-.6-3-2-3-2.1,1.6-2.1,3"/>
+  <path d="M194.3,69.3c0-1.3,0-2.3,0-3.2h2.7v1.4h.2c.4-.6,1.5-1.6,3.1-1.6s3.6,1.4,3.6,4.4v6h-3.2v-5.6c0-1.3-.5-2.2-1.6-2.2s-1.4.6-1.6,1.2c0,.2-.1.5-.1.8v5.8h-3.2v-6.9Z"/>
+  <path d="M205.3,78.6c.6-1.8,1.2-4,1.5-5.9l3.2-.2c-.7,2.1-1.6,4.3-2.6,5.9l-2.1.2Z"/>
+  <polygon points="216.2 62.2 219.4 62.2 219.4 73.5 225 73.5 225 76.2 216.2 76.2 216.2 62.2"/>
+  <polygon points="226.9 62.2 230.1 62.2 230.1 73.5 235.7 73.5 235.7 76.2 226.9 76.2 226.9 62.2"/>
+  <path d="M247,75.8c-.6.3-1.9.6-3.6.6-4.9,0-7.3-3-7.3-7s3.4-7.4,7.7-7.4,2.9.3,3.5.6l-.6,2.5c-.6-.3-1.5-.5-2.7-.5-2.5,0-4.5,1.5-4.5,4.6s1.7,4.6,4.5,4.6,2-.2,2.6-.5l.5,2.5Z"/>
 </svg>
\ No newline at end of file
diff --git a/frontend/stylesheets/_nrel_app_template_overrides.scss b/frontend/stylesheets/_nrel_app_template_overrides.scss
index 33f6b5be..5deb588b 100644
--- a/frontend/stylesheets/_nrel_app_template_overrides.scss
+++ b/frontend/stylesheets/_nrel_app_template_overrides.scss
@@ -1,5 +1,5 @@
 // Various overrides to try and make the nrel-app-template styles better match
-// the current production NREL.gov styles.
+// the current production NLR.gov styles.
 
 .application .navbar-light .navbar-nav > li > a,
 .program-header .navbar-light .navbar-nav >li > a {
diff --git a/source/docs/climate/guide.html.md.erb b/source/docs/climate/guide.html.md.erb
index e7b41bb5..846ea061 100644
--- a/source/docs/climate/guide.html.md.erb
+++ b/source/docs/climate/guide.html.md.erb
@@ -61,4 +61,4 @@ curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -H "Cache-Cont
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
diff --git a/source/docs/climate/ncdb/index.html.md.erb b/source/docs/climate/ncdb/index.html.md.erb
index 555a5e2a..16ecbdc1 100644
--- a/source/docs/climate/ncdb/index.html.md.erb
+++ b/source/docs/climate/ncdb/index.html.md.erb
@@ -14,4 +14,4 @@ The National Climate Database (NCDB) is a high-resolution, bias-corrected climat
 
 ## Contact
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
diff --git a/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP4-5-download.html.md.erb b/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP4-5-download.html.md.erb
index d1cf7581..f0a44cb4 100755
--- a/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP4-5-download.html.md.erb
+++ b/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP4-5-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP8-5-download.html.md.erb b/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP8-5-download.html.md.erb
index 4769191a..89ea2862 100755
--- a/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP8-5-download.html.md.erb
+++ b/source/docs/climate/ncdb/ncdb-4km-Hourly-CONUS-v1-0-0-RCP8-5-download.html.md.erb
@@ -289,7 +289,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/index.html.md.erb b/source/docs/climate/sup3rcc/index.html.md.erb
index b7c20d27..256aa1c7 100644
--- a/source/docs/climate/sup3rcc/index.html.md.erb
+++ b/source/docs/climate/sup3rcc/index.html.md.erb
@@ -19,4 +19,4 @@ Access to the entire Sup3rCC dataset as a single bulk download is available at [
 
 ## Contact
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3-ssp585-r1i1p1f1-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3-ssp585-r1i1p1f1-download.html.md.erb
index c10aeebb..4262f727 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3-ssp585-r1i1p1f1-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3-ssp585-r1i1p1f1-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -294,7 +294,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index aa5d09fb..2281dbd3 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -293,7 +293,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
index d0582127..5b713203 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3cc-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -292,7 +292,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index d76bd1e1..420f13d6 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
index 7c8fe3e4..6f54047d 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-ecearth3veg-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index 400f16fd..57834190 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
index 39f0308c..d16320f2 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-gfdlcm4-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index 54a83ee8..eef50382 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
index 267376a9..cd922f90 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-mpiesm12hr-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -295,7 +295,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index 201f0fb4..02dd5bbc 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -292,7 +292,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-ssp585-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-ssp585-r1i1p1f1-v0-2-2-download.html.md.erb
index d5694cd6..2ddb5eb0 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-ssp585-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-mriesm20-ssp585-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -292,7 +292,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-historical-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-historical-r1i1p1f1-v0-2-2-download.html.md.erb
index b4c0eaa0..9b8b34c5 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-historical-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-historical-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -292,7 +292,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb b/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
index 43ca1f48..1c804fad 100755
--- a/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
+++ b/source/docs/climate/sup3rcc/sup3rcc-conus-taiesm1-ssp245-r1i1p1f1-v0-2-2-download.html.md.erb
@@ -205,7 +205,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -292,7 +292,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nrel.gov">ncdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:ncdb@nlr.gov">ncdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/energy-optimization/rede-technical-potential.html.md.erb b/source/docs/energy-optimization/rede-technical-potential.html.md.erb
index ef2e1b2d..fd49cf22 100644
--- a/source/docs/energy-optimization/rede-technical-potential.html.md.erb
+++ b/source/docs/energy-optimization/rede-technical-potential.html.md.erb
@@ -1,7 +1,7 @@
 ---
 title: RE Data Explorer Technical Potential (deprecated)
 
-summary: This tool is deprecated in favor of the state of the art <a href="https://www.nrel.gov/gis/renewable-energy-potential.html">reV Technical Potential analysis tool</a>. reV installation and usage documentation can be found at <a href="https://nrel.github.io/reV/index.html">https://nrel.github.io/reV/index.html.</a> This documentation is preserved here for historical purposes only.
+summary: This tool is deprecated in favor of the state of the art <a href="https://www.nlr.gov/gis/renewable-energy-potential">reV Technical Potential analysis tool</a>. reV installation and usage documentation can be found at <a href="https://nrel.github.io/reV/index.html">https://nrel.github.io/reV/index.html.</a> This documentation is preserved here for historical purposes only.
 
 deprecated: true
 ---
@@ -13,7 +13,7 @@ deprecated: true
 </div>
 
 <p>
-    This API is no longer functioning. Previously it provided access to a Technical Potential analyses model developed at NLR in conjunction with USAID. The tool estimates the technical potential of specific renewable electricity generation technologies taking into account a variety of user supplied filters and other inputs. These are technology-specific estimates of energy generation potential based on renewable resource availability and quality, technical system performance, topographic limitations, environmental, and land-use constraints only. The estimates do not consider economic or market constraints, and therefore do not represent a level of renewable generation that might actually be deployed. Details on the application and use of this tool, as well as the methodology employed can be found at <a href="https://www.re-explorer.org/training.html">REexplorer Training</a> and <a href="https://www.nrel.gov/docs/fy12osti/51946.pdf">Renewable Energy Technical Potentials: A GIS-Based Analysis</a>.
+    This API is no longer functioning. Previously it provided access to a Technical Potential analyses model developed at NLR in conjunction with USAID. The tool estimates the technical potential of specific renewable electricity generation technologies taking into account a variety of user supplied filters and other inputs. These are technology-specific estimates of energy generation potential based on renewable resource availability and quality, technical system performance, topographic limitations, environmental, and land-use constraints only. The estimates do not consider economic or market constraints, and therefore do not represent a level of renewable generation that might actually be deployed. Details on the application and use of this tool, as well as the methodology employed can be found at <a href="https://www.re-explorer.org/training.html">REexplorer Training</a> and <a href="https://docs.nlr.gov/docs/fy12osti/51946.pdf">Renewable Energy Technical Potentials: A GIS-Based Analysis</a>.
 </p>
 
 <div class="row">
diff --git a/source/docs/energy-optimization/reopt/index.html.md.erb b/source/docs/energy-optimization/reopt/index.html.md.erb
index 05abcd08..705c3f92 100644
--- a/source/docs/energy-optimization/reopt/index.html.md.erb
+++ b/source/docs/energy-optimization/reopt/index.html.md.erb
@@ -7,7 +7,7 @@ summary: The REopt™ Application Programming Interface provides programmatic ac
 <%= current_page.data.summary %>
 
 <ul>
-    <li>General information related to REopt can be found at the <a href="https://www.nrel.gov/reopt">REopt Platform home page</a> (https://www.nrel.gov/reopt).</li>
+    <li>General information related to REopt can be found at the <a href="https://www.nlr.gov/reopt">REopt Platform home page</a> (https://www.nlr.gov/reopt).</li>
     <li>The web version of REopt can be accessed at the <a href="https://reopt.nrel.gov">REopt Web Tool page</a> (https://reopt.nrel.gov).</li>
     <li>For user support please use the <a href="https://github.com/NatLabRockies/REopt-Analysis-Scripts/discussions">REopt User Forum</a> (https://github.com/NatLabRockies/REopt-Analysis-Scripts/discussions).</li>
     <li>For help calling the API or using REopt.jl, see the <a href="https://github.com/NatLabRockies/REopt-Analysis-Scripts/wiki">REopt Analysis Wiki</a> (https://github.com/NatLabRockies/REopt-Analysis-Scripts/wiki).</li>
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_data_download.html.md.erb
index a4805045..3d727a3b 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_himawari7_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_himawari7_data_download.html.md.erb
index c5a90edf..4ca79a0f 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_himawari7_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_himawari7_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_himawari8_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_himawari8_data_download.html.md.erb
index 4370b684..0cdd4df7 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_himawari8_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_himawari8_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_meteosat_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_meteosat_data_download.html.md.erb
index 81169c7b..6733d88e 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_meteosat_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_meteosat_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_msg_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_msg_data_download.html.md.erb
index 8e55d741..6ef9639c 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_msg_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_msg_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/dynamic_spectral_polar_data_download.html.md.erb b/source/docs/solar/nsrdb/dynamic_spectral_polar_data_download.html.md.erb
index 77c0e965..ba80b810 100644
--- a/source/docs/solar/nsrdb/dynamic_spectral_polar_data_download.html.md.erb
+++ b/source/docs/solar/nsrdb/dynamic_spectral_polar_data_download.html.md.erb
@@ -260,7 +260,7 @@ In addition to this limit, the service has a secondary fail-safe mechanism desig
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/guide.html.md.erb b/source/docs/solar/nsrdb/guide.html.md.erb
index 95c06515..6729e2dd 100644
--- a/source/docs/solar/nsrdb/guide.html.md.erb
+++ b/source/docs/solar/nsrdb/guide.html.md.erb
@@ -61,4 +61,4 @@ curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -H "Cache-Cont
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
diff --git a/source/docs/solar/nsrdb/himawari-download.html.md.erb b/source/docs/solar/nsrdb/himawari-download.html.md.erb
index fb81d4f4..c656d9c6 100644
--- a/source/docs/solar/nsrdb/himawari-download.html.md.erb
+++ b/source/docs/solar/nsrdb/himawari-download.html.md.erb
@@ -303,7 +303,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/himawari-tmy-download.html.md.erb b/source/docs/solar/nsrdb/himawari-tmy-download.html.md.erb
index 7bf47c8d..f1206085 100644
--- a/source/docs/solar/nsrdb/himawari-tmy-download.html.md.erb
+++ b/source/docs/solar/nsrdb/himawari-tmy-download.html.md.erb
@@ -318,7 +318,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/himawari7-download.html.md.erb b/source/docs/solar/nsrdb/himawari7-download.html.md.erb
index 0be2439f..400ce59d 100644
--- a/source/docs/solar/nsrdb/himawari7-download.html.md.erb
+++ b/source/docs/solar/nsrdb/himawari7-download.html.md.erb
@@ -303,7 +303,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/index.html.md.erb b/source/docs/solar/nsrdb/index.html.md.erb
index a96f7a63..aa7bb0cd 100644
--- a/source/docs/solar/nsrdb/index.html.md.erb
+++ b/source/docs/solar/nsrdb/index.html.md.erb
@@ -14,4 +14,4 @@ The National Solar Radiation Database [(NSRDB)](https://nsrdb.nrel.gov/) is a se
 
 ## Contact
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
diff --git a/source/docs/solar/nsrdb/meteosat-download.html.md.erb b/source/docs/solar/nsrdb/meteosat-download.html.md.erb
index deaf61ad..bf465e1e 100644
--- a/source/docs/solar/nsrdb/meteosat-download.html.md.erb
+++ b/source/docs/solar/nsrdb/meteosat-download.html.md.erb
@@ -286,7 +286,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-GOES-aggregated-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-GOES-aggregated-v4-0-0-download.html.md.erb
index 35da0019..d1e18f69 100755
--- a/source/docs/solar/nsrdb/nsrdb-GOES-aggregated-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-GOES-aggregated-v4-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-GOES-conus-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-GOES-conus-v4-0-0-download.html.md.erb
index 7555f5a9..e05c9fd3 100755
--- a/source/docs/solar/nsrdb/nsrdb-GOES-conus-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-GOES-conus-v4-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-GOES-full-disc-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-GOES-full-disc-v4-0-0-download.html.md.erb
index 7b6f24ce..3770ccb9 100755
--- a/source/docs/solar/nsrdb/nsrdb-GOES-full-disc-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-GOES-full-disc-v4-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-GOES-tmy-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-GOES-tmy-v4-0-0-download.html.md.erb
index d6bdc0a0..cc73ccd6 100755
--- a/source/docs/solar/nsrdb/nsrdb-GOES-tmy-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-GOES-tmy-v4-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-download.html.md.erb
index d8f30c0f..f07d4f38 100755
--- a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-download.html.md.erb
@@ -294,7 +294,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tdy-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tdy-download.html.md.erb
index 6b0e07c5..09a8b374 100755
--- a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tdy-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tdy-download.html.md.erb
@@ -293,7 +293,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tgy-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tgy-download.html.md.erb
index a1b26848..4a7960de 100755
--- a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tgy-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tgy-download.html.md.erb
@@ -293,7 +293,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tmy-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tmy-download.html.md.erb
index 7d306b1d..d30bfc0b 100755
--- a/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tmy-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-msg-v1-0-0-tmy-download.html.md.erb
@@ -293,7 +293,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-polar-tmy-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-polar-tmy-v4-0-0-download.html.md.erb
index 80b9beab..70b50041 100755
--- a/source/docs/solar/nsrdb/nsrdb-polar-tmy-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-polar-tmy-v4-0-0-download.html.md.erb
@@ -298,7 +298,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb-polar-v4-0-0-download.html.md.erb b/source/docs/solar/nsrdb/nsrdb-polar-v4-0-0-download.html.md.erb
index a65a485a..c22a3784 100755
--- a/source/docs/solar/nsrdb/nsrdb-polar-v4-0-0-download.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb-polar-v4-0-0-download.html.md.erb
@@ -298,7 +298,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/nsrdb_data_query.html.md.erb b/source/docs/solar/nsrdb/nsrdb_data_query.html.md.erb
index 8c39f89d..3cd385be 100644
--- a/source/docs/solar/nsrdb/nsrdb_data_query.html.md.erb
+++ b/source/docs/solar/nsrdb/nsrdb_data_query.html.md.erb
@@ -450,7 +450,7 @@ Generated data files are formatted in accordance with the Standard Time Series D
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/philippines-download.html.md.erb b/source/docs/solar/nsrdb/philippines-download.html.md.erb
index 80e76897..cd3fe1cf 100644
--- a/source/docs/solar/nsrdb/philippines-download.html.md.erb
+++ b/source/docs/solar/nsrdb/philippines-download.html.md.erb
@@ -288,7 +288,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/suny-india-data-download.html.md.erb b/source/docs/solar/nsrdb/suny-india-data-download.html.md.erb
index e7e7e3fe..2c272a2f 100644
--- a/source/docs/solar/nsrdb/suny-india-data-download.html.md.erb
+++ b/source/docs/solar/nsrdb/suny-india-data-download.html.md.erb
@@ -314,7 +314,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/suny-india-tmy-data-download.html.md.erb b/source/docs/solar/nsrdb/suny-india-tmy-data-download.html.md.erb
index 00df2915..c0ba7a79 100644
--- a/source/docs/solar/nsrdb/suny-india-tmy-data-download.html.md.erb
+++ b/source/docs/solar/nsrdb/suny-india-tmy-data-download.html.md.erb
@@ -299,7 +299,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/nsrdb/vietnam-download.html.md.erb b/source/docs/solar/nsrdb/vietnam-download.html.md.erb
index 2f522322..eb4d5c0b 100644
--- a/source/docs/solar/nsrdb/vietnam-download.html.md.erb
+++ b/source/docs/solar/nsrdb/vietnam-download.html.md.erb
@@ -288,7 +288,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nrel.gov">nsrdb@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:nsrdb@nlr.gov">nsrdb@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/solar/pvwatts/index.html.md.erb b/source/docs/solar/pvwatts/index.html.md.erb
index e778ad67..74d1c0c8 100644
--- a/source/docs/solar/pvwatts/index.html.md.erb
+++ b/source/docs/solar/pvwatts/index.html.md.erb
@@ -8,7 +8,7 @@ summary: NLR's PVWatts<sup>&reg;</sup> API estimates the energy production of gr
 
 ---
 
-**NEWS:** Version 8 of the PVWatts Calculator web API is available as of 2022-11-14. This exciting update adds a bifacial module option, a new input for monthly irradiance losses, new inputs for specifying albedo, and updates the photovoltaic module, inverter, and thermal effects models to use more detailed and industry-accepted algorithms. PVWatts V8 also updates the weather data to 2020 TMY data from the NLR National Solar Radiation Database (NSRDB) for locations covered by the database. (The NSRDB weather data used in PVWatts V6 is from around 2015.) This update provides production estimates based on the latest, state-of-the art models from NLR that may differ from the V6 estimates, depending on the location and inputs. From a coding perspective, PVWatts V8 replaces the pvwattsv5 compute module with pvwattsv8 so that the PVWatts Calculator, web API, and implementation of PVWatts in the System Advisor Model (SAM) all use the same underlying model. The PVWatts V6 API will be deprecated in the future at a date to be determined. Deprecated versions of PVWatts are not available as web APIs, but are available via the [SAM Simulation Core (SSC) API](https://sam.nrel.gov/software-development-kit-sdk), which requires a local installation of the API with separate code to access weather data via the [NSRDB API](https://developer.nrel.gov/docs/solar/nsrdb/). Contact [pvwatts@nrel.gov](mailto:pvwatts@nrel.gov) if you have any questions.
+**NEWS:** Version 8 of the PVWatts Calculator web API is available as of 2022-11-14. This exciting update adds a bifacial module option, a new input for monthly irradiance losses, new inputs for specifying albedo, and updates the photovoltaic module, inverter, and thermal effects models to use more detailed and industry-accepted algorithms. PVWatts V8 also updates the weather data to 2020 TMY data from the NLR National Solar Radiation Database (NSRDB) for locations covered by the database. (The NSRDB weather data used in PVWatts V6 is from around 2015.) This update provides production estimates based on the latest, state-of-the art models from NLR that may differ from the V6 estimates, depending on the location and inputs. From a coding perspective, PVWatts V8 replaces the pvwattsv5 compute module with pvwattsv8 so that the PVWatts Calculator, web API, and implementation of PVWatts in the System Advisor Model (SAM) all use the same underlying model. The PVWatts V6 API will be deprecated in the future at a date to be determined. Deprecated versions of PVWatts are not available as web APIs, but are available via the [SAM Simulation Core (SSC) API](https://sam.nrel.gov/software-development-kit-sdk), which requires a local installation of the API with separate code to access weather data via the [NSRDB API](https://developer.nrel.gov/docs/solar/nsrdb/). Contact [pvwatts@nlr.gov](mailto:pvwatts@nlr.gov) if you have any questions.
 
 ---
 
diff --git a/source/docs/solar/pvwatts/v6.html.md.erb b/source/docs/solar/pvwatts/v6.html.md.erb
index 3116e746..99b88a8d 100644
--- a/source/docs/solar/pvwatts/v6.html.md.erb
+++ b/source/docs/solar/pvwatts/v6.html.md.erb
@@ -11,7 +11,7 @@ deprecated: true
 
 PVWatts<sup>&reg;</sup> Version 6 has been replaced by [Version 8](/docs/solar/pvwatts/v8/). We recommend using Version 8 because it has the most up-to-date models and weather data available. The decommissioning date for Version 6 is TBD.
 
-The algorithms used to calculate energy output are the same as in Version 5. For a technical description of the model, see Dobos, A. P. <a href="http://www.nrel.gov/docs/fy14osti/62641.pdf" target="_blank">PVWatts<sup>&reg;</sup> Version 5 Manual</a>. NREL/TP-6A20-62641, 2014.
+The algorithms used to calculate energy output are the same as in Version 5. For a technical description of the model, see Dobos, A. P. <a href="https://docs.nlr.gov/docs/fy14osti/62641.pdf" target="_blank">PVWatts<sup>&reg;</sup> Version 5 Manual</a>. NREL/TP-6A20-62641, 2014.
 
 <%= partial "layouts/toc" %>
 
diff --git a/source/docs/solar/pvwatts/v8.html.md.erb b/source/docs/solar/pvwatts/v8.html.md.erb
index ffdc0f91..358c6ce1 100644
--- a/source/docs/solar/pvwatts/v8.html.md.erb
+++ b/source/docs/solar/pvwatts/v8.html.md.erb
@@ -10,7 +10,7 @@ sort_value: "0"
 
 PVWatts<sup>&reg;</sup> Version 8 is is the current version of the PVWatts API. Updates from Version 6 include a bifacial module option, a new input for monthly irradiance losses, new inputs for specifying albedo, and updates to the photovoltaic module, inverter, and thermal effects models to use more detailed and industry-accepted algorithms. PVWatts V8 also updates the weather data to 2020 TMY data from the NLR National Solar Radiation Database (NSRDB) for locations covered by the database. (The NSRDB weather data used in PVWatts V6 is from around 2015.) This update provides production estimates based on the latest, state-of-the art models from NLR that may differ from the V6 estimates, depending on the location and inputs. From a coding perspective, PVWatts V8 replaces the pvwattsv5 compute module with pvwattsv8 so that the PVWatts Calculator, web API, and implementation of PVWatts in the System Advisor Model (SAM) all use the same underlying model. For a complete description of PVWatts V8, see the [description on the PVWatts website](https://pvwatts.nrel.gov/version_8.php).
 
-NLR anticipates that the V8 API will run slightly slower than the V6 API due to upgraded models. Please contact [pvwatts@nrel.gov](mailto:pvwatts@nrel.gov) if you find V8 is significantly slower or that the performance is impacting your product.
+NLR anticipates that the V8 API will run slightly slower than the V6 API due to upgraded models. Please contact [pvwatts@nlr.gov](mailto:pvwatts@nlr.gov) if you find V8 is significantly slower or that the performance is impacting your product.
 
 There is a forthcoming report containing a technical description of the model.
 
diff --git a/source/docs/solar/solar-resource-v1.html.md.erb b/source/docs/solar/solar-resource-v1.html.md.erb
index 1b080578..f1a9ddf8 100644
--- a/source/docs/solar/solar-resource-v1.html.md.erb
+++ b/source/docs/solar/solar-resource-v1.html.md.erb
@@ -165,7 +165,7 @@ The output fields contain the following solar data.
         <p>collection of decimals (monthly)</p>
       </td>
       <td class="doc-parameter-description">
-        <strong>Average Direct Normal Irradiance</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the resource available to concentrating systems that track the sun throughout the day. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="http://www.nrel.gov/gis" target="_blank">http://www.nrel.gov/gis</a>)
+        <strong>Average Direct Normal Irradiance</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the resource available to concentrating systems that track the sun throughout the day. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="https://www.nlr.gov/gis" target="_blank">https://www.nlr.gov/gis</a>)
       </td>
     </tr>
     <tr>
@@ -176,7 +176,7 @@ The output fields contain the following solar data.
         <p>collection of decimals (monthly)</p>
       </td>
       <td class="doc-parameter-description">
-        <strong>Average Global Horizontal Irradiance</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the global horizontal resource - the geometric sum of direct normal and diffuse irradiance components, representing total energy available on a planar surface. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="http://www.nrel.gov/gis" target="_blank">http://www.nrel.gov/gis</a>)
+        <strong>Average Global Horizontal Irradiance</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the global horizontal resource - the geometric sum of direct normal and diffuse irradiance components, representing total energy available on a planar surface. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="https://www.nlr.gov/gis" target="_blank">https://www.nlr.gov/gis</a>)
       </td>
     </tr>
     <tr>
@@ -187,7 +187,7 @@ The output fields contain the following solar data.
         <p>collection of decimals (monthly)</p>
       </td>
       <td class="doc-parameter-description">
-        <strong>Average Tilt at Latitude</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the resource available to fixed flat plate system tilted towards the equator at an angle equal to the latitude. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="http://www.nrel.gov/gis" target="_blank">http://www.nrel.gov/gis</a>)
+        <strong>Average Tilt at Latitude</strong>: This data provides monthly average and annual average daily total solar resource averaged over surface cells of 0.1 degrees in both latitude and longitude, or about 10 km in size. The values returned are kWh/m<sup>2</sup>/day (kilowatt hours per square meter per day). The insolation values represent the resource available to fixed flat plate system tilted towards the equator at an angle equal to the latitude. The data are created using the SUNY Satellite Solar Radiation model (Perez, et.al., 2002). The data are averaged from hourly model output over 12 years (1998-2009). This model uses hourly radiance images from geostationary weather satellites, daily snow cover data, and monthly averages of atmospheric water vapor, trace gases, and the amount of aerosols in the atmosphere to calculate the hourly total insolation (sun and sky) falling on a horizontal surface. The direct beam radiation is then calculated using the atmospheric water vapor, trace gases, and aerosols, which are derived from a variety of sources. Where possible, existing ground measurement stations are used to validate the data. (see <a href="https://www.nlr.gov/gis" target="_blank">https://www.nlr.gov/gis</a>)
       </td>
     </tr>
   </tbody>
diff --git a/source/docs/transportation/altrios-v1/spec.yml b/source/docs/transportation/altrios-v1/spec.yml
index 94951b42..993bab6d 100644
--- a/source/docs/transportation/altrios-v1/spec.yml
+++ b/source/docs/transportation/altrios-v1/spec.yml
@@ -4,10 +4,10 @@ info:
   version: "1.0"
   description: |
     The Advanced Locomotive Technology and Rail Infrastructure Optimization System (ALTRIOS) is the first fully integrated, open-source software to simulate and optimize the rollout of cost-effective locomotive technologies for de-carbonization.
-    For more information, see: <https://www.nrel.gov/transportation/altrios.html>. 
+    For more information, see: <https://www.nlr.gov/transportation/altrios>.
 
     This API showcases a limited set of features from the full ALTRIOS model.
-    For more complicated analyses, we recommend you utilize the core model at <https://github.com/NatLabRockies/altrios>. 
+    For more complicated analyses, we recommend you utilize the core model at <https://github.com/NatLabRockies/altrios>.
 
     **Endpoints**:
     - `/rollout`: Explore a rollout strategy for incorporating battery electric locomotives (BELs) into a fleet of existing diesel locomotives.
@@ -237,7 +237,7 @@ components:
         green_house_diff:
           type: number
           description: The difference, as a percent, between the greenhouse gas emissions in the rollout case and the baseline case.
-          example: 30 
+          example: 30
         all_metrics:
           type: array
           items:
diff --git a/source/docs/transportation/routee-v3/spec.yml b/source/docs/transportation/routee-v3/spec.yml
index 51f262ee..08b3e83b 100644
--- a/source/docs/transportation/routee-v3/spec.yml
+++ b/source/docs/transportation/routee-v3/spec.yml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: RouteE API
-  description: The Route Energy Prediction Model (RouteE) predicts the energy consumption of a given vehicle over a link or sequence of links (route) in a road network. These API endpoints can be used to get single vehicle link or route energy estimates (`/powertrain/route`) and energy aware routes between an origin and destination for a specific vehicle (`/compass/route`). For more on RouteE, please visit <https://www.nrel.gov/transportation/route-energy-prediction-model.html>.
+  description: The Route Energy Prediction Model (RouteE) predicts the energy consumption of a given vehicle over a link or sequence of links (route) in a road network. These API endpoints can be used to get single vehicle link or route energy estimates (`/powertrain/route`) and energy aware routes between an origin and destination for a specific vehicle (`/compass/route`). For more on RouteE, please visit <https://www.nlr.gov/transportation/route-energy-prediction-model>.
   version: "3.0"
 servers:
   - url: https://developer.nrel.gov/api/routee/v3
@@ -104,7 +104,7 @@ components:
           format: float
           description: The grade of the link in percent form (i.e. 5% grade)
           nullable: true
-          example: 5 
+          example: 5
     PowertrainRequest:
       type: object
       required: [powertrain_model, links]
@@ -160,7 +160,7 @@ components:
           type: number
           format: float
           description: The longitude of the origin
-          example: -105.167987 
+          example: -105.167987
         destination_lat:
           type: number
           format: float
@@ -170,7 +170,7 @@ components:
           type: number
           format: float
           description: The longitude of the destination
-          example: -105.280362 
+          example: -105.280362
         model_name:
           type: string
           description: The name of the RouteE Powertrain vehicle model to use for the energy estimate
diff --git a/source/docs/wave/hindcast/cnmi-and-guam.html.md.erb b/source/docs/wave/hindcast/cnmi-and-guam.html.md.erb
index b78d1600..13ea41c6 100755
--- a/source/docs/wave/hindcast/cnmi-and-guam.html.md.erb
+++ b/source/docs/wave/hindcast/cnmi-and-guam.html.md.erb
@@ -208,7 +208,7 @@ Examples may not reflect this specific dataset.
 
 ### JSON Output Format
 
-<div class="doc-example-url"><code>GET <%= current_page.data.url %>.json?api_key={{API_KEY}}email=datalovr@nrel.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2018,2019,2020&interval=180</code></div>
+<div class="doc-example-url"><code>GET <%= current_page.data.url %>.json?api_key={{API_KEY}}email=datalovr@nlr.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2018,2019,2020&interval=180</code></div>
 
 ```JSON
 {
@@ -218,7 +218,7 @@ Examples may not reflect this specific dataset.
             "0": ".json"
         },
         "query": {
-            "email": "datalovr@nrel.gov",
+            "email": "datalovr@nlr.gov",
             "wkt": "POINT(145.6704112711147 16.32973014436503)",
             "attributes": "directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width",
             "names": "2018,2019,2020",
@@ -243,7 +243,7 @@ Examples may not reflect this specific dataset.
 ### CSV Output Format
 Direct streaming of CSV data is supported for single location, single year only. The following response example is truncated after the first few rows of data.
 
-<div class="doc-example-url"><code>GET <%= current_page.data.url %>.csv?api_key={{API_KEY}}&email=datalovr@nrel.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2020&interval=180</code></div>
+<div class="doc-example-url"><code>GET <%= current_page.data.url %>.csv?api_key={{API_KEY}}&email=datalovr@nlr.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2020&interval=180</code></div>
 
 ```csv
 Source,Location ID,Jurisdiction,Latitude,Longitude,Time Zone,Local Time Zone,Distance to Shore,Directionality Coefficient,Energy Period,Maximum Energy Direction,Mean Absolute Period,Mean Wave Direction,Mean Zero-Crossing Period,Wave Power,Peak Period,Significant Wave Height,Spectral Width,Water Depth,Version
@@ -267,7 +267,7 @@ import requests
 
 url = "http://developer.nrel.gov<%= current_page.data.url %>.json?api_key=yourapikeygoeshere"
 
-payload = "api_key={{API_KEY}}&email=datalovr@nrel.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2020&interval=180"
+payload = "api_key={{API_KEY}}&email=datalovr@nlr.gov&wkt=POINT(145.6704112711147+16.32973014436503)&attributes=directionality_coefficient,energy_period,maximum_energy_direction,mean_absolute_period,mean_wave_direction,omni-directional_wave_power,peak_period,significant_wave_height,spectral_width&names=2020&interval=180"
 
 headers = {
     'content-type': "application/x-www-form-urlencoded",
@@ -293,7 +293,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:marineresource@nrel.gov">marineresource@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:marineresource@nlr.gov">marineresource@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wave/hindcast/gom-and-pr.html.md.erb b/source/docs/wave/hindcast/gom-and-pr.html.md.erb
index 973e569a..48ddf924 100755
--- a/source/docs/wave/hindcast/gom-and-pr.html.md.erb
+++ b/source/docs/wave/hindcast/gom-and-pr.html.md.erb
@@ -289,7 +289,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:marineresource@nrel.gov">marineresource@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:marineresource@nlr.gov">marineresource@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/central-asia-wind-download.html.md.erb b/source/docs/wind/wind-toolkit/central-asia-wind-download.html.md.erb
index fb8f46fa..6e63e061 100644
--- a/source/docs/wind/wind-toolkit/central-asia-wind-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/central-asia-wind-download.html.md.erb
@@ -270,7 +270,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/guide.html.md.erb b/source/docs/wind/wind-toolkit/guide.html.md.erb
index a2c2c4f4..5c682b3f 100644
--- a/source/docs/wind/wind-toolkit/guide.html.md.erb
+++ b/source/docs/wind/wind-toolkit/guide.html.md.erb
@@ -60,4 +60,4 @@ curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -H "Cache-Cont
 
 ## Contact
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
diff --git a/source/docs/wind/wind-toolkit/index.html.md.erb b/source/docs/wind/wind-toolkit/index.html.md.erb
index 9338354f..b57d15ac 100644
--- a/source/docs/wind/wind-toolkit/index.html.md.erb
+++ b/source/docs/wind/wind-toolkit/index.html.md.erb
@@ -7,11 +7,11 @@ summary: Freely available downloads of Wind Integration National Dataset Toolkit
 # <%= current_page.data.title %>
 <%= current_page.data.summary %>
 
-The Wind Integration National Dataset (WIND) Toolkit is an update and expansion of the Eastern Integration Data Set and Western Wind Integration Data Set. It supports the next generation of wind integration studies. The WIND Toolkit includes meteorological conditions and turbine power for more than 126,000 sites in the continental United States for the years 2007—2013. Read more at [https://www.nrel.gov/grid/wind-toolkit.html](https://www.nrel.gov/grid/wind-toolkit.html)
+The Wind Integration National Dataset (WIND) Toolkit is an update and expansion of the Eastern Integration Data Set and Western Wind Integration Data Set. It supports the next generation of wind integration studies. The WIND Toolkit includes meteorological conditions and turbine power for more than 126,000 sites in the continental United States for the years 2007—2013. Read more at [https://www.nlr.gov/grid/wind-toolkit](https://www.nlr.gov/grid/wind-toolkit)
 
 
 <%= partial("layouts/child_links") %>
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
diff --git a/source/docs/wind/wind-toolkit/india-wind-download.html.md.erb b/source/docs/wind/wind-toolkit/india-wind-download.html.md.erb
index c091203d..d22e6f8b 100644
--- a/source/docs/wind/wind-toolkit/india-wind-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/india-wind-download.html.md.erb
@@ -266,7 +266,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/mexico-wtk.download.html.md.erb b/source/docs/wind/wind-toolkit/mexico-wtk.download.html.md.erb
index efabf36b..b99e2d2c 100644
--- a/source/docs/wind/wind-toolkit/mexico-wtk.download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/mexico-wtk.download.html.md.erb
@@ -254,7 +254,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-ca-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-ca-download.html.md.erb
index 64d4d79c..5b2f5be9 100644
--- a/source/docs/wind/wind-toolkit/offshore-ca-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-ca-download.html.md.erb
@@ -261,7 +261,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-great-lakes-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-great-lakes-download.html.md.erb
index 436aad01..112efe9e 100644
--- a/source/docs/wind/wind-toolkit/offshore-great-lakes-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-great-lakes-download.html.md.erb
@@ -261,7 +261,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-gulf-of-mexico-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-gulf-of-mexico-download.html.md.erb
index c209ef51..1b24c235 100644
--- a/source/docs/wind/wind-toolkit/offshore-gulf-of-mexico-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-gulf-of-mexico-download.html.md.erb
@@ -267,7 +267,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-hawaii-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-hawaii-download.html.md.erb
index a21917d6..dfb70fcd 100644
--- a/source/docs/wind/wind-toolkit/offshore-hawaii-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-hawaii-download.html.md.erb
@@ -267,7 +267,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-mid-atlantic-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-mid-atlantic-download.html.md.erb
index d5b0b7a5..05dcd7d7 100644
--- a/source/docs/wind/wind-toolkit/offshore-mid-atlantic-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-mid-atlantic-download.html.md.erb
@@ -267,7 +267,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-north-atlantic-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-north-atlantic-download.html.md.erb
index 1d8d30ff..04795db8 100644
--- a/source/docs/wind/wind-toolkit/offshore-north-atlantic-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-north-atlantic-download.html.md.erb
@@ -267,7 +267,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/offshore-nw-pacific-download.html.md.erb b/source/docs/wind/wind-toolkit/offshore-nw-pacific-download.html.md.erb
index 99d97ef2..076e8a34 100644
--- a/source/docs/wind/wind-toolkit/offshore-nw-pacific-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/offshore-nw-pacific-download.html.md.erb
@@ -267,7 +267,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/philippines-wtk-download.html.md.erb b/source/docs/wind/wind-toolkit/philippines-wtk-download.html.md.erb
index 725d5671..8b72f6c3 100644
--- a/source/docs/wind/wind-toolkit/philippines-wtk-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/philippines-wtk-download.html.md.erb
@@ -256,7 +256,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/southeast-asia-wind-download.html.md.erb b/source/docs/wind/wind-toolkit/southeast-asia-wind-download.html.md.erb
index 2bab7c7a..18cf00e6 100644
--- a/source/docs/wind/wind-toolkit/southeast-asia-wind-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/southeast-asia-wind-download.html.md.erb
@@ -264,7 +264,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/sup3rwind-ukraine-download.html.md.erb b/source/docs/wind/wind-toolkit/sup3rwind-ukraine-download.html.md.erb
index a763a143..a8778695 100755
--- a/source/docs/wind/wind-toolkit/sup3rwind-ukraine-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/sup3rwind-ukraine-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/vietnam-wtk-download.html.md.erb b/source/docs/wind/wind-toolkit/vietnam-wtk-download.html.md.erb
index 891ef027..483b9b57 100644
--- a/source/docs/wind/wind-toolkit/vietnam-wtk-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/vietnam-wtk-download.html.md.erb
@@ -256,7 +256,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-alaska-v1-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-alaska-v1-0-0-download.html.md.erb
index 6f4da7d2..a1bdc125 100755
--- a/source/docs/wind/wind-toolkit/wtk-alaska-v1-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-alaska-v1-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-bangladesh-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-bangladesh-download.html.md.erb
index 54fa5c4c..e5808a39 100755
--- a/source/docs/wind/wind-toolkit/wtk-bangladesh-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-bangladesh-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-bchrrr-v1-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-bchrrr-v1-0-0-download.html.md.erb
index 038d963a..aa2eacd3 100755
--- a/source/docs/wind/wind-toolkit/wtk-bchrrr-v1-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-bchrrr-v1-0-0-download.html.md.erb
@@ -297,7 +297,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-canada-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-canada-5min-download.html.md.erb
index 40d1df1b..8e0e0f12 100755
--- a/source/docs/wind/wind-toolkit/wtk-canada-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-canada-5min-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-conus-5min-v2-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-conus-5min-v2-0-0-download.html.md.erb
index d62f7178..4baff836 100755
--- a/source/docs/wind/wind-toolkit/wtk-conus-5min-v2-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-conus-5min-v2-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-download.html.md.erb
index 810ca748..79fc9059 100644
--- a/source/docs/wind/wind-toolkit/wtk-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-download.html.md.erb
@@ -264,7 +264,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-5min-download.html.md.erb
index e69f18f4..5dd7490a 100755
--- a/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-5min-download.html.md.erb
@@ -289,7 +289,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-hourly-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-hourly-download.html.md.erb
index 7aa02e35..1b934b40 100755
--- a/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-hourly-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-guam-v1-0-0-hourly-download.html.md.erb
@@ -284,7 +284,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-indonesia-v1-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-indonesia-v1-0-0-download.html.md.erb
index 134be077..2f62c9ff 100755
--- a/source/docs/wind/wind-toolkit/wtk-indonesia-v1-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-indonesia-v1-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-kazakhstan-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-kazakhstan-download.html.md.erb
index 97a78d05..6a20f8dc 100755
--- a/source/docs/wind/wind-toolkit/wtk-kazakhstan-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-kazakhstan-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-led-alaska-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-led-alaska-download.html.md.erb
index 63cdc8f3..3341f5c8 100755
--- a/source/docs/wind/wind-toolkit/wtk-led-alaska-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-led-alaska-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-led-climate-v1-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-led-climate-v1-0-0-download.html.md.erb
index 1d9ee648..50673248 100755
--- a/source/docs/wind/wind-toolkit/wtk-led-climate-v1-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-led-climate-v1-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-led-conus-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-led-conus-download.html.md.erb
index fbce49a5..da4a2fd7 100755
--- a/source/docs/wind/wind-toolkit/wtk-led-conus-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-led-conus-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-maine-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-maine-download.html.md.erb
index a3805fd1..a4223eb0 100755
--- a/source/docs/wind/wind-toolkit/wtk-maine-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-maine-download.html.md.erb
@@ -291,7 +291,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-mexico-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-mexico-5min-download.html.md.erb
index eb97bb86..aad5dd8e 100755
--- a/source/docs/wind/wind-toolkit/wtk-mexico-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-mexico-5min-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-now23-california-v1-0-0-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-now23-california-v1-0-0-5min-download.html.md.erb
index 1f16b35f..48f3740c 100755
--- a/source/docs/wind/wind-toolkit/wtk-now23-california-v1-0-0-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-now23-california-v1-0-0-5min-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-pr100-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-pr100-5min-download.html.md.erb
index 1e20ec67..24c598e4 100755
--- a/source/docs/wind/wind-toolkit/wtk-pr100-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-pr100-5min-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-seasiawind-v3-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-seasiawind-v3-download.html.md.erb
index d57a4fe4..121af6d7 100755
--- a/source/docs/wind/wind-toolkit/wtk-seasiawind-v3-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-seasiawind-v3-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-south-atlantic-yearly-5min-v1-0-0-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-south-atlantic-yearly-5min-v1-0-0-download.html.md.erb
index db06e608..5125c004 100755
--- a/source/docs/wind/wind-toolkit/wtk-south-atlantic-yearly-5min-v1-0-0-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-south-atlantic-yearly-5min-v1-0-0-download.html.md.erb
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-srw-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-srw-download.html.md.erb
index 9a6d1c27..29daf4aa 100644
--- a/source/docs/wind/wind-toolkit/wtk-srw-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-srw-download.html.md.erb
@@ -182,7 +182,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nrel.gov">WindToolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:WindToolkit@nlr.gov">WindToolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-5min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-5min-download.html.md.erb
index 1686f3c0..1abbc92d 100755
--- a/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-5min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-5min-download.html.md.erb
@@ -291,7 +291,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-60min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-60min-download.html.md.erb
index a9ea3312..b7b496f8 100755
--- a/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-60min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-sup3rwind-south-america-v1-0-0-60min-download.html.md.erb
@@ -287,7 +287,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/docs/wind/wind-toolkit/wtk-sup3rwind-ukraine-60min-download.html.md.erb b/source/docs/wind/wind-toolkit/wtk-sup3rwind-ukraine-60min-download.html.md.erb
index 58d89649..969c7895 100755
--- a/source/docs/wind/wind-toolkit/wtk-sup3rwind-ukraine-60min-download.html.md.erb
+++ b/source/docs/wind/wind-toolkit/wtk-sup3rwind-ukraine-60min-download.html.md.erb
@@ -201,7 +201,7 @@ The response is composed of service-related informational fields and the results
 
 ## Data File Format
 
-Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NREL models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
+Generated data files are formatted in accordance with the Standard Time Series Data File Format. This file format has been developed to support [SAM](https://sam.nrel.gov/) and other NLR models and is documented fully in [this PDF](https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf). More information on SAM file formats available on [the SAM weather page](https://sam.nrel.gov/weather).
 
 ## Examples
 Examples may not reflect this specific dataset.
@@ -290,7 +290,7 @@ For some tips and tricks to maximize data downloads please read the guide [here]
 
 <h2 id="contacts">Contact</h2>
 
-<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nrel.gov">wind-toolkit@nrel.gov</a></p>
+<p>For questions about the API or the data models please contact <a href="mailto:wind-toolkit@nlr.gov">wind-toolkit@nlr.gov</a></p>
 
 <h2 id="errors">Errors</h2>
 
diff --git a/source/layouts/_footer.erb b/source/layouts/_footer.erb
index f804c962..b51032f1 100644
--- a/source/layouts/_footer.erb
+++ b/source/layouts/_footer.erb
@@ -5,15 +5,15 @@
     <div class="container-xl">
       <div class="row">
         <div class="col-12 col-lg-5">
-          <a href="https://www.nrel.gov/"><strong>National Laboratory of the Rockies</strong></a>
+          <a href="https://www.nlr.gov"><strong>National Laboratory of the Rockies</strong></a>
         </div>
         <div class="col col-lg-7">
           <div class="d-flex flex-column flex-lg-row justify-content-lg-start global">
-            <div><a href="https://www.nrel.gov/about">About</a></div>
-            <div><a href="https://www.nrel.gov/research">Research</a></div>
-            <div><a href="https://www.nrel.gov/workingwithus">Partner With Us</a></div>
-            <div><a href="https://www.nrel.gov/news/">News</a></div>
-            <div><a href="https://www.nrel.gov/careers">Careers</a></div>
+            <div><a href="https://www.nlr.gov/about">About</a></div>
+            <div><a href="https://www.nlr.gov/research">Research</a></div>
+            <div><a href="https://www.nlr.gov/workingwithus">Partner With Us</a></div>
+            <div><a href="https://www.nlr.gov/news">News</a></div>
+            <div><a href="https://www.nlr.gov/careers">Careers</a></div>
           </div>
         </div>
       </div>
@@ -24,15 +24,15 @@
       <div class="row">
         <div class="col-md-4 col-lg-5">
           <div><a href="/contact/">Contact Us</a></div>
-          <div class="mt-2"><a href="https://www.nrel.gov/about/visiting-nrel">Visit</a></div>
-          <div class="mt-2"><a href="https://www.nrel.gov/news/subscribe.html">Subscribe to NLR</a></div>
+          <div class="mt-2"><a href="https://www.nlr.gov/about/visiting-nrel">Visit</a></div>
+          <div class="mt-2"><a href="https://www.nlr.gov/news/subscribe">Subscribe to NLR</a></div>
           <div class="mt-3">
             <ul class="social-links list-inline">
-              <li class="list-inline-item"><a href="https://www.facebook.com/nationalrenewableenergylab" aria-label="Follow NLR on Facebook"><i class="fa-brands fa-square-facebook"><!--facebook--></i></a></li>
+              <li class="list-inline-item"><a href="https://www.facebook.com/nationallaboratoryoftherockies" aria-label="Follow NLR on Facebook"><i class="fa-brands fa-square-facebook"><!--facebook--></i></a></li>
               <li class="list-inline-item"><a href="https://www.instagram.com/nationalrenewableenergylab/" aria-label="Follow NLR on Instagram"><i class="fa-brands fa-instagram"><!--Instagram--></i></a></li>
               <li class="list-inline-item"><a href="https://www.linkedin.com/company/national-renewable-energy-laboratory"
                                               aria-label="Follow NLR on Linked In"><i class="fa-brands fa-linkedin"><!--Linked In--></i></a></li>
-              <li class="list-inline-item"><a href="https://www.youtube.com/user/NRELPR/" aria-label="Follow NLR on YouTube"><i class="fa-brands fa-youtube"><!--You Tube--></i></a></li>
+              <li class="list-inline-item"><a href="https://www.youtube.com/@nationallaboratoryoftherockies" aria-label="Follow NLR on YouTube"><i class="fa-brands fa-youtube"><!--You Tube--></i></a></li>
               <li class="list-inline-item"><a href="https://twitter.com/nrel/" aria-label="Follow NLR on X"><i class="fa-brands fa-x-twitter"><!--twitter--></i></a></li>
               <li class="list-inline-item"><a href="https://www.threads.net/@nationalrenewableenergylab" aria-label="Follow NLR on X"><span class="fa-brands fa-threads"><!-- Threads --></span></a></li>
             </ul>
@@ -41,25 +41,25 @@
         <div class="col-md-8 col-lg-7 globalsecondary">
           <div class="row">
             <div class="col-sm-6 col-lg-3">
-              <div class="mt-0"><a href="https://www.nrel.gov/accessibility.html">Accessibility</a></div>
-              <div class="mt-3 mt-sm-2"><a href="https://www.nrel.gov/disclaimer.html">Disclaimer</a></div>
-              <div class="mt-3 mt-sm-2"><a href="https://www.nrel.gov/security.html">Security and Privacy</a></div>
-              <div class="mt-3 mt-sm-2"><a href="https://www.nrel.gov/webmaster.html">Site Feedback</a></div>
+              <div class="mt-0"><a href="https://www.nlr.gov/accessibility">Accessibility</a></div>
+              <div class="mt-3 mt-sm-2"><a href="https://www.nlr.gov/disclaimer">Disclaimer</a></div>
+              <div class="mt-3 mt-sm-2"><a href="https://www.nlr.gov/security">Security and Privacy</a></div>
+              <div class="mt-3 mt-sm-2"><a href="https://www.nlr.gov/webmaster">Site Feedback</a></div>
             </div>
             <div class="col-sm-6 col-lg-3">
 
-              <div class="mt-3 mt-sm-0"><a href="https://developer.nrel.gov/">Developers</a></div>
-              <div class="mt-3 mt-sm-2"><a href="https://thesource.nrel.gov/">Employees</a></div>
+              <div class="mt-3 mt-sm-0"><a href="https://developer.nrel.gov">Developers</a></div>
+              <div class="mt-3 mt-sm-2"><a href="https://thesource.nrel.gov">Employees</a></div>
             </div>
           </div>
         </div>
       </div>
-      <hr>
-      <div class="mt-4">
+      <hr class="mt-4">
+      <div class="mt-3">
         <div class="row">
           <div class="col-sm-5">
-            <a href="https://www.allianceforsustainableenergy.org/"><img src="<%= vite_asset_path "nrel-app-template/img/alliance-logo-black.svg" %>" alt="Alliance for Sustainable Energy, LLC" class="mb-3" width="145" height="53" style="width:145px;height:53px;"></a>
-            <a href="https://www.energy.gov"><img src="<%= vite_asset_path "nrel-app-template/img/2025-doe-logo-stacked-horizontal.svg" %>" alt="U.S. Department of Energy" class="ms-3" width="203" height="50" style="width:203px;height:50px;"></a>
+            <a href="https://www.alliance-for-energy-innovation.org"><img src="<%= vite_asset_path "nrel-app-template/img/alliance-logo-black.svg" %>" alt="Alliance for Energy Innovation, LLC" class="mb-3" width="145" height="48"></a>
+            <a href="https://www.energy.gov"><img src="<%= vite_asset_path "nrel-app-template/img/2025-doe-logo-stacked-horizontal.svg" %>" alt="U.S. Department of Energy" class="ms-2" width="203" height="50"></a>
           </div>
           <div class="col-12 col-sm-7">
             <p class="nrel-attr mt-3">The National Laboratory of the Rockies is a national laboratory of the U.S. Department of Energy, Office of Critical Minerals and Energy Innovation, operated under Contract No. DE-AC36-08GO28308.</p>
diff --git a/source/layouts/_header.erb b/source/layouts/_header.erb
index 9601c6e6..a2a31838 100644
--- a/source/layouts/_header.erb
+++ b/source/layouts/_header.erb
@@ -7,7 +7,7 @@
       <div class="row align-items-center">
 
         <div class="col-md-6 col-xl-4 order-md-2 text-center text-md-end">
-          <a class="logo-img" href="https://www.nrel.gov/">
+          <a class="logo-img" href="https://www.nlr.gov">
             <img src="<%= vite_asset_path "nrel-app-template/img/nlr.webp" %>" alt="National Laboratory of the Rockies">
           </a>