diff --git a/themes.md b/themes.md
index 8eda92d..afe2988 100644
--- a/themes.md
+++ b/themes.md
@@ -2,22 +2,12 @@
 
 The tables below are organised by theme. To see them organised by id, click [here](index.html)
 
-### Resource Management
+{% for theme in site.data.themes %}
 
-{% include specs_by_theme_table.html filter_theme="RESOURCE" show_releases=true %}
+### {{ theme.name }}
 
-### Connection Management
+{{ theme.description}}
 
-{% include specs_by_theme_table.html filter_theme="CONNECTION" show_releases=true %}
+{% include specs_by_theme_table.html filter_theme=theme.id show_releases=true %}
 
-### Device Configuration
-
-{% include specs_by_theme_table.html filter_theme="CONFIGURATION" show_releases=true %}
-
-### Device Control & Monitoring
-
-{% include specs_by_theme_table.html filter_theme="CONTROL" show_releases=true %}
-
-### Security
-
-{% include specs_by_theme_table.html filter_theme="SECURITY" show_releases=true %}
+{% endfor %}
diff --git a/themes.yml b/themes.yml
index 7c28751..9f76888 100644
--- a/themes.yml
+++ b/themes.yml
@@ -1,5 +1,6 @@
-- name: RESOURCE
-  description: Resource Management 
+- id: RESOURCE
+  name: Resource Management 
+  description: Specifications, recommendations and guidance concerning registration, discovery and labelling of NMOS resources
   members:
   - IS-04
   - IS-13
@@ -8,8 +9,9 @@
   - INFO-004
   - INFO-005
   
-- name: CONNECTION
-  description: Connection Management
+- id: CONNECTION
+  name: Connection Management
+  description: Specifications, recommendations and guidance concerning connection of devices, audio channel mapping and compressed streams
   members:
   - IS-05
   - IS-08
@@ -20,8 +22,9 @@
   - INFO-003
   - INFO-005
 
-- name: CONTROL
-  description: Device Control & Monitoring
+- id: CONTROL
+  name: Device Control & Monitoring
+  description: Specifications, recommendations and guidance concerning device control and status monitoring
   members:
   - IS-07
   - IS-12
@@ -29,15 +32,17 @@
   - MS-05-02
   - BCP-008-01
 
-- name: CONFIGURATION
-  description: Device Configuration
+- id: CONFIGURATION
+  name: Device Configuration
+  description: Specifications, recommendations and guidance concerning device and media parameter configuration
   members:
   - IS-11
   - IS-14
   - INFO-006
 
-- name: SECURITY
-  description: Security Recommendatations
+- id: SECURITY
+  name: Security Recommendatations
+  description: Specifications, recommendations and guidance concerning encryption, authorisation and certificate provisioning
   members:
   - IS-10
   - BCP-003-01