diff --git a/_includes/link.html b/_includes/link.html
new file mode 100644
index 000000000..95405dd58
--- /dev/null
+++ b/_includes/link.html
@@ -0,0 +1,21 @@
+<li {%if invalid == "true" %}class="invalid"{% endif %}>
+    {%if invalid == "true" %} 
+    <img class="warning-invalid"
+        src="{{ site.baseurl }}/public/warning-64.png"
+        title="This link is tagged as invalid so it will probably won't work. A link to archive.org is added for your convenience, good luck!"
+        >
+    {% endif %} 
+    {{desc}}  {% if via != "" %}via {{via}}{% endif %}
+    {% if lang != "" %}[{{lang | upcase}}]{% endif %}
+    <br>
+      <span class="rafaga-li">
+        <a href="{{link}}">
+            {{link}}
+        </a>
+        {%if invalid == "true" %} 
+        | <a class="archive-link" href="https://web.archive.org/web/*/{{link}}" >
+            archive.org
+        </a>
+        {% endif %} 
+    </span>
+</li>
diff --git a/_layouts/default.html b/_layouts/default.html
index dd4a5a935..2b0077e5a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -55,11 +55,5 @@ <h3 class="masthead-title">
         </small>
       </footer>
     </div>
-    <script src="https://unpkg.com/quicklink"></script>
-    <script>
-      document.addEventListener('DOMContentLoaded', function(){
-          quicklink();
-      });
-    </script>
   </body>
 </html>
diff --git a/_layouts/rafaga.html b/_layouts/rafaga.html
index 8b1bdf1af..a955560c3 100644
--- a/_layouts/rafaga.html
+++ b/_layouts/rafaga.html
@@ -15,16 +15,20 @@ <h1 class="post-title">
   <div class="rafaga-links">
     <ul>
       {% for rafaga in page.rafagas %}
-  
-      <li {%if rafaga.invalid %}style="text-decoration:line-through"{% endif %}>
-        {{rafaga.desc}}  {% if rafaga.via %}via {{rafaga.via}}{% endif %}
-        {% if rafaga.lang %}[{{rafaga.lang | upcase}}]{% endif %}
-        <br>
-        {% unless rafaga.invalid %}<span class="rafaga-li"><a href="{{rafaga.link}}" {%if rafaga.nocheck %}data-proofer-ignore{% endif %}>{% endunless %}
-        {{rafaga.link}}
-        {% unless rafaga.invalid %}</a></span>{% endunless %}
-      </li>
-      {% endfor %}
+        {% capture desc %}{{rafaga.desc}}{% endcapture %}
+        {% capture link %}{{rafaga.link}}{% endcapture %}
+        {% capture via %}{{rafaga.via}}{% endcapture %}
+        {% capture desc %}{{rafaga.desc}}{% endcapture %}
+        {% capture invalid %}{{rafaga.invalid | default: false}}{% endcapture %}
+        {% capture lang %}{{rafaga.lang}}{% endcapture %}
+        {% include link.html 
+          desc=desc
+          link=link
+          via=via
+          invalid=invalid
+          lang=lang
+          %}
+        {% endfor %}
     </ul>
   </div>
 
diff --git a/_pages/index.html b/_pages/index.html
index 4513b2b38..26b3c35dc 100644
--- a/_pages/index.html
+++ b/_pages/index.html
@@ -30,14 +30,19 @@ <h1 class="post-title">
     {% if post.rafagas %}
     <ul>
       {% for rafaga in post.rafagas %}
-      <li {%if rafaga.invalid %}style="text-decoration:line-through"{% endif %}>
-          {{rafaga.desc | truncate: 250}}  {% if rafaga.via %}via {{rafaga.via}}{% endif %}
-          {% if rafaga.lang %}[{{rafaga.lang | upcase}}]{% endif %}
-          <br>
-          {% unless rafaga.invalid %}<span class="rafaga-li"><a href="{{rafaga.link}}" {%if rafaga.nocheck %}data-proofer-ignore{% endif %}>{% endunless %}
-          {{rafaga.link}}
-          {% unless rafaga.invalid %}</a></span>{% endunless %}
-        </li>
+        {% capture desc %}{{rafaga.desc}}{% endcapture %}
+        {% capture link %}{{rafaga.link}}{% endcapture %}
+        {% capture via %}{{rafaga.via}}{% endcapture %}
+        {% capture desc %}{{rafaga.desc}}{% endcapture %}
+        {% capture invalid %}{{rafaga.invalid | default: "false"}}{% endcapture %}
+        {% capture lang %}{{rafaga.lang}}{% endcapture %}
+        {% include link.html 
+          desc=desc
+          link=link
+          via=via
+          invalid=invalid
+          lang=lang
+          %}
       {% endfor %}
     </ul>
     {% endif %}
diff --git a/_sass/_posts.scss b/_sass/_posts.scss
index 90ce55b6d..12ed7ec43 100644
--- a/_sass/_posts.scss
+++ b/_sass/_posts.scss
@@ -62,3 +62,18 @@
 .post ul a {
   font-size:0.8em;
 }
+
+.post li.invalid {
+  font-style: italic;
+}
+
+.post img.warning-invalid {
+  display: inline;
+  height: 1em;
+  margin: 0;
+  padding: 0;
+}
+
+.post a.archive-link {
+  color: darkred;
+}
\ No newline at end of file
diff --git a/public/warning-64.png b/public/warning-64.png
new file mode 100644
index 000000000..fedeacff7
Binary files /dev/null and b/public/warning-64.png differ