diff --git a/pkg_ccpbiosim/constituents/com_ccpbiosim/media/css/site.css b/pkg_ccpbiosim/constituents/com_ccpbiosim/media/css/site.css
index c9749c7..ab67092 100644
--- a/pkg_ccpbiosim/constituents/com_ccpbiosim/media/css/site.css
+++ b/pkg_ccpbiosim/constituents/com_ccpbiosim/media/css/site.css
@@ -404,6 +404,29 @@
 }
 
 /* ---------------------------------------------- Software ---------------------------------------- */
+.software-btn-outline-primary {
+    --btn-color: var(--btncolor);
+    --btn-bg: var(--btnbg);
+    --btn-border-color: var(--btnbg);
+    --btn-hover-color: var(--btncolorh);
+    --btn-hover-bg: var(--btnbgh);
+    --btn-hover-border-color: var(--btnbgh);
+    --btn-active-color: var(--btncolorh);
+    --btn-active-bg: var(--btnbgh);
+    --btn-active-border-color: var(--btnbgh);
+    --btn-disabled-color: var(--btncolor);
+    --btn-disabled-bg: var(--btnbg);
+    --btn-disabled-border-color: var(--btnbg);
+    --btn-active-shadow: inset 0 3px 5px #00000020;
+    --btn-disabled-color: #010156;
+    --btn-disabled-bg: transparent;
+    --btn-disabled-border-color: #010156;
+    --gradient: none;
+    background-color: var(--btn-bg);
+    border-color: var(--btn-bg);
+}
+
+
 .software-category-bar{
   background:white;
   padding:15px;
diff --git a/pkg_ccpbiosim/constituents/com_ccpbiosim/site/tmpl/software/default.php b/pkg_ccpbiosim/constituents/com_ccpbiosim/site/tmpl/software/default.php
index 5cbe412..8114c9f 100644
--- a/pkg_ccpbiosim/constituents/com_ccpbiosim/site/tmpl/software/default.php
+++ b/pkg_ccpbiosim/constituents/com_ccpbiosim/site/tmpl/software/default.php
@@ -36,16 +36,16 @@
 <p>Our software packages that are actively maintained by our core CoSeC support team:</p>
 <div class="container mt-5">
   <div class="software-category-bar text-center">
-    <button class="btn btn-outline-primary software-category-btn active" data-category="all">All</button>
+    <button class="btn software-btn-outline-primary software-category-btn active" data-category="all">All</button>
     <?php foreach ($data_sorted as $category => $categorydata) : ?>
-      <button class="btn btn-outline-primary software-category-btn" data-category="<? echo $category; ?>"><?php echo $categorydata["catname"]; ?></button>
+      <button class="btn software-btn-outline-primary software-category-btn" data-category="<? echo $category; ?>"><?php echo $categorydata["catname"]; ?></button>
     <? endforeach ?>
   </div>
   <div class="row g-4">
     <?php foreach ($data_sorted as $category => $categorydata) : ?>
       <?php foreach ($categorydata["software"] as $app => $appdata) : ?>
         <div class="col-md-4 product"
-          data-authors="Authors: <?php echo $appdata["authors"]; ?>"
+          data-authors="<? echo htmlspecialchars(json_encode($appdata['authors'])) ?>"
           data-category="<?php echo $category; ?>"
           data-conda="conda install -c CCPBioSim <?php echo $app; ?>"
           data-condatoggle="<?php echo $appdata["conda"]; ?>"
@@ -86,7 +86,8 @@
             </div>
             <div class="col">
               <p id="modalSummary" class="fw-bold modalsoftware-summarytext"></p>
-              <p id="modalAuthors" class="fw-bold modalsoftware-authors"></p>
+              <p>Authors</p>
+              <div id="modalAuthors" style="margin-bottom: 10px;"></div>
             </div>
           </div>
         </div>
@@ -103,7 +104,7 @@
       <div class="modal-footer">
         <button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
         <a href="#" id="modalSource" target="_blank" class="btn btn-primary">Source Code</a>
-        <a href="#" id="modalDocs" target="_blank" class="btn btn-success">Documentation</a>
+        <a href="#" id="modalDocs" target="_blank" class="btn btn-primary">Documentation</a>
       </div>
     </div>
   </div>
@@ -133,11 +134,20 @@
     modalLogo.src = product.dataset.logo;
     modalPip.innerText = product.dataset.pip;
     modalConda.innerText = product.dataset.conda;
-    modalAuthors.innerText = product.dataset.authors;
     modalSource.href = product.dataset.source;
     modalDocs.href = product.dataset.docs;
     if(product.dataset.piptoggle) pipToggle.style.display = "block";
     if(product.dataset.condatoggle) condaToggle.style.display = "block";
+    modalAuthors.innerHTML = Object.entries(JSON.parse(product.dataset.authors))
+      .map(([name, url]) => `
+        <span class="author">
+          <span class="author-name">${name}</span>
+          ${url ? `
+            <a href="${url}" target="_blank" rel="noopener" title="View ${name} on ORCID"><img src="/images/logos/vendors/orcid.svg" alt="ORCID profile" width="16" height="16"></a>
+          ` : ''}
+        </span>
+      `)
+      .join(', ');
   });
 });