diff --git a/talks/_templates/grid.html b/talks/_templates/grid.html
index 6bf1677..ae4b2c2 100644
--- a/talks/_templates/grid.html
+++ b/talks/_templates/grid.html
@@ -60,9 +60,12 @@ td.talk > a {
                 {% elif talk == None %}
                     <td></td>
                 {% elif not talk.skip %}
-                    <td class="talk {% if talk.room == '*' -%}allrooms{%-endif-%}" rowspan="{{talk.duration // timestep}}"
-                                                                                       {% if talk.room == '*'
-                                                                               %}colspan="{{rooms|length}}"{%endif%}>
+                    <td class="talk
+                    {% if talk.room == '*' -%}allrooms{%-endif-%}
+                    {% for t in talk.tags -%} tag-{{t|replace(' ', '_')}} {%endfor-%}
+                    "
+                        rowspan="{{talk.duration // timestep}}"
+                        {% if talk.room == '*' %}colspan="{{rooms|length}}"{%endif%}>
                         <a href="#talk-{{talk.id}}"
                            title="{{talk.tags|join(",")}}"
                            >{{talk.title}}</a>
diff --git a/talks/_templates/talk.html b/talks/_templates/talk.html
index f47da39..1da48af 100644
--- a/talks/_templates/talk.html
+++ b/talks/_templates/talk.html
@@ -1,4 +1,5 @@
-<div id="talk-{{id}}">
+<div id="talk-{{id}}"
+     class="{% for t in tags -%} tag-{{t|replace(' ', '_')}} {% endfor -%}">
     <h3 class="talk-title">{{title}}</h3>
     <div class="talk-info">
         <p>