diff --git a/anki/cards.py b/anki/cards.py
index 7741f3f3c..5159911fb 100644
--- a/anki/cards.py
+++ b/anki/cards.py
@@ -100,10 +100,10 @@ streak=?, lapses=?, grade=?, cycles=?, edue=? where id = ?""",
             self.grade, self.cycles, self.edue, self.id)
 
     def q(self):
-        return self._getQA()['q']
+        return self._withClass(self._getQA()['q'])
 
     def a(self):
-        return self._getQA()['a']
+        return self._withClass(self._getQA()['a'])
 
     def _getQA(self, reload=False):
         if not self._qa or reload:
@@ -115,6 +115,9 @@ streak=?, lapses=?, grade=?, cycles=?, edue=? where id = ?""",
             self._qa = self.deck._renderQA(self.model(), gname, data)
         return self._qa
 
+    def _withClass(self, txt):
+        return '<div class="%s">%s</div>' % (self.cssClass(), txt)
+
     def _reviewData(self, reload=False):
         "Fetch the model and fact."
         if not self._rd or reload:
@@ -132,7 +135,7 @@ streak=?, lapses=?, grade=?, cycles=?, edue=? where id = ?""",
     def template(self):
         return self._reviewData()[1].templates[self.ord]
 
-    def bgClass(self):
+    def cssClass(self):
         return "cm%s-%s" % (hexifyID(self.model().id),
                             hexifyID(self.template()['ord']))
 
diff --git a/anki/models.py b/anki/models.py
index c9ecc7f9b..03c1a89c8 100644
--- a/anki/models.py
+++ b/anki/models.py
@@ -112,7 +112,7 @@ insert or replace into models values (?, ?, ?, ?, ?, ?, ?)""",
             (f['font'], f['qsize'], f['qcol'], f['rtl'], f['pre']))
             for f in self.fields])
         # templates
-        css += "".join(["#cm%s-%s {text-align:%s;background:%s}\n" % (
+        css += "".join([".cm%s-%s {text-align:%s;background:%s}\n" % (
             hexifyID(self.id), hexifyID(t['ord']),
             ("center", "left", "right")[t['align']], t['bg'])
                 for t in self.templates])
diff --git a/tests/test_cards.py b/tests/test_cards.py
index 5034d875a..730473353 100644
--- a/tests/test_cards.py
+++ b/tests/test_cards.py
@@ -93,7 +93,7 @@ def test_misc():
     f['Back'] = u'2'
     d.addFact(f)
     c = f.cards()[0]
-    assert c.bgClass() == "cm1-0"
+    assert c.cssClass() == "cm1-0"
     assert c.fact().id == 1
     assert c.model().id == 1
     assert c.template()['ord'] == 0
diff --git a/tests/test_models.py b/tests/test_models.py
index c4cf7a0f4..5ee4bf616 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -97,7 +97,7 @@ def test_text():
     f = d.newFact()
     f['Front'] = u'hello<b>world'
     d.addFact(f)
-    assert f.cards()[0].q() == "helloworld"
+    assert "helloworld" in f.cards()[0].q()
 
 def test_cloze():
     d = getEmptyDeck()