diff --git a/_includes/badge.html b/_includes/badge.html
index f069d819..a2825f5f 100644
--- a/_includes/badge.html
+++ b/_includes/badge.html
@@ -1,20 +1,25 @@
{% if include.link %}
- {{ include.text }}
-{% else %}> {{ include.text }}{% endif %}
+ {{ include.text }}
+ {% else %}
+ {% if include.text == null or include.text == "" %}
+ aria-label="{{include.link}}"
+ {% endif %}
+ > {{ include.text }}{%
+ endif %}
{% else %}
- {{include.text}}
+ {{include.text}}
{% else %}
- > {% if include.icon %}{% endif %} {{include.text}}
+ {% if include.text == null or include.text == "" %}
+ aria-label="{{include.link}}"
+ {% endif %}
+ > {% if include.icon %}{% endif %} {{include.text}}
{% endif %}
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index 8982b84b..8dab2234 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -102,6 +102,7 @@
{% if include.tor %}
{% if include.windows %}
{% if include.windows != "" %}
-
-
+
+
{% else %}
@@ -136,8 +138,8 @@
{% if include.mac %}
{% if include.mac != "" %}
-
-
+
+
{% else %}
@@ -146,8 +148,8 @@
{% if include.linux %}
{% if include.linux != "" %}
-
-
+
+
{% else %}
@@ -156,8 +158,8 @@
{% if include.freebsd %}
{% if include.freebsd != "" %}
-
-
+
+
{% else %}
@@ -166,8 +168,8 @@
{% if include.openbsd %}
{% if include.openbsd != "" %}
-
-
+
+
{% else %}
@@ -176,8 +178,8 @@
{% if include.netbsd %}
{% if include.netbsd != "" %}
-
-
+
+
{% else %}
@@ -186,108 +188,108 @@
{% if include.firefox %}
{% if include.firefox != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.chrome %}
{% if include.chrome != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.safari %}
{% if include.safari != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.opera %}
{% if include.opera != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.edge %}
{% if include.edge != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.fdroid %}
{% if include.fdroid != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.googleplay %}
{% if include.googleplay != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.android %}
{% if include.android != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.ios %}
{% if include.ios != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.sailfish %}
{% if include.sailfish != "" %}
-
-
+
+
{% else %}
-
+
{% endif %}
{% endif %}
{% if include.web %}
{% if include.web != "" %}
-
-
+
+
{% else %}
@@ -299,26 +301,26 @@
{{include.icon3}}
{% if include.github %}
-
-
+
+
{% endif %}
{% if include.gitlab %}
-
-
+
+
{% endif %}
{% if include.git %}
-
-
+
+
{% endif %}
{% if include.source %}
-
-
+
+
{% endif %}
diff --git a/_includes/footer.html b/_includes/footer.html
index 38ea9d03..1c298b40 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -41,10 +41,10 @@
- Copy URL and Description
+
-
+
For easy copy and paste. Share this text snippet.
diff --git a/_includes/nav.html b/_includes/nav.html
index 129f4fe4..9a121255 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,17 +1,19 @@