diff --git a/src/includes/table_assignments.html b/src/includes/table_assignments.html
index 80471f8..6b1b4ce 100644
--- a/src/includes/table_assignments.html
+++ b/src/includes/table_assignments.html
@@ -1,9 +1,9 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table pcp-table--middle pcp-table--fixed">
   <thead>
     <tr class="pcp-table__row">
-      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort pcp-table__sort--down" type="button">Program</button></th>
-      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Assignee</button></th>
-      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Status</button></th>
+      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort fsa-table__sort--ascending" type="button">Program</button></th>
+      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Assignee</button></th>
+      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Status</button></th>
     </tr>
   </thead>
   <tbody>
diff --git a/src/includes/table_assignments__complete.html b/src/includes/table_assignments__complete.html
index 3d9789d..462819c 100644
--- a/src/includes/table_assignments__complete.html
+++ b/src/includes/table_assignments__complete.html
@@ -1,9 +1,9 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table pcp-table--middle pcp-table--fixed">
   <thead>
     <tr class="pcp-table__row">
-      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort pcp-table__sort--down" type="button">Program</button></th>
-      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Assignee</button></th>
-      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Status</button></th>
+      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort fsa-table__sort--ascending" type="button">Program</button></th>
+      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Assignee</button></th>
+      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Status</button></th>
     </tr>
   </thead>
   <tbody>
diff --git a/src/includes/table_assignments__limited.html b/src/includes/table_assignments__limited.html
index 5001c5a..a29dc52 100644
--- a/src/includes/table_assignments__limited.html
+++ b/src/includes/table_assignments__limited.html
@@ -1,9 +1,9 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table pcp-table--middle pcp-table--fixed">
   <thead>
     <tr class="pcp-table__row">
-      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort pcp-table__sort--down" type="button">Program</button></th>
-      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Assignee</button></th>
-      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="pcp-table__sort" type="button">Status</button></th>
+      <th colspan="2" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort fsa-table__sort--ascending" type="button">Program</button></th>
+      <th colspan="4" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Assignee</button></th>
+      <th colspan="6" class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"><button class="fsa-table__sort" type="button">Status</button></th>
     </tr>
   </thead>
   <tbody>
diff --git a/src/includes/table_classes.html b/src/includes/table_classes.html
index 5c6f240..79c5cc3 100644
--- a/src/includes/table_classes.html
+++ b/src/includes/table_classes.html
@@ -2,40 +2,40 @@
   <thead>
     <tr class="pcp-table__row">
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--down" type="button">Name</button>
+        <button class="fsa-table__sort fsa-table__sort--ascending" type="button">Name</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button" title="Abbreviation">Abbr</button>
+        <button class="fsa-table__sort" type="button" title="Abbreviation">Abbr</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Commodity</button>
+        <button class="fsa-table__sort" type="button">Commodity</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Order</button>
+        <button class="fsa-table__sort" type="button">Order</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button"><abbr title="Rift Minimum">Min</abbr></button>
+        <button class="fsa-table__sort" type="button"><abbr title="Rift Minimum">Min</abbr></button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button"><abbr title="RiftMaximum">Max</abbr></button>
+        <button class="fsa-table__sort" type="button"><abbr title="RiftMaximum">Max</abbr></button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Type</button>
+        <button class="fsa-table__sort" type="button">Type</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Season</button>
+        <button class="fsa-table__sort" type="button">Season</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Sub-class</button>
+        <button class="fsa-table__sort" type="button">Sub-class</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Market</button>
+        <button class="fsa-table__sort" type="button">Market</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Adjust</button>
+        <button class="fsa-table__sort" type="button">Adjust</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Active</button>
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_commodities.html b/src/includes/table_commodities.html
index e54a2ea..c2c7775 100644
--- a/src/includes/table_commodities.html
+++ b/src/includes/table_commodities.html
@@ -1,17 +1,17 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table">
   <thead>
     <tr class="pcp-table__row">
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--up" type="button">Name</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" aria-sort="descending">
+        <button class="fsa-table__sort fsa-table__sort--descending" type="button">Name</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Abbreviation</button>
+        <button class="fsa-table__sort" type="button">Abbreviation</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Class</button>
+        <button class="fsa-table__sort" type="button">Class</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Active</button>
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_edit-state-adjustments.html b/src/includes/table_edit-state-adjustments.html
index 0550ee1..f7697bc 100644
--- a/src/includes/table_edit-state-adjustments.html
+++ b/src/includes/table_edit-state-adjustments.html
@@ -2,13 +2,13 @@
   <thead>
     <tr class="pcp-table__row">
       <th colspan="8" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--down" type="button">State</button>
+        <button class="fsa-table__sort fsa-table__sort--ascending" type="button">State</button>
       </th>
       <th colspan="8" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort" type="button">Market</button>
+        <button class="fsa-table__sort" type="button">Market</button>
       </th>
       <th colspan="5" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort" type="button">Name</button>
+        <button class="fsa-table__sort" type="button">Name</button>
       </th>
       <th colspan="3" class="pcp-table__cell fsa-text-align--right" scope="col"></th>
     </tr>
