diff --git a/_includes/resource-table-communities.html b/_includes/resource-table-category.html
similarity index 98%
rename from _includes/resource-table-communities.html
rename to _includes/resource-table-category.html
index ed606bd..4baab5a 100644
--- a/_includes/resource-table-communities.html
+++ b/_includes/resource-table-category.html
@@ -22,7 +22,7 @@
             {%- for tool in tools %}
             {% assign found = false %}
             {% for desc in tool.Type %}
-                {% if desc == "Online communities" %}
+                {% if desc == include.category %}
                 {% assign found = true %}
                 {% endif %}
             {% endfor %}
diff --git a/_includes/resource-table-dbs.html b/_includes/resource-table-dbs.html
deleted file mode 100644
index 9a2b7f8..0000000
--- a/_includes/resource-table-dbs.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- if include.tag %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag  | sort_natural: "name" %}
-{%- else %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages  | sort_natural: "name" %}
-{%- endif %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
-{%- unless tools.size == 0 or tools == nil %}
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
-<div class="table-responsive mt-4 mb-5">
-    <table class="tooltable table display">
-        <thead>
-            <tr class="text-nowrap">
-                <th>How-to Guide or resource {%- if include.tag -%}
-                    <a data-bs-toggle="tooltip" data-bs-original-title="This is a curated list which means that not all tools or resources that exist for this topic are listed here. This is mainly because we do not intend to be a registry.">
-                        <i class="fa-solid fa-info-circle"></i>
-                    </a>{%- endif %}
-                </th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            {%- for tool in tools %}
-            {% assign found = false %}
-            {% for desc in tool.Type %}
-                {% if desc == "Reference databases" %}
-                {% assign found = true %}
-                {% endif %}
-            {% endfor %}
-            {% if found %}
-            <tr>
-                {% if tool.URL %}
-                <td><a href="{{tool.URL}}">{{tool.Title}}</a></td>
-                {%- else %}
-                <td>{{tool.Title}}</td>
-                {%- endif %}
-                <td>{{tool.Description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
-                    {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
-                    <div class="d-block mt-1">
-                        {%- if linked_tool %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
-                        {%- endif %}
-                        {%- if tool.how_to_access %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
-                        {%- endif %}
-                    </div>
-                    {%- endif %}
-                </td>
-            </tr>
-            {%- endif %}
-            {%- endfor %}
-        </tbody>
-    </table>
-</div>
-{%- endunless %}
-<div id="skip-tool-table"></div>
\ No newline at end of file
diff --git a/_includes/resource-table-guides.html b/_includes/resource-table-guides.html
deleted file mode 100644
index 0a5ded8..0000000
--- a/_includes/resource-table-guides.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- if include.tag %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag  | sort_natural: "name" %}
-{%- else %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages  | sort_natural: "name" %}
-{%- endif %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
-{%- unless tools.size == 0 or tools == nil %}
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
-<div class="table-responsive mt-4 mb-5">
-    <table class="tooltable table display">
-        <thead>
-            <tr class="text-nowrap">
-                <th>How-to Guide or resource {%- if include.tag -%}
-                    <a data-bs-toggle="tooltip" data-bs-original-title="This is a curated list which means that not all tools or resources that exist for this topic are listed here. This is mainly because we do not intend to be a registry.">
-                        <i class="fa-solid fa-info-circle"></i>
-                    </a>{%- endif %}
-                </th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            {%- for tool in tools %}
-            {% assign found = false %}
-            {% for desc in tool.Type %}
-                {% if desc == "Computational structural bio guides and tutorials" %}
-                {% assign found = true %}
-                {% endif %}
-            {% endfor %}
-            {% if found %}
-            <tr>
-                {% if tool.URL %}
-                <td><a href="{{tool.URL}}">{{tool.Title}}</a></td>
-                {%- else %}
-                <td>{{tool.Title}}</td>
-                {%- endif %}
-                <td>{{tool.Description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
-                    {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
-                    <div class="d-block mt-1">
-                        {%- if linked_tool %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
-                        {%- endif %}
-                        {%- if tool.how_to_access %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
-                        {%- endif %}
-                    </div>
-                    {%- endif %}
-                </td>
-            </tr>
-            {%- endif %}
-            {%- endfor %}
-        </tbody>
-    </table>
-</div>
-{%- endunless %}
-<div id="skip-tool-table"></div>
\ No newline at end of file
diff --git a/_includes/resource-table-servers.html b/_includes/resource-table-servers.html
deleted file mode 100644
index 762ee2a..0000000
--- a/_includes/resource-table-servers.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- if include.tag %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag  | sort_natural: "name" %}
-{%- else %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages  | sort_natural: "name" %}
-{%- endif %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
-{%- unless tools.size == 0 or tools == nil %}
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
-<div class="table-responsive mt-4 mb-5">
-    <table class="tooltable table display">
-        <thead>
-            <tr class="text-nowrap">
-                <th>How-to Guide or resource {%- if include.tag -%}
-                    <a data-bs-toggle="tooltip" data-bs-original-title="This is a curated list which means that not all tools or resources that exist for this topic are listed here. This is mainly because we do not intend to be a registry.">
-                        <i class="fa-solid fa-info-circle"></i>
-                    </a>{%- endif %}
-                </th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            {%- for tool in tools %}
-            {% assign found = false %}
-            {% for desc in tool.Type %}
-                {% if desc == "Webservers and computing resources" %}
-                {% assign found = true %}
-                {% endif %}
-            {% endfor %}
-            {% if found %}
-            <tr>
-                {% if tool.URL %}
-                <td><a href="{{tool.URL}}">{{tool.Title}}</a></td>
-                {%- else %}
-                <td>{{tool.Title}}</td>
-                {%- endif %}
-                <td>{{tool.Description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
-                    {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
-                    <div class="d-block mt-1">
-                        {%- if linked_tool %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
-                        {%- endif %}
-                        {%- if tool.how_to_access %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
-                        {%- endif %}
-                    </div>
-                    {%- endif %}
-                </td>
-            </tr>
-            {%- endif %}
-            {%- endfor %}
-        </tbody>
-    </table>
-</div>
-{%- endunless %}
-<div id="skip-tool-table"></div>
\ No newline at end of file
diff --git a/_includes/resource-table-videos.html b/_includes/resource-table-videos.html
deleted file mode 100644
index 6bbee88..0000000
--- a/_includes/resource-table-videos.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- if include.tag %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag  | sort_natural: "name" %}
-{%- else %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages  | sort_natural: "name" %}
-{%- endif %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
-{%- unless tools.size == 0 or tools == nil %}
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
-<div class="table-responsive mt-4 mb-5">
-    <table class="tooltable table display">
-        <thead>
-            <tr class="text-nowrap">
-                <th>How-to Guide or resource {%- if include.tag -%}
-                    <a data-bs-toggle="tooltip" data-bs-original-title="This is a curated list which means that not all tools or resources that exist for this topic are listed here. This is mainly because we do not intend to be a registry.">
-                        <i class="fa-solid fa-info-circle"></i>
-                    </a>{%- endif %}
-                </th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            {%- for tool in tools %}
-            {% assign found = false %}
-            {% for desc in tool.Type %}
-                {% if desc == "YouTube talks and tutorials" %}
-                {% assign found = true %}
-                {% endif %}
-            {% endfor %}
-            {% if found %}
-            <tr>
-                {% if tool.URL %}
-                <td><a href="{{tool.URL}}">{{tool.Title}}</a></td>
-                {%- else %}
-                <td>{{tool.Title}}</td>
-                {%- endif %}
-                <td>{{tool.Description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
-                    {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
-                    <div class="d-block mt-1">
-                        {%- if linked_tool %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
-                        {%- endif %}
-                        {%- if tool.how_to_access %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
-                        {%- endif %}
-                    </div>
-                    {%- endif %}
-                </td>
-            </tr>
-            {%- endif %}
-            {%- endfor %}
-        </tbody>
-    </table>
-</div>
-{%- endunless %}
-<div id="skip-tool-table"></div>
\ No newline at end of file
diff --git a/_includes/resource-table-viz.html b/_includes/resource-table-viz.html
deleted file mode 100644
index b4e7a78..0000000
--- a/_includes/resource-table-viz.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{%- if include.tag %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag  | sort_natural: "name" %}
-{%- else %}
-{%- assign tools = site.data.tool_and_resource_list | add_related_pages  | sort_natural: "name" %}
-{%- endif %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
-{%- unless tools.size == 0 or tools == nil %}
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
-<div class="table-responsive mt-4 mb-5">
-    <table class="tooltable table display">
-        <thead>
-            <tr class="text-nowrap">
-                <th>How-to Guide or resource {%- if include.tag -%}
-                    <a data-bs-toggle="tooltip" data-bs-original-title="This is a curated list which means that not all tools or resources that exist for this topic are listed here. This is mainly because we do not intend to be a registry.">
-                        <i class="fa-solid fa-info-circle"></i>
-                    </a>{%- endif %}
-                </th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            {%- for tool in tools %}
-            {% assign found = false %}
-            {% for desc in tool.Type %}
-                {% if desc == "Protein viz guides and tutorials" %}
-                {% assign found = true %}
-                {% endif %}
-            {% endfor %}
-            {% if found %}
-            <tr>
-                {% if tool.URL %}
-                <td><a href="{{tool.URL}}">{{tool.Title}}</a></td>
-                {%- else %}
-                <td>{{tool.Title}}</td>
-                {%- endif %}
-                <td>{{tool.Description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
-                    {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
-                    <div class="d-block mt-1">
-                        {%- if linked_tool %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
-                        {%- endif %}
-                        {%- if tool.how_to_access %}
-                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
-                        {%- endif %}
-                    </div>
-                    {%- endif %}
-                </td>
-            </tr>
-            {%- endif %}
-            {%- endfor %}
-        </tbody>
-    </table>
-</div>
-{%- endunless %}
-<div id="skip-tool-table"></div>
\ No newline at end of file
diff --git a/pages/resources/external_communities.md b/pages/resources/external_communities.md
index f4275a4..0cd2004 100644
--- a/pages/resources/external_communities.md
+++ b/pages/resources/external_communities.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-communities.html %}
+{% include resource-table-category.html category="Online communities" %}
diff --git a/pages/resources/external_databases.md b/pages/resources/external_databases.md
index c5a377a..eba65f1 100644
--- a/pages/resources/external_databases.md
+++ b/pages/resources/external_databases.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-dbs.html %}
+{% include resource-table-category.html category="Reference databases" %}
diff --git a/pages/resources/external_guides.md b/pages/resources/external_guides.md
index 2512656..ef8ea00 100644
--- a/pages/resources/external_guides.md
+++ b/pages/resources/external_guides.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-guides.html %}
+{% include resource-table-category.html category="Computational structural bio guides and tutorials" %}
diff --git a/pages/resources/external_servers.md b/pages/resources/external_servers.md
index d236eff..52d54fe 100644
--- a/pages/resources/external_servers.md
+++ b/pages/resources/external_servers.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-servers.html %}
+{% include resource-table-category.html category="Webservers and computing resources" %}
diff --git a/pages/resources/external_videos.md b/pages/resources/external_videos.md
index 99c8a26..1a053a7 100644
--- a/pages/resources/external_videos.md
+++ b/pages/resources/external_videos.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-videos.html %}
+{% include resource-table-category.html category="YouTube talks and tutorials" %}
diff --git a/pages/resources/external_viz.md b/pages/resources/external_viz.md
index 0173a67..d563628 100644
--- a/pages/resources/external_viz.md
+++ b/pages/resources/external_viz.md
@@ -5,4 +5,4 @@ datatable: true
 #type: resources
 ---
 
-{% include resource-table-viz.html %}
+{% include resource-table-category.html category="Protein viz guides and tutorials" %}