diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index fbf4d6346..17089dcd8 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #191919;
   color: #dedede;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #ffe8b3;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #191919;
   border-color: #191919;
   color: #FFB300;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #FFB300;
   border-color: #FFB300;
   color: #212121;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #FF8F00;
   background: #FF8F00;
   color: #212121;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #191919;
   border-width: 1px;
   background: #191919;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #ffe8b3;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #191919;
   border-color: #191919;
   color: #FFB300;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #FFB300;
   border-color: #FFB300;
   color: #212121;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index e0819289d..3393fbef5 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #191919;
   color: #dedede;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #88e9aa;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #191919;
   border-color: #191919;
   color: #1ea04c;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1ea04c;
   border-color: #1ea04c;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #18803c;
   background: #18803c;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #191919;
   border-width: 1px;
   background: #191919;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #88e9aa;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #191919;
   border-color: #191919;
   color: #1ea04c;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #1ea04c;
   border-color: #1ea04c;
   color: #ffffff;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index f817a80a7..8ff0fb744 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #191919;
   color: #dedede;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #f1b6c8;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #191919;
   border-color: #191919;
   color: #cc285c;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #cc285c;
   border-color: #cc285c;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #a32049;
   background: #a32049;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #191919;
   border-width: 1px;
   background: #191919;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #f1b6c8;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #191919;
   border-color: #191919;
   color: #cc285c;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #cc285c;
   border-color: #cc285c;
   color: #ffffff;
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index 6f959ca84..00c8721e6 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #007ad9;
   color: #ffffff;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #005b9f;
   background: #005b9f;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #007ad9;
   border-width: 1px;
   background: #007ad9;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index bbefaa658..cbcd9332d 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #333333;
   color: #ffffff;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #005b9f;
   background: #005b9f;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #333333;
   border-width: 1px;
   background: #333333;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 26cf2b401..4520430ca 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #c8c8c8;
   color: #333333;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #41b883;
   border-color: #41b883;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #246749;
   background: #246749;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #c8c8c8;
   border-width: 1px;
   background: #f4f4f4;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #41b883;
   border-color: #41b883;
   color: #ffffff;
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index 96a7504fb..8f7e64cf1 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #c8c8c8;
   color: #333333;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #005b9f;
   background: #005b9f;
   color: #ffffff;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #c8c8c8;
   border-width: 1px;
   background: #f4f4f4;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #dbdbdb;
   border-color: #dbdbdb;
   color: #333333;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #007ad9;
   border-color: #007ad9;
   color: #ffffff;
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index a43d2df97..e3f1c7f28 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 0.71375rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 0.857rem 1rem;
   border: 1px solid #7B95A3;
   color: #ffffff;
@@ -2066,27 +2065,27 @@
   border-radius: 2px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #617c8a;
   border-color: #617c8a;
   color: #ffffff;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #AFD3C8;
   border-color: #dadada;
   color: #385048;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #8DC8B5;
   background: #8DC8B5;
   color: #385048;
@@ -2226,7 +2225,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 2px;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: 1px solid #7B95A3;
   border-width: 1px;
   background: #7B95A3;
@@ -2238,18 +2237,18 @@
   transition: background-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -1px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #617c8a;
   border-color: #617c8a;
   color: #ffffff;
   border-width: 1px;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #AFD3C8;
   border-color: #dadada;
   color: #385048;
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index c643bd589..14feb4ca6 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #2196F3;
   color: #2196F3;
diff --git a/public/themes/saga-cyan/theme.css b/public/themes/saga-cyan/theme.css
index 9ea777c61..2f1229f25 100644
--- a/public/themes/saga-cyan/theme.css
+++ b/public/themes/saga-cyan/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2EBF2;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2EBF2;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #00ACC1;
   color: #00ACC1;
diff --git a/public/themes/saga-deeppurple/theme.css b/public/themes/saga-deeppurple/theme.css
index 288b2c626..0d86de84d 100644
--- a/public/themes/saga-deeppurple/theme.css
+++ b/public/themes/saga-deeppurple/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #D1C4E9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #D1C4E9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #673AB7;
   color: #673AB7;
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index 71126d618..d6cc686ed 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #4CAF50;
   color: #4CAF50;
diff --git a/public/themes/saga-indigo/theme.css b/public/themes/saga-indigo/theme.css
index 64b224f88..020b94d54 100644
--- a/public/themes/saga-indigo/theme.css
+++ b/public/themes/saga-indigo/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C5CAE9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C5CAE9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #3F51B5;
   color: #3F51B5;
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index 25433ab36..860f5e25c 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #FFECB3;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #FFECB3;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #FFC107;
   color: #FFC107;
diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css
index 4d52bcdef..3140ddb37 100644
--- a/public/themes/saga-purple/theme.css
+++ b/public/themes/saga-purple/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #E1BEE7;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #E1BEE7;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9C27B0;
   color: #9C27B0;
diff --git a/public/themes/saga-teal/theme.css b/public/themes/saga-teal/theme.css
index 817b094d6..b40d156b8 100644
--- a/public/themes/saga-teal/theme.css
+++ b/public/themes/saga-teal/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #dee2e6;
   color: #495057;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2DFDB;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
   border-color: #dee2e6;
   color: #495057;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #f8f9fa;
   border-color: #dee2e6;
   color: #495057;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: #dee2e6;
   background: #e9ecef;
   color: #495057;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #dee2e6;
   border-width: 0 0 2px 0;
   background: #ffffff;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2DFDB;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: #ffffff;
   border-color: #9ba2aa;
   color: #6c757d;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: #ffffff;
   border-color: #009688;
   color: #009688;
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index 8ee66af58..3eb9cd124 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #BBDEFB;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #BBDEFB;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #64B5F6;
   color: #64B5F6;
diff --git a/public/themes/vela-cyan/theme.css b/public/themes/vela-cyan/theme.css
index 5306067d0..78759291b 100644
--- a/public/themes/vela-cyan/theme.css
+++ b/public/themes/vela-cyan/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2EBF2;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2EBF2;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #4DD0E1;
   color: #4DD0E1;
diff --git a/public/themes/vela-deeppurple/theme.css b/public/themes/vela-deeppurple/theme.css
index a8e363133..4f2e23a8b 100644
--- a/public/themes/vela-deeppurple/theme.css
+++ b/public/themes/vela-deeppurple/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #D1C4E9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #D1C4E9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #9575CD;
   color: #9575CD;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index 2432c2d76..e7afe65b8 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C8E6C9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C8E6C9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #81C784;
   color: #81C784;
diff --git a/public/themes/vela-indigo/theme.css b/public/themes/vela-indigo/theme.css
index a07fd1f69..92ea87894 100644
--- a/public/themes/vela-indigo/theme.css
+++ b/public/themes/vela-indigo/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C5CAE9;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C5CAE9;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #7986CB;
   color: #7986CB;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 2f1d1afcc..ee8c2dc84 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #FFECB3;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #FFECB3;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #FFD54F;
   color: #FFD54F;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index 67c7849ef..b7a57672e 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #E1BEE7;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #E1BEE7;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #BA68C8;
   color: #BA68C8;
diff --git a/public/themes/vela-teal/theme.css b/public/themes/vela-teal/theme.css
index 568b9d1f1..3ef21cefe 100644
--- a/public/themes/vela-teal/theme.css
+++ b/public/themes/vela-teal/theme.css
@@ -17,7 +17,6 @@
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   font-size: 1rem;
   font-weight: normal;
-  text-decoration: none;
 }
 
 .p-component-overlay {
@@ -2057,7 +2056,7 @@
   padding: 1.25rem 1.25rem;
 }
 
-.p-accordion .p-accordion-header a {
+.p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem;
   border: 1px solid #2C3E50;
   color: #ebedef;
@@ -2066,27 +2065,27 @@
   border-radius: 3px;
   transition: background-color 0.2s, box-shadow 0.2s;
 }