diff --git a/src/includes/table_edit-state-adjustments__empty.html b/src/includes/table_edit-state-adjustments__empty.html
index b6fcbae..4af57bc 100644
--- a/src/includes/table_edit-state-adjustments__empty.html
+++ b/src/includes/table_edit-state-adjustments__empty.html
@@ -2,13 +2,13 @@
   <thead>
     <tr class="pcp-table__row">
       <th colspan="8" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--down" type="button">State</button>
+        <button class="fsa-table__sort fsa-table__sort--ascending" type="button">State</button>
       </th>
       <th colspan="8" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort" type="button">Market</button>
+        <button class="fsa-table__sort" type="button">Market</button>
       </th>
       <th colspan="5" class="pcp-table__cell" scope="col">
-        <button class="pcp-table__sort" type="button">Name</button>
+        <button class="fsa-table__sort" type="button">Name</button>
       </th>
       <th colspan="3" class="pcp-table__cell fsa-text-align--right" scope="col"></th>
     </tr>
diff --git a/src/includes/table_markets.html b/src/includes/table_markets.html
index 6eec9d4..58d4f33 100644
--- a/src/includes/table_markets.html
+++ b/src/includes/table_markets.html
@@ -1,14 +1,14 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table">
   <thead>
     <tr class="pcp-table__row">
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort pcp-table__sort--up" type="button">Name</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" aria-sort="descending">
+        <button class="fsa-table__sort fsa-table__sort--descending" type="button">Name</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Abbreviation</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Abbreviation</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Active</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_permissions.html b/src/includes/table_permissions.html
index 686015b..4fa8787 100644
--- a/src/includes/table_permissions.html
+++ b/src/includes/table_permissions.html
@@ -1,18 +1,18 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table">
   <thead>
     <tr class="pcp-table__row">
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--up" type="button">Name</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" aria-sort="descending">
+        <button class="fsa-table__sort fsa-table__sort--descending" type="button">Name</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button"> Description </button>
+        <button class="fsa-table__sort" type="button"> Description </button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button"> Category </button>
+        <button class="fsa-table__sort" type="button"> Category </button>
       </th>
       <!-- <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col"> Roles </th> -->
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button" >Active</button>
+        <button class="fsa-table__sort" type="button" >Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_programs.html b/src/includes/table_programs.html
index c59e154..407ed07 100644
--- a/src/includes/table_programs.html
+++ b/src/includes/table_programs.html
@@ -1,20 +1,20 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table">
   <thead>
     <tr class="pcp-table__row">
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort pcp-table__sort--up" type="button">Name</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" aria-sort="descending">
+        <button class="fsa-table__sort fsa-table__sort--descending" type="button">Name</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Abbreviation</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Abbreviation</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Type</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Type</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Markets</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Markets</button>
       </th>
-      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col" role="button">
-        <button class="pcp-table__sort" type="button">Active</button>
+      <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_roles.html b/src/includes/table_roles.html
index c74df5d..0ce1845 100644
--- a/src/includes/table_roles.html
+++ b/src/includes/table_roles.html
@@ -1,20 +1,20 @@
 <table class="fsa-table fsa-table--borderless fsa-table--responsive fsa-table--responsive-horizontal pcp-table">
   <thead>
     <tr class="pcp-table__row">
-      <th class="pcp-table__cell pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--up" type="button">Name</button>
+      <th class="pcp-table__cell pcp-table__th--sticky" scope="col" aria-sort="descending">
+        <button class="fsa-table__sort fsa-table__sort--descending" type="button">Name</button>
       </th>
       <th class="pcp-table__cell pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">FSA-13 Value</button>
+        <button class="fsa-table__sort" type="button">FSA-13 Value</button>
       </th>
       <th class="pcp-table__cell pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Description</button>
+        <button class="fsa-table__sort" type="button">Description</button>
       </th>
       <th class="pcp-table__cell pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Permissions</button>
+        <button class="fsa-table__sort" type="button">Permissions</button>
       </th>
       <th class="pcp-table__cell pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Active</button>
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>
diff --git a/src/includes/table_subclasses.html b/src/includes/table_subclasses.html
index ed1a4d1..5aff140 100644
--- a/src/includes/table_subclasses.html
+++ b/src/includes/table_subclasses.html
@@ -2,16 +2,16 @@
   <thead>
     <tr class="pcp-table__row">
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--down" type="button">Name</button>
+        <button class="fsa-table__sort fsa-table__sort--ascending" type="button">Name</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort pcp-table__sort--down" type="button">Abbreviation</button>
+        <button class="fsa-table__sort fsa-table__sort--ascending" type="button">Abbreviation</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Class</button>
+        <button class="fsa-table__sort" type="button">Class</button>
       </th>
       <th class="pcp-table__cell pcp-table__th pcp-table__th--sticky" scope="col">
-        <button class="pcp-table__sort" type="button">Active</button>
+        <button class="fsa-table__sort" type="button">Active</button>
       </th>
     </tr>
   </thead>