-.p-accordion .p-accordion-header a .p-accordion-toggle-icon {
+.p-accordion .p-accordion-header .p-accordion-header-link .p-accordion-toggle-icon {
   margin-right: 0.5rem;
 }
-.p-accordion .p-accordion-header:not(.p-disabled) a:focus {
+.p-accordion .p-accordion-header:not(.p-disabled) .p-accordion-header-link:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2DFDB;
 }
-.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a {
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #212F3D;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: #1C2833;
   border-color: 1px solid #2C3E50;
   color: #ebedef;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-color: 1px solid #2C3E50;
   background: #212F3D;
   color: #ebedef;
@@ -2105,20 +2104,20 @@
 .p-accordion .p-accordion-tab {
   margin-bottom: 0;
 }
-.p-accordion .p-accordion-tab .p-accordion-header a {
+.p-accordion .p-accordion-tab .p-accordion-header .p-accordion-header-link {
   border-radius: 0;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover a, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover a {
+.p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link, .p-accordion .p-accordion-tab:not(:first-child) .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
   border-top: 0 none;
 }
-.p-accordion .p-accordion-tab:first-child .p-accordion-header a {
+.p-accordion .p-accordion-tab:first-child .p-accordion-header .p-accordion-header-link {
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) a {
+.p-accordion .p-accordion-tab:last-child .p-accordion-header:not(.p-highlight) .p-accordion-header-link {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
@@ -2243,7 +2242,7 @@
 .p-tabview .p-tabview-nav li {
   margin-right: 0;
 }
-.p-tabview .p-tabview-nav li a {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link {
   border: solid #2C3E50;
   border-width: 0 0 2px 0;
   background: transparent;
@@ -2255,18 +2254,18 @@
   transition: border-color 0.2s, box-shadow 0.2s;
   margin: 0 0 -2px 0;
 }
-.p-tabview .p-tabview-nav li a:not(.p-disabled):focus {
+.p-tabview .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2DFDB;
 }
-.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover a {
+.p-tabview .p-tabview-nav li:not(.p-highlight):not(.p-disabled):hover .p-tabview-nav-link {
   background: transparent;
   border-color: #34495E;
   color: #aeb6bf;
   border-width: 0 0 2px 0;
 }
-.p-tabview .p-tabview-nav li.p-highlight a {
+.p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
   background: transparent;
   border-color: #4DB6AC;
   color: #4DB6AC;
diff --git a/src/components/accordion/Accordion.vue b/src/components/accordion/Accordion.vue
index 37535303f..77d212708 100755
--- a/src/components/accordion/Accordion.vue
+++ b/src/components/accordion/Accordion.vue
@@ -3,7 +3,7 @@
         <slot></slot>
         <div v-for="(tab, i) of tabs" :key="tab.header || i" class="p-accordion-tab">
             <div :class="['p-accordion-header', {'p-highlight': tab.d_active, 'p-disabled': tab.disabled}]">
-                <a role="tab" @click="onTabClick($event, tab)" @keydown="onTabKeydown($event, tab)" :tabindex="tab.disabled ? null : '0'"
+                <a role="tab" class="p-accordion-header-link" @click="onTabClick($event, tab)" @keydown="onTabKeydown($event, tab)" :tabindex="tab.disabled ? null : '0'"
                     :aria-expanded="tab.d_active" :id="ariaId + i + '_header'" :aria-controls="ariaId + i + '_content'">
                     <span :class="['p-accordion-toggle-icon pi', {'pi-chevron-right': !tab.d_active, 'pi-chevron-down': tab.d_active}]"></span>
                     <span class="p-accordion-header-text" v-if="tab.header">{{tab.header}}</span>
@@ -95,15 +95,16 @@ export default {
 </script>
 
 <style>
-.p-accordion-header a {
+.p-accordion-header-link {
     cursor: pointer;
     display: flex;
     align-items: center;
     user-select: none;
     position: relative;
+    text-decoration: none;
 }
 
-.p-accordion-header a:focus {
+.p-accordion-header-link:focus {
     z-index: 1;
 }
 
diff --git a/src/components/breadcrumb/Breadcrumb.vue b/src/components/breadcrumb/Breadcrumb.vue
index bcf893420..8c4644958 100755
--- a/src/components/breadcrumb/Breadcrumb.vue
+++ b/src/components/breadcrumb/Breadcrumb.vue
@@ -42,4 +42,8 @@ export default {
 .p-breadcrumb .p-menuitem-text {
     line-height: 1;
 }
+
+.p-breadcrumb .p-menuitem-link {
+    text-decoration: none;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/contextmenu/ContextMenu.vue b/src/components/contextmenu/ContextMenu.vue
index acc27c95f..0569ff31c 100755
--- a/src/components/contextmenu/ContextMenu.vue
+++ b/src/components/contextmenu/ContextMenu.vue
@@ -230,6 +230,7 @@ export default {
     cursor: pointer;
     display: flex;
     align-items: center;
+    text-decoration: none;
 }
 
 .p-contextmenu .p-menuitem-text {
diff --git a/src/components/megamenu/MegaMenu.vue b/src/components/megamenu/MegaMenu.vue
index bc68dc6d6..1d2518c8c 100755
--- a/src/components/megamenu/MegaMenu.vue
+++ b/src/components/megamenu/MegaMenu.vue
@@ -317,6 +317,7 @@ export default {
     cursor: pointer;
     display: flex;
     align-items: center;
+    text-decoration: none;
 }
 
 .p-megamenu .p-menuitem-text {
diff --git a/src/components/menu/Menu.vue b/src/components/menu/Menu.vue
index 576d3ea25..0c05f4595 100755
--- a/src/components/menu/Menu.vue
+++ b/src/components/menu/Menu.vue
@@ -194,6 +194,7 @@ export default {
     cursor: pointer;
     display: flex;
     align-items: center;
+    text-decoration: none;
 }
 
 .p-menu .p-menuitem-text {
diff --git a/src/components/menubar/Menubar.vue b/src/components/menubar/Menubar.vue
index cb2631b9e..2b05fee82 100755
--- a/src/components/menubar/Menubar.vue
+++ b/src/components/menubar/Menubar.vue
@@ -89,6 +89,7 @@ export default {
     cursor: pointer;
     display: flex;
     align-items: center;
+    text-decoration: none;
 }
 
 .p-menubar .p-menuitem-text {
diff --git a/src/components/panel/Panel.vue b/src/components/panel/Panel.vue
index d28f82b33..706d1fd43 100755
--- a/src/components/panel/Panel.vue
+++ b/src/components/panel/Panel.vue
@@ -78,5 +78,6 @@ export default {
     justify-content: center;
     align-items: center;
     cursor: pointer;
+    text-decoration: none;
 }
 </style>
diff --git a/src/components/panelmenu/PanelMenu.vue b/src/components/panelmenu/PanelMenu.vue
index 4ecd915f1..ba5426177 100755
--- a/src/components/panelmenu/PanelMenu.vue
+++ b/src/components/panelmenu/PanelMenu.vue
@@ -100,6 +100,7 @@ export default {
     user-select: none;
     cursor: pointer;
     position: relative;
+    text-decoration: none;
 }
 
 .p-panelmenu .p-panelmenu-header-link:focus {
@@ -117,6 +118,7 @@ export default {
     align-items: center;
     user-select: none;
     cursor: pointer;
+    text-decoration: none;
 }
 
 .p-panelmenu .p-menuitem-text {
diff --git a/src/components/steps/Steps.vue b/src/components/steps/Steps.vue
index 6c5c6ebf4..1cae95147 100755
--- a/src/components/steps/Steps.vue
+++ b/src/components/steps/Steps.vue
@@ -100,6 +100,7 @@ export default {
     flex-direction: column;
     align-items: center;
     overflow: hidden;
+    text-decoration: none;
 }
 
 .p-steps.p-steps-readonly .p-steps-item {
diff --git a/src/components/tabmenu/TabMenu.vue b/src/components/tabmenu/TabMenu.vue
index 6aaf29ebe..a57bcad4d 100755
--- a/src/components/tabmenu/TabMenu.vue
+++ b/src/components/tabmenu/TabMenu.vue
@@ -77,6 +77,7 @@ export default {
     display: flex;
     align-items: center;
     position: relative;
+    text-decoration: none;
 }
 
 .p-tabmenu-nav a:focus {
diff --git a/src/components/tabview/TabView.vue b/src/components/tabview/TabView.vue
index 39f725f23..44cde8714 100755
--- a/src/components/tabview/TabView.vue
+++ b/src/components/tabview/TabView.vue
@@ -2,7 +2,7 @@
     <div class="p-tabview p-component">
         <ul class="p-tabview-nav" role="tablist">
             <li role="presentation" v-for="(tab, i) of tabs" :key="tab.header || i" :class="[{'p-highlight': (tab.d_active), 'p-disabled': tab.disabled}]">
-                <a role="tab" @click="onTabClick($event, tab)" @keydown="onTabKeydown($event, tab)" :tabindex="tab.disabled ? null : '0'" :aria-selected="tab.d_active">
+                <a role="tab" class="p-tabview-nav-link" @click="onTabClick($event, tab)" @keydown="onTabKeydown($event, tab)" :tabindex="tab.disabled ? null : '0'" :aria-selected="tab.d_active">
                     <span class="p-tabview-title" v-if="tab.header">{{tab.header}}</span>
                     <TabPanelHeaderSlot :tab="tab" v-if="tab.$scopedSlots.header" />
                 </a>
@@ -98,15 +98,16 @@ export default {
     list-style-type: none;
 }
 
-.p-tabview-nav a {
+.p-tabview-nav-link {
     cursor: pointer;
     user-select: none;
     display: flex;
     align-items: center;
     position: relative;
+    text-decoration: none;
 }
 
-.p-tabview-nav a:focus {
+.p-tabview-nav-link:focus {
     z-index: 1;
 }
 
diff --git a/src/components/tieredmenu/TieredMenu.vue b/src/components/tieredmenu/TieredMenu.vue
index e4372c4c9..ad4407a92 100755
--- a/src/components/tieredmenu/TieredMenu.vue
+++ b/src/components/tieredmenu/TieredMenu.vue
@@ -178,6 +178,7 @@ export default {
     cursor: pointer;
     display: flex;
     align-items: center;
+    text-decoration: none;
 }
 
 .p-tieredmenu .p-menuitem-text {