diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 904c1e3..193ec92 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -13,12 +13,12 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run Tox tests
       id: test
-      uses: fedora-python/tox-github-action@master
+      uses: fedora-python/tox-github-action@main
       with:
         tox_env: ${{ matrix.tox_env }}
     strategy:
       matrix:
-        tox_env: [py37, py38, py39, py310, py311]
+        tox_env: [py38, py39, py310, py311, py312]
 
     # Use GitHub's Linux Docker host
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 5590e73..e4ac771 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,14 @@ licensed under the same license.
 
 ## Changelog
 
+### naucse_render 2.0
+
+* Update to mistune 3.x & nbconvert 7.x. This changes parsing & formatting
+  for Markdown, syntax highlighting, and Notebooks. In most cases the
+  differences should be superficial.
+
+* Tested with Python 3.8-3.12
+
 ### naucse_render 1.10
 
 * `naucse_render compile` now checks for links to missing lessons and
diff --git a/naucse_render/markdown.py b/naucse_render/markdown.py
index 3cb9bfa..0abb534 100644
--- a/naucse_render/markdown.py
+++ b/naucse_render/markdown.py
@@ -12,57 +12,62 @@
 import pygments.formatters.html
 
 
-ansi_convertor = Ansi2HTMLConverter(inline=True)
-
-pygments_formatter = pygments.formatters.html.HtmlFormatter(
-    cssclass='highlight'
-)
-
-_admonition_leading_pattern = re.compile(r'^ *> ?', flags=re.M)
-
-
-class BlockGrammar(mistune.BlockGrammar):
-    admonition = re.compile(r'^> *\[(\S+)\]([^\n]*)\n((>[^\n]*[\n]{0,1})*)')
-    deflist = re.compile(r'^(([^\n: ][^\n]*\n)+)((:( {0,3})[^\n]*\n)( \5[^\n]*\n|\n)+)')
-
-
-class BlockLexer(mistune.BlockLexer):
-    grammar_class = BlockGrammar
+def naucse_admonition_plugin(md):
+    """Parse blockquote-based admonitions
 
-    default_rules = [
-        'admonition',
-        'deflist',
-    ] + mistune.BlockLexer.default_rules
+    Like this:
 
-    def parse_admonition(self, m):
-        self.tokens.append({
-            'type': 'admonition_start',
-            'name': m.group(1),
-            'title': m.group(2).strip(),
-        })
+    > [note] Note Title
+    > rest of note goes here
+    """
+    # Based on Mistune's "spoiler" plugin (the documentation says:
+    # "take a look at the source code in mistune/plugins to find
+    # out how to write a plugin")
+
+    ADMONITION_NAME_PATTERN = re.compile(r' *\[(\S+)\]([^\n]*)\n')
+
+    def parse_naucse_admonition(block, m, state):
+
+        text, end_pos = block.extract_block_quote(m, state)
+        name_match = ADMONITION_NAME_PATTERN.match(text)
+        if name_match:
+            # It's an admonition
+            token = {
+                'type': 'naucse_admonition',
+                'attrs': {
+                    'name': name_match[1].strip(),
+                    'title': name_match[2].strip(),
+                },
+            }
+            text = text[name_match.end():]
+        else:
+            token = {
+                'type': 'block_quote',
+            }
+
+        child = state.child_state(text)
+        rules = block.block_quote_rules
+        block.parse(child, rules)
+        token['children'] = child.tokens
+        if end_pos:
+            state.prepend_token(token)
+            return end_pos
+        state.append_token(token)
+        return state.cursor
+
+    md.block.register(
+        'block_quote',
+        None,
+        parse_naucse_admonition,
+        before='block_quote',
+    )
 
-        text = _admonition_leading_pattern.sub('', m.group(3))
 
-        self.parse(dedent(text))
-        self.tokens.append({
-            'type': 'admonition_end',
-        })
+ansi_convertor = Ansi2HTMLConverter(inline=True)
 
-    def parse_deflist(self, m):
-        self.tokens.append({
-            'type': 'deflist_term_start',
-        })
-        self.parse(dedent(m.group(1)))
-        self.tokens.append({
-            'type': 'deflist_term_end',
-        })
-        self.tokens.append({
-            'type': 'deflist_def_start',
-        })
-        self.parse(dedent(' ' + m.group(3)[1:]))
-        self.tokens.append({
-            'type': 'deflist_def_end',
-        })
+pygments_formatter = pygments.formatters.html.HtmlFormatter(
+    cssclass='highlight'
+)
 
 
 def ansi_convert(code):
@@ -76,11 +81,6 @@ def style_space_after_prompt(html):
                   html)
 
 
-def matrix_multiplication_operator(html):
-    return html.replace('<span class="err">@</span>',
-                        '<span class="o">@</span>')
-
-
 class MSDOSSessionVenvLexer(RegexLexer):
     """Lexer for simplistic MSDOS sessions with optional venvs.
 
@@ -129,23 +129,26 @@ def text_to_id(text):
     return text
 
 
-class Renderer(mistune.Renderer):
+class NaucseRenderer(mistune.HTMLRenderer):
     code_tmpl = '<div class="highlight"><pre><code>{}</code></pre></div>'
 
-    def __init__(self, convert_url, *args, **kwargs):
+    def __init__(self, convert_url, *args, escape=False, **kwargs):
         self._convert_url = convert_url
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs, escape=False)
 
-    def admonition(self, name, content):
-        return '<div class="admonition {}">{}</div>'.format(name, content)
+    def naucse_admonition(self, text, title, name):
+        if title:
+            text = f'<p class="admonition-title">{title}</p>\n{text}'
+        return '<div class="admonition {}">{}</div>'.format(name, text)
 
-    def header(self, text, level, raw=None):
+    def heading(self, text, level, raw=None):
         header_id = text_to_id(text)
         return f'''<h{level:d} id="{header_id}">{text}
 <a href="#{header_id}" class="header-link">#</a>
 </h{level:d}>\n'''
 
-    def block_code(self, code, lang):
+    def block_code(self, code, info=None):
+        lang = info
         if lang is not None:
             lang = lang.strip()
         if not lang or lang == 'plain':
@@ -157,56 +160,13 @@ def block_code(self, code, lang):
         lexer = get_lexer_by_name(lang)
         html = pygments.highlight(code, lexer, pygments_formatter).strip()
         html = style_space_after_prompt(html)
-        if lang in ('python', 'pycon'):
-            html = matrix_multiplication_operator(html)
         return html
 
-    def deflist(self, items):
-        tags = {'term': 'dt', 'def': 'dd'}
-        return '<dl>\n{}</dl>'.format(''.join(
-            '<{tag}>{text}</{tag}>'.format(tag=tags[type], text=text)
-            for type, text in items
-        ))
-
-    def link(self, link, title, text):
-        return super().link(self._convert_url(link), title, text)
-
-    def image(self, src, title, text):
-        return super().image(self._convert_url(src), title, text)
-
-
-class Markdown(mistune.Markdown):
-    def output_admonition(self):
-        name = self.token['name']
-        body = self.renderer.placeholder()
-        if self.token['title']:
-            template = '<p class="admonition-title">{}</p>\n'
-            body += template.format(self.token['title'])
-        while self.pop()['type'] != 'admonition_end':
-            body += self.tok()
-        return self.renderer.admonition(name, body)
-
-    def output_deflist_term(self):
-        items = [['term', self.renderer.placeholder()]]
-        while True:
-            end_token = 'deflist_{}_end'.format(items[-1][0])
-            while self.pop()['type'] not in (end_token, 'paragraph'):
-                items[-1][1] += self.tok()
-            if self.token['type'] == 'paragraph':
-                if items[-1][0] == 'term':
-                    items.append(['term', self.renderer.placeholder()])
-                    items[-1][1] += self.token['text']
-                else:
-                    items[-1][1] += self.output_paragraph()
-            elif self.peek()['type'] == 'deflist_term_start':
-                self.pop()
-                items.append(['term', self.renderer.placeholder()])
-            elif self.peek()['type'] == 'deflist_def_start':
-                self.pop()
-                items.append(['def', self.renderer.placeholder()])
-            else:
-                break
-        return self.renderer.deflist(items)
+    def link(self, text, url, title=None):
+        return super().link(text, self._convert_url(url), title)
+
+    def image(self, alt, url, title=None):
+        return super().image(alt, self._convert_url(url), title)
 
 
 def convert_markdown(text, convert_url=None, *, inline=False):
@@ -214,10 +174,9 @@ def convert_markdown(text, convert_url=None, *, inline=False):
 
     text = dedent(text)
 
-    markdown = Markdown(
-        escape=False,
-        block=BlockLexer(),
-        renderer=Renderer(convert_url),
+    markdown = mistune.create_markdown(
+        plugins=['def_list', naucse_admonition_plugin],
+        renderer=NaucseRenderer(convert_url),
     )
     result = markdown(text).strip()
 
diff --git a/naucse_render/templates.py b/naucse_render/templates.py
index ecb03a7..7b57da9 100644
--- a/naucse_render/templates.py
+++ b/naucse_render/templates.py
@@ -67,6 +67,9 @@ def solution(ctx, text):
     solution = ctx['$markdown'](text)
     solutions.append(solution)
 
+    # make sure there are no empty lines, which exit Markdown's raw-HTML mode
+    solution = solution.replace('\n', Markup('\n<span></span>'))
+
     return Markup(textwrap.dedent("""
         <div class="solution" id="solution-{}">
             <h3>Řešení</h3>
diff --git a/pyproject.toml b/pyproject.toml
index deb30ea..53dfcca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,18 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "naucse_render"
-version = '1.10'
+version = '2.0'
 description = 'Converts course material to naucse.python.cz API'
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
     'ansi2html',
-    'mistune',
-    'nbconvert>=6.0.7,<7.0',
+    'mistune>=2.0.3,<4',
+    'nbconvert>=7.0,<8.0',
     'traitlets',
     'click',
     'PyYAML',
diff --git a/test_naucse_render/fixtures/expected-compiled/courses/extra-lessons/tasks/index.html b/test_naucse_render/fixtures/expected-compiled/courses/extra-lessons/tasks/index.html
index e447fc1..f8921ec 100644
--- a/test_naucse_render/fixtures/expected-compiled/courses/extra-lessons/tasks/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/courses/extra-lessons/tasks/index.html
@@ -1,9 +1,7 @@
 <ol>
-
     <li>
         <p>A task</p>
     </li>
-
     <li>
         <p>Task with list:</p>
 <ul>
@@ -11,9 +9,7 @@
 <li>b</li>
 </ul>
     </li>
-
     <li>
-        <p>Static files handled with a <img src="naucse:static?filename=smile.png" alt="smile">.</p>
+        <p>Static files handled with a <img src="naucse:static?filename=smile.png" alt="smile" />.</p>
     </li>
-
 </ol>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-compiled/default/course.json b/test_naucse_render/fixtures/expected-compiled/default/course.json
index 0c82844..eb6ca1d 100644
--- a/test_naucse_render/fixtures/expected-compiled/default/course.json
+++ b/test_naucse_render/fixtures/expected-compiled/default/course.json
@@ -69,6 +69,7 @@
                         },
                         "ids": [
                             "co_programatorsky_editor_umi",
+                            "solution-0",
                             "volba_a_nastaveni_editoru"
                         ],
                         "license": "cc-by-sa-40",
@@ -77,10 +78,15 @@
                             "#volba_a_nastaveni_editoru",
                             "naucse:page?lesson=beginners/install-editor&page=atom",
                             "naucse:page?lesson=beginners/install-editor&page=gedit",
-                            "naucse:page?lesson=beginners/install-editor&page=gedit#nacvik_odsazovani"
+                            "naucse:page?lesson=beginners/install-editor&page=gedit#nacvik_odsazovani",
+                            "naucse:solution?solution=0"
                         ],
                         "slug": "index",
-                        "solutions": [],
+                        "solutions": [
+                            {
+                                "content": "<div class=\"highlight\"><pre><span></span><span class=\"c1\"># Třikrát:</span>\n<span class=\"k\">for</span> <span class=\"n\">i</span> <span class=\"ow\">in</span> <span class=\"nb\">range</span><span class=\"p\">(</span><span class=\"mi\">3</span><span class=\"p\">):</span>\n\n    <span class=\"c1\"># Nakresli čtverec (kód zkopírovaný z předchozí úlohy a odsazený)</span>\n    <span class=\"k\">for</span> <span class=\"n\">j</span> <span class=\"ow\">in</span> <span class=\"nb\">range</span><span class=\"p\">(</span><span class=\"mi\">4</span><span class=\"p\">):</span>\n        <span class=\"n\">forward</span><span class=\"p\">(</span><span class=\"mi\">50</span><span class=\"p\">)</span>\n        <span class=\"n\">left</span><span class=\"p\">(</span><span class=\"mi\">90</span><span class=\"p\">)</span>\n\n    <span class=\"c1\"># Otoč se o 20°</span>\n    <span class=\"n\">left</span><span class=\"p\">(</span><span class=\"mi\">20</span><span class=\"p\">)</span>\n</pre></div>"
+                            }
+                        ],
                         "source_file": "lessons/beginners/install-editor/index.md",
                         "title": "Instalace editoru",
                         "vars": {}
diff --git a/test_naucse_render/fixtures/expected-compiled/default/install-editor/gedit.html b/test_naucse_render/fixtures/expected-compiled/default/install-editor/gedit.html
index 50617e2..af68a81 100644
--- a/test_naucse_render/fixtures/expected-compiled/default/install-editor/gedit.html
+++ b/test_naucse_render/fixtures/expected-compiled/default/install-editor/gedit.html
@@ -3,19 +3,27 @@ <h1 id="instalace_geditu">Instalace  Geditu
 </h1>
 <p>Na Linuxu se Gedit instaluje jako ostatní programy:</p>
 <dl>
-<dt></dt><dt>Fedora</dt><dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo dnf install gedit
-</pre></div></dd><dt></dt><dt>Ubuntu</dt><dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo apt-get install gedit
-</pre></div></dd></dl><p>Používáš-li jiný Linux, předpokládám že programy instalovat umíš. :)</p>
+<dt>Fedora</dt>
+<dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo<span class="w"> </span>dnf<span class="w"> </span>install<span class="w"> </span>gedit
+</pre></div></dd>
+<dt>Ubuntu</dt>
+<dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo<span class="w"> </span>apt-get<span class="w"> </span>install<span class="w"> </span>gedit
+</pre></div></dd>
+</dl>
+<p>Používáš-li jiný Linux, předpokládám že programy instalovat umíš. :)</p>
 <p>Pro Windows a macOS se Gedit dá stáhnout z <a href="https://wiki.gnome.org/Apps/Gedit">domovské stránky</a>.</p>
 <h2 id="nastaveni">Nastavení
 <a href="#nastaveni" class="header-link">#</a>
 </h2>
 <p>...</p>
 <dl>
-<dt></dt><dt>Číslování řádků</dt><dd><p>V sekci Zobrazit/<span class="en">View</span> vyber
+<dt>Číslování řádků</dt>
+<dd><p>V sekci Zobrazit/<span class="en">View</span> vyber
 Zobrazovat čísla řádků/<span class="en">Display Line Numbers</span>.</p>
 <p><span class="figure"><a href="naucse:static?filename=gedit_linenums.png"><img src="naucse:static?filename=gedit_linenums.png" alt=""></a></span></p>
-</dd></dl><p>...</p>
+</dd>
+</dl>
+<p>...</p>
 <h2 id="nacvik_odsazovani">Nácvik odsazování
 <a href="#nacvik_odsazovani" class="header-link">#</a>
 </h2>
diff --git a/test_naucse_render/fixtures/expected-compiled/default/install-editor/index.html b/test_naucse_render/fixtures/expected-compiled/default/install-editor/index.html
index c796b08..eb28f9a 100644
--- a/test_naucse_render/fixtures/expected-compiled/default/install-editor/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/default/install-editor/index.html
@@ -4,11 +4,14 @@ <h2 id="co_programatorsky_editor_umi">Co programátorský editor umí
 </h2>
 <p>...</p>
 <dl>
-<dt></dt><dt>Podpora více souborů</dt><dd><p>Větší projekty sestávají z více souborů, které můžeš mít v editoru
-otevřené všechny najednou.</p>
-</dd><dt></dt><dt>Číslování řádků</dt><dd><p>Před každým řádkem se ukazuje číslo.
-To se bude velice hodit, až Python bude nadávat, že chyba je na řádku 183.</p>
-</dd></dl><p>...</p>
+<dt>Podpora více souborů</dt>
+<dd>Větší projekty sestávají z více souborů, které můžeš mít v editoru
+otevřené všechny najednou.</dd>
+<dt>Číslování řádků</dt>
+<dd>Před každým řádkem se ukazuje číslo.
+To se bude velice hodit, až Python bude nadávat, že chyba je na řádku 183.</dd>
+</dl>
+<p>...</p>
 <div class="admonition note"><p>Pro ilustraci, takhle může v editoru vypadat kousek kódu:</p>
 <div class="highlight"><pre><span></span>    <span class="mi">1</span>  <span class="nd">@app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s1">&#39;/courses/&lt;course:course&gt;/&#39;</span><span class="p">)</span>
     <span class="mi">2</span>  <span class="k">def</span> <span class="nf">course_page</span><span class="p">(</span><span class="n">course</span><span class="p">):</span>
@@ -28,4 +31,23 @@ <h2 id="co_programatorsky_editor_umi">Co programátorský editor umí
 </ul>
 </li>
 </ul>
-<p>...</p>
\ No newline at end of file
+<p>...</p>
+<div class="solution" id="solution-0">
+    <h3>Řešení</h3>
+    <div class="solution-cover">
+        <a href="naucse:solution?solution=0"><span class="link-text">Ukázat řešení</span></a>
+    </div>
+    <div class="solution-body" aria-hidden="true">
+        <div class="highlight"><pre><span></span><span class="c1"># Třikrát:</span>
+<span></span><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">3</span><span class="p">):</span>
+<span></span>
+<span></span>    <span class="c1"># Nakresli čtverec (kód zkopírovaný z předchozí úlohy a odsazený)</span>
+<span></span>    <span class="k">for</span> <span class="n">j</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">4</span><span class="p">):</span>
+<span></span>        <span class="n">forward</span><span class="p">(</span><span class="mi">50</span><span class="p">)</span>
+<span></span>        <span class="n">left</span><span class="p">(</span><span class="mi">90</span><span class="p">)</span>
+<span></span>
+<span></span>    <span class="c1"># Otoč se o 20°</span>
+<span></span>    <span class="n">left</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span>
+<span></span></pre></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/course.json b/test_naucse_render/fixtures/expected-compiled/lessons/course.json
index 1c470a8..280e35c 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/course.json
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/course.json
@@ -70,6 +70,7 @@
                         },
                         "ids": [
                             "co_programatorsky_editor_umi",
+                            "solution-0",
                             "volba_a_nastaveni_editoru"
                         ],
                         "license": "cc-by-sa-40",
@@ -78,10 +79,15 @@
                             "#volba_a_nastaveni_editoru",
                             "naucse:page?lesson=beginners/install-editor&page=atom",
                             "naucse:page?lesson=beginners/install-editor&page=gedit",
-                            "naucse:page?lesson=beginners/install-editor&page=gedit#nacvik_odsazovani"
+                            "naucse:page?lesson=beginners/install-editor&page=gedit#nacvik_odsazovani",
+                            "naucse:solution?solution=0"
                         ],
                         "slug": "index",
-                        "solutions": [],
+                        "solutions": [
+                            {
+                                "content": "<div class=\"highlight\"><pre><span></span><span class=\"c1\"># Třikrát:</span>\n<span class=\"k\">for</span> <span class=\"n\">i</span> <span class=\"ow\">in</span> <span class=\"nb\">range</span><span class=\"p\">(</span><span class=\"mi\">3</span><span class=\"p\">):</span>\n\n    <span class=\"c1\"># Nakresli čtverec (kód zkopírovaný z předchozí úlohy a odsazený)</span>\n    <span class=\"k\">for</span> <span class=\"n\">j</span> <span class=\"ow\">in</span> <span class=\"nb\">range</span><span class=\"p\">(</span><span class=\"mi\">4</span><span class=\"p\">):</span>\n        <span class=\"n\">forward</span><span class=\"p\">(</span><span class=\"mi\">50</span><span class=\"p\">)</span>\n        <span class=\"n\">left</span><span class=\"p\">(</span><span class=\"mi\">90</span><span class=\"p\">)</span>\n\n    <span class=\"c1\"># Otoč se o 20°</span>\n    <span class=\"n\">left</span><span class=\"p\">(</span><span class=\"mi\">20</span><span class=\"p\">)</span>\n</pre></div>"
+                            }
+                        ],
                         "source_file": "lessons/beginners/install-editor/index.md",
                         "title": "Instalace editoru",
                         "vars": {}
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/gedit.html b/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/gedit.html
index 50617e2..af68a81 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/gedit.html
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/gedit.html
@@ -3,19 +3,27 @@ <h1 id="instalace_geditu">Instalace  Geditu
 </h1>
 <p>Na Linuxu se Gedit instaluje jako ostatní programy:</p>
 <dl>
-<dt></dt><dt>Fedora</dt><dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo dnf install gedit
-</pre></div></dd><dt></dt><dt>Ubuntu</dt><dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo apt-get install gedit
-</pre></div></dd></dl><p>Používáš-li jiný Linux, předpokládám že programy instalovat umíš. :)</p>
+<dt>Fedora</dt>
+<dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo<span class="w"> </span>dnf<span class="w"> </span>install<span class="w"> </span>gedit
+</pre></div></dd>
+<dt>Ubuntu</dt>
+<dd><div class="highlight"><pre><span></span><span class="gp">$ </span>sudo<span class="w"> </span>apt-get<span class="w"> </span>install<span class="w"> </span>gedit
+</pre></div></dd>
+</dl>
+<p>Používáš-li jiný Linux, předpokládám že programy instalovat umíš. :)</p>
 <p>Pro Windows a macOS se Gedit dá stáhnout z <a href="https://wiki.gnome.org/Apps/Gedit">domovské stránky</a>.</p>
 <h2 id="nastaveni">Nastavení
 <a href="#nastaveni" class="header-link">#</a>
 </h2>
 <p>...</p>
 <dl>
-<dt></dt><dt>Číslování řádků</dt><dd><p>V sekci Zobrazit/<span class="en">View</span> vyber
+<dt>Číslování řádků</dt>
+<dd><p>V sekci Zobrazit/<span class="en">View</span> vyber
 Zobrazovat čísla řádků/<span class="en">Display Line Numbers</span>.</p>
 <p><span class="figure"><a href="naucse:static?filename=gedit_linenums.png"><img src="naucse:static?filename=gedit_linenums.png" alt=""></a></span></p>
-</dd></dl><p>...</p>
+</dd>
+</dl>
+<p>...</p>
 <h2 id="nacvik_odsazovani">Nácvik odsazování
 <a href="#nacvik_odsazovani" class="header-link">#</a>
 </h2>
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/index.html b/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/index.html
index c796b08..eb28f9a 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/install-editor/index.html
@@ -4,11 +4,14 @@ <h2 id="co_programatorsky_editor_umi">Co programátorský editor umí
 </h2>
 <p>...</p>
 <dl>
-<dt></dt><dt>Podpora více souborů</dt><dd><p>Větší projekty sestávají z více souborů, které můžeš mít v editoru
-otevřené všechny najednou.</p>
-</dd><dt></dt><dt>Číslování řádků</dt><dd><p>Před každým řádkem se ukazuje číslo.
-To se bude velice hodit, až Python bude nadávat, že chyba je na řádku 183.</p>
-</dd></dl><p>...</p>
+<dt>Podpora více souborů</dt>
+<dd>Větší projekty sestávají z více souborů, které můžeš mít v editoru
+otevřené všechny najednou.</dd>
+<dt>Číslování řádků</dt>
+<dd>Před každým řádkem se ukazuje číslo.
+To se bude velice hodit, až Python bude nadávat, že chyba je na řádku 183.</dd>
+</dl>
+<p>...</p>
 <div class="admonition note"><p>Pro ilustraci, takhle může v editoru vypadat kousek kódu:</p>
 <div class="highlight"><pre><span></span>    <span class="mi">1</span>  <span class="nd">@app</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s1">&#39;/courses/&lt;course:course&gt;/&#39;</span><span class="p">)</span>
     <span class="mi">2</span>  <span class="k">def</span> <span class="nf">course_page</span><span class="p">(</span><span class="n">course</span><span class="p">):</span>
@@ -28,4 +31,23 @@ <h2 id="co_programatorsky_editor_umi">Co programátorský editor umí
 </ul>
 </li>
 </ul>
-<p>...</p>
\ No newline at end of file
+<p>...</p>
+<div class="solution" id="solution-0">
+    <h3>Řešení</h3>
+    <div class="solution-cover">
+        <a href="naucse:solution?solution=0"><span class="link-text">Ukázat řešení</span></a>
+    </div>
+    <div class="solution-body" aria-hidden="true">
+        <div class="highlight"><pre><span></span><span class="c1"># Třikrát:</span>
+<span></span><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">3</span><span class="p">):</span>
+<span></span>
+<span></span>    <span class="c1"># Nakresli čtverec (kód zkopírovaný z předchozí úlohy a odsazený)</span>
+<span></span>    <span class="k">for</span> <span class="n">j</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">4</span><span class="p">):</span>
+<span></span>        <span class="n">forward</span><span class="p">(</span><span class="mi">50</span><span class="p">)</span>
+<span></span>        <span class="n">left</span><span class="p">(</span><span class="mi">90</span><span class="p">)</span>
+<span></span>
+<span></span>    <span class="c1"># Otoč se o 20°</span>
+<span></span>    <span class="n">left</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span>
+<span></span></pre></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/tasks/index.html b/test_naucse_render/fixtures/expected-compiled/lessons/tasks/index.html
index e447fc1..f8921ec 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/tasks/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/tasks/index.html
@@ -1,9 +1,7 @@
 <ol>
-
     <li>
         <p>A task</p>
     </li>
-
     <li>
         <p>Task with list:</p>
 <ul>
@@ -11,9 +9,7 @@
 <li>b</li>
 </ul>
     </li>
-
     <li>
-        <p>Static files handled with a <img src="naucse:static?filename=smile.png" alt="smile">.</p>
+        <p>Static files handled with a <img src="naucse:static?filename=smile.png" alt="smile" />.</p>
     </li>
-
 </ol>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/test_static_tree/index.html b/test_naucse_render/fixtures/expected-compiled/lessons/test_static_tree/index.html
index 3abd2a0..87f365f 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/test_static_tree/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/test_static_tree/index.html
@@ -1,2 +1,2 @@
-<p><img src="naucse:static?filename=directory/smile.png" alt="smile"></p>
+<p><img src="naucse:static?filename=directory/smile.png" alt="smile" /></p>
 <p>Output should have '/' as the directory separator, regardless of OS.</p>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-compiled/lessons/test_subpages/index.html b/test_naucse_render/fixtures/expected-compiled/lessons/test_subpages/index.html
index 1c31e54..f305c88 100644
--- a/test_naucse_render/fixtures/expected-compiled/lessons/test_subpages/index.html
+++ b/test_naucse_render/fixtures/expected-compiled/lessons/test_subpages/index.html
@@ -1 +1 @@
-<p>This is the main page with links to subpages <a href="naucse:page?lesson=testcases/test_subpages&amp;page=titled">one</a>, <a href="naucse:page?lesson=testcases/test_subpages&amp;page=subtitled">two</a> and <a href="naucse:page?lesson=testcases/test_subpages&amp;page=both-titles">three</a>.</p>
\ No newline at end of file
+<p>This is the main page with links to subpages <a href="naucse:page?lesson=testcases/test_subpages&page=titled">one</a>, <a href="naucse:page?lesson=testcases/test_subpages&page=subtitled">two</a> and <a href="naucse:page?lesson=testcases/test_subpages&page=both-titles">three</a>.</p>
\ No newline at end of file
diff --git a/test_naucse_render/fixtures/expected-dumps/beginners/install-editor.yaml b/test_naucse_render/fixtures/expected-dumps/beginners/install-editor.yaml
index d7e50f9..2a2be7c 100644
--- a/test_naucse_render/fixtures/expected-dumps/beginners/install-editor.yaml
+++ b/test_naucse_render/fixtures/expected-dumps/beginners/install-editor.yaml
@@ -42,24 +42,27 @@ data:
                 content: "<h1 id=\"instalace_geditu\">Instalace  Geditu\n<a href=\"\
                     #instalace_geditu\" class=\"header-link\">#</a>\n</h1>\n<p>Na\
                     \ Linuxu se Gedit instaluje jako ostatn\xED programy:</p>\n<dl>\n\
-                    <dt></dt><dt>Fedora</dt><dd><div class=\"highlight\"><pre><span></span><span\
-                    \ class=\"gp\">$ </span>sudo dnf install gedit\n</pre></div></dd><dt></dt><dt>Ubuntu</dt><dd><div\
-                    \ class=\"highlight\"><pre><span></span><span class=\"gp\">$ </span>sudo\
-                    \ apt-get install gedit\n</pre></div></dd></dl><p>Pou\u017E\xED\
+                    <dt>Fedora</dt>\n<dd><div class=\"highlight\"><pre><span></span><span\
+                    \ class=\"gp\">$ </span>sudo<span class=\"w\"> </span>dnf<span\
+                    \ class=\"w\"> </span>install<span class=\"w\"> </span>gedit\n\
+                    </pre></div></dd>\n<dt>Ubuntu</dt>\n<dd><div class=\"highlight\"\
+                    ><pre><span></span><span class=\"gp\">$ </span>sudo<span class=\"\
+                    w\"> </span>apt-get<span class=\"w\"> </span>install<span class=\"\
+                    w\"> </span>gedit\n</pre></div></dd>\n</dl>\n<p>Pou\u017E\xED\
                     v\xE1\u0161-li jin\xFD Linux, p\u0159edpokl\xE1d\xE1m \u017Ee\
                     \ programy instalovat um\xED\u0161. :)</p>\n<p>Pro Windows a macOS\
                     \ se Gedit d\xE1 st\xE1hnout z\_<a href=\"https://wiki.gnome.org/Apps/Gedit\"\
                     >domovsk\xE9 str\xE1nky</a>.</p>\n<h2 id=\"nastaveni\">Nastaven\xED\
                     \n<a href=\"#nastaveni\" class=\"header-link\">#</a>\n</h2>\n\
-                    <p>...</p>\n<dl>\n<dt></dt><dt>\u010C\xEDslov\xE1n\xED \u0159\xE1\
-                    dk\u016F</dt><dd><p>V\_sekci Zobrazit/<span class=\"en\">View</span>\
+                    <p>...</p>\n<dl>\n<dt>\u010C\xEDslov\xE1n\xED \u0159\xE1dk\u016F\
+                    </dt>\n<dd><p>V\_sekci Zobrazit/<span class=\"en\">View</span>\
                     \ vyber\nZobrazovat \u010D\xEDsla \u0159\xE1dk\u016F/<span class=\"\
                     en\">Display Line Numbers</span>.</p>\n<p><span class=\"figure\"\
                     ><a href=\"naucse:static?filename=gedit_linenums.png\"><img src=\"\
                     naucse:static?filename=gedit_linenums.png\" alt=\"\"></a></span></p>\n\
-                    </dd></dl><p>...</p>\n<h2 id=\"nacvik_odsazovani\">N\xE1cvik odsazov\xE1\
-                    n\xED\n<a href=\"#nacvik_odsazovani\" class=\"header-link\">#</a>\n\
-                    </h2>\n<p>...</p>"
+                    </dd>\n</dl>\n<p>...</p>\n<h2 id=\"nacvik_odsazovani\">N\xE1cvik\
+                    \ odsazov\xE1n\xED\n<a href=\"#nacvik_odsazovani\" class=\"header-link\"\
+                    >#</a>\n</h2>\n<p>...</p>"
                 ids:
                 - instalace_geditu
                 - nacvik_odsazovani
@@ -81,14 +84,14 @@ data:
                 - Pro PyLadies Brno napsal Petr Viktorin, 2014-2017
                 content: "<p>...</p>\n<h2 id=\"co_programatorsky_editor_umi\">Co program\xE1\
                     torsk\xFD editor um\xED\n<a href=\"#co_programatorsky_editor_umi\"\
-                    \ class=\"header-link\">#</a>\n</h2>\n<p>...</p>\n<dl>\n<dt></dt><dt>Podpora\
-                    \ v\xEDce soubor\u016F</dt><dd><p>V\u011Bt\u0161\xED projekty\
-                    \ sest\xE1vaj\xED z\_v\xEDce soubor\u016F, kter\xE9 m\u016F\u017E\
-                    e\u0161 m\xEDt v\_editoru\notev\u0159en\xE9 v\u0161echny najednou.</p>\n\
-                    </dd><dt></dt><dt>\u010C\xEDslov\xE1n\xED \u0159\xE1dk\u016F</dt><dd><p>P\u0159\
+                    \ class=\"header-link\">#</a>\n</h2>\n<p>...</p>\n<dl>\n<dt>Podpora\
+                    \ v\xEDce soubor\u016F</dt>\n<dd>V\u011Bt\u0161\xED projekty sest\xE1\
+                    vaj\xED z\_v\xEDce soubor\u016F, kter\xE9 m\u016F\u017Ee\u0161\
+                    \ m\xEDt v\_editoru\notev\u0159en\xE9 v\u0161echny najednou.</dd>\n\
+                    <dt>\u010C\xEDslov\xE1n\xED \u0159\xE1dk\u016F</dt>\n<dd>P\u0159\
                     ed ka\u017Ed\xFDm \u0159\xE1dkem se ukazuje \u010D\xEDslo.\nTo\
                     \ se bude velice hodit, a\u017E Python bude nad\xE1vat, \u017E\
-                    e chyba je na \u0159\xE1dku 183.</p>\n</dd></dl><p>...</p>\n<div\
+                    e chyba je na \u0159\xE1dku 183.</dd>\n</dl>\n<p>...</p>\n<div\
                     \ class=\"admonition note\"><p>Pro ilustraci, takhle m\u016F\u017E\
                     e v\_editoru vypadat kousek k\xF3du:</p>\n<div class=\"highlight\"\
                     ><pre><span></span>    <span class=\"mi\">1</span>  <span class=\"\
@@ -106,9 +109,33 @@ data:
                     </ul>\n<p>...</p>\n<ul>\n<li><a href=\"naucse:page?lesson=beginners/install-editor&amp;page=gedit\"\
                     >Gedit</a> \u2013 b\xFDv\xE1 na syst\xE9mech s\_prost\u0159ed\xED\
                     m GNOME.<ul>\n<li>M\u016F\u017Eeme odk\xE1zat na <a href=\"naucse:page?lesson=beginners/install-editor&amp;page=gedit#nacvik_odsazovani\"\
-                    >N\xE1cvik odsazov\xE1n\xED</a>.</li>\n</ul>\n</li>\n</ul>\n<p>...</p>"
+                    >N\xE1cvik odsazov\xE1n\xED</a>.</li>\n</ul>\n</li>\n</ul>\n<p>...</p>\n\
+                    <div class=\"solution\" id=\"solution-0\">\n    <h3>\u0158e\u0161\
+                    en\xED</h3>\n    <div class=\"solution-cover\">\n        <a href=\"\
+                    naucse:solution?solution=0\"><span class=\"link-text\">Uk\xE1\
+                    zat \u0159e\u0161en\xED</span></a>\n    </div>\n    <div class=\"\
+                    solution-body\" aria-hidden=\"true\">\n        <div class=\"highlight\"\
+                    ><pre><span></span><span class=\"c1\"># T\u0159ikr\xE1t:</span>\n\
+                    <span></span><span class=\"k\">for</span> <span class=\"n\">i</span>\
+                    \ <span class=\"ow\">in</span> <span class=\"nb\">range</span><span\
+                    \ class=\"p\">(</span><span class=\"mi\">3</span><span class=\"\
+                    p\">):</span>\n<span></span>\n<span></span>    <span class=\"\
+                    c1\"># Nakresli \u010Dtverec (k\xF3d zkop\xEDrovan\xFD z p\u0159\
+                    edchoz\xED \xFAlohy a odsazen\xFD)</span>\n<span></span>    <span\
+                    \ class=\"k\">for</span> <span class=\"n\">j</span> <span class=\"\
+                    ow\">in</span> <span class=\"nb\">range</span><span class=\"p\"\
+                    >(</span><span class=\"mi\">4</span><span class=\"p\">):</span>\n\
+                    <span></span>        <span class=\"n\">forward</span><span class=\"\
+                    p\">(</span><span class=\"mi\">50</span><span class=\"p\">)</span>\n\
+                    <span></span>        <span class=\"n\">left</span><span class=\"\
+                    p\">(</span><span class=\"mi\">90</span><span class=\"p\">)</span>\n\
+                    <span></span>\n<span></span>    <span class=\"c1\"># Oto\u010D\
+                    \ se o 20\xB0</span>\n<span></span>    <span class=\"n\">left</span><span\
+                    \ class=\"p\">(</span><span class=\"mi\">20</span><span class=\"\
+                    p\">)</span>\n<span></span></pre></div>\n    </div>\n</div>"
                 ids:
                 - co_programatorsky_editor_umi
+                - solution-0
                 - volba_a_nastaveni_editoru
                 license: cc-by-sa-40
                 links:
@@ -117,8 +144,27 @@ data:
                 - naucse:page?lesson=beginners/install-editor&page=atom
                 - naucse:page?lesson=beginners/install-editor&page=gedit
                 - naucse:page?lesson=beginners/install-editor&page=gedit#nacvik_odsazovani
+                - naucse:solution?solution=0
                 slug: index
-                solutions: []
+                solutions:
+                -   content: "<div class=\"highlight\"><pre><span></span><span class=\"\
+                        c1\"># T\u0159ikr\xE1t:</span>\n<span class=\"k\">for</span>\
+                        \ <span class=\"n\">i</span> <span class=\"ow\">in</span>\
+                        \ <span class=\"nb\">range</span><span class=\"p\">(</span><span\
+                        \ class=\"mi\">3</span><span class=\"p\">):</span>\n\n   \
+                        \ <span class=\"c1\"># Nakresli \u010Dtverec (k\xF3d zkop\xED\
+                        rovan\xFD z p\u0159edchoz\xED \xFAlohy a odsazen\xFD)</span>\n\
+                        \    <span class=\"k\">for</span> <span class=\"n\">j</span>\
+                        \ <span class=\"ow\">in</span> <span class=\"nb\">range</span><span\
+                        \ class=\"p\">(</span><span class=\"mi\">4</span><span class=\"\
+                        p\">):</span>\n        <span class=\"n\">forward</span><span\
+                        \ class=\"p\">(</span><span class=\"mi\">50</span><span class=\"\
+                        p\">)</span>\n        <span class=\"n\">left</span><span class=\"\
+                        p\">(</span><span class=\"mi\">90</span><span class=\"p\"\
+                        >)</span>\n\n    <span class=\"c1\"># Oto\u010D se o 20\xB0\
+                        </span>\n    <span class=\"n\">left</span><span class=\"p\"\
+                        >(</span><span class=\"mi\">20</span><span class=\"p\">)</span>\n\
+                        </pre></div>"
                 source_file: lessons/beginners/install-editor/index.md
                 title: Instalace editoru
                 vars: {}
diff --git a/test_naucse_render/fixtures/expected-dumps/homework/tasks.yaml b/test_naucse_render/fixtures/expected-dumps/homework/tasks.yaml
index 40fe978..2b482f6 100644
--- a/test_naucse_render/fixtures/expected-dumps/homework/tasks.yaml
+++ b/test_naucse_render/fixtures/expected-dumps/homework/tasks.yaml
@@ -7,11 +7,11 @@ data:
             index:
                 attribution:
                 - Pro PyLadies Brno napsal Petr Viktorin, 2014-2019
-                content: "<ol>\n\n    <li>\n        <p>A task</p>\n    </li>\n\n \
-                    \   <li>\n        <p>Task with list:</p>\n<ul>\n<li>a</li>\n<li>b</li>\n\
-                    </ul>\n    </li>\n\n    <li>\n        <p>Static files handled\
-                    \ with a <img src=\"naucse:static?filename=smile.png\" alt=\"\
-                    smile\">.</p>\n    </li>\n\n</ol>"
+                content: "<ol>\n    <li>\n        <p>A task</p>\n    </li>\n    <li>\n\
+                    \        <p>Task with list:</p>\n<ul>\n<li>a</li>\n<li>b</li>\n\
+                    </ul>\n    </li>\n    <li>\n        <p>Static files handled with\
+                    \ a <img src=\"naucse:static?filename=smile.png\" alt=\"smile\"\
+                    \ />.</p>\n    </li>\n</ol>"
                 ids: []
                 license: cc-by-sa-40
                 links:
diff --git a/test_naucse_render/fixtures/expected-dumps/testcases/test_static_tree.yaml b/test_naucse_render/fixtures/expected-dumps/testcases/test_static_tree.yaml
index d6e204c..d9693f6 100644
--- a/test_naucse_render/fixtures/expected-dumps/testcases/test_static_tree.yaml
+++ b/test_naucse_render/fixtures/expected-dumps/testcases/test_static_tree.yaml
@@ -8,7 +8,7 @@ data:
                 attribution:
                 - Petr Viktorin
                 content: '<p><img src="naucse:static?filename=directory/smile.png"
-                    alt="smile"></p>
+                    alt="smile" /></p>
 
                     <p>Output should have ''/'' as the directory separator, regardless
                     of OS.</p>'
diff --git a/test_naucse_render/fixtures/expected-dumps/testcases/test_subpages.yaml b/test_naucse_render/fixtures/expected-dumps/testcases/test_subpages.yaml
index 518aa88..337ab2e 100644
--- a/test_naucse_render/fixtures/expected-dumps/testcases/test_subpages.yaml
+++ b/test_naucse_render/fixtures/expected-dumps/testcases/test_subpages.yaml
@@ -20,9 +20,9 @@ data:
             index:
                 attribution:
                 - Petr Viktorin
-                content: <p>This is the main page with links to subpages <a href="naucse:page?lesson=testcases/test_subpages&amp;page=titled">one</a>,
-                    <a href="naucse:page?lesson=testcases/test_subpages&amp;page=subtitled">two</a>
-                    and <a href="naucse:page?lesson=testcases/test_subpages&amp;page=both-titles">three</a>.</p>
+                content: <p>This is the main page with links to subpages <a href="naucse:page?lesson=testcases/test_subpages&page=titled">one</a>,
+                    <a href="naucse:page?lesson=testcases/test_subpages&page=subtitled">two</a>
+                    and <a href="naucse:page?lesson=testcases/test_subpages&page=both-titles">three</a>.</p>
                 ids: []
                 license: cc0
                 links:
diff --git a/test_naucse_render/fixtures/test_content/lessons/beginners/install-editor/index.md b/test_naucse_render/fixtures/test_content/lessons/beginners/install-editor/index.md
index d943d52..d0bac26 100644
--- a/test_naucse_render/fixtures/test_content/lessons/beginners/install-editor/index.md
+++ b/test_naucse_render/fixtures/test_content/lessons/beginners/install-editor/index.md
@@ -39,3 +39,19 @@ Podpora více souborů
   * Můžeme odkázat na [Nácvik odsazování]({{ subpage_url('gedit') }}#nacvik_odsazovani).
 
 ...
+
+{% filter solution %}
+```python
+# Třikrát:
+for i in range(3):
+
+    # Nakresli čtverec (kód zkopírovaný z předchozí úlohy a odsazený)
+    for j in range(4):
+        forward(50)
+        left(90)
+
+    # Otoč se o 20°
+    left(20)
+
+```
+{% endfilter %}
diff --git a/test_naucse_render/fixtures/test_content/lessons/homework/tasks/index.md b/test_naucse_render/fixtures/test_content/lessons/homework/tasks/index.md
index f4fc44d..4c450cb 100644
--- a/test_naucse_render/fixtures/test_content/lessons/homework/tasks/index.md
+++ b/test_naucse_render/fixtures/test_content/lessons/homework/tasks/index.md
@@ -1,7 +1,7 @@
 <ol>
-{% for item in data.tasks %}
+{%- for item in data.tasks %}
     <li>
         {{ item.markdown | markdown }}
     </li>
-{% endfor %}
+{%- endfor %}
 </ol>
diff --git a/test_naucse_render/test_markdown.py b/test_naucse_render/test_markdown.py
index 4bbfe87..787cf94 100644
--- a/test_naucse_render/test_markdown.py
+++ b/test_naucse_render/test_markdown.py
@@ -99,8 +99,10 @@ def test_markdown_definition_list():
     expected = dedent("""
         <p>Bla Bla</p>
         <dl>
-        <dt></dt><dt>The Term</dt><dd><p>Its Definition</p>
-        </dd></dl><p>More Text</p>
+        <dt>The Term</dt>
+        <dd>Its Definition</dd>
+        </dl>
+        <p>More Text</p>
     """).strip()
     assert convert_markdown(src).strip() == expected
 
@@ -123,11 +125,15 @@ def test_markdown_definition_list_advanced():
     expected = dedent("""
         <p>Bla Bla</p>
         <dl>
-        <dt></dt><dt>The Term</dt><dd><p>Its Definition
+        <dt>The Term</dt>
+        <dd><p>Its Definition
         More Definition</p>
         <p>Even More</p>
-        </dd><dt></dt><dt>Another Term</dt><dd><p>Define this</p>
-        </dd></dl><p>More Text</p>
+        </dd>
+        <dt>Another Term</dt>
+        <dd>Define this</dd>
+        </dl>
+        <p>More Text</p>
     """).strip()
     print(convert_markdown(src))
     assert convert_markdown(src).strip() == expected
@@ -160,7 +166,8 @@ def test_markdown_ansi_colors():
           (use "git add &lt;file&gt;..." to update what will be committed)
           (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
 
-            <span style="color: #aa0000">modified:   test_naucse/test_markdown.py</span></code></pre></div>
+            <span style="color: #aa0000">modified:   test_naucse/test_markdown.py</span>
+        </code></pre></div>
     """).strip()
     assert convert_markdown(src) == expected
 
@@ -287,7 +294,7 @@ def test_convert_full_dosvenv_prompt():
     """)
     expected = dedent(r"""
         <div class="highlight"><pre><span></span><span class="gp">&gt; </span>whoami
-        <span class="go">helena</span><span class="gp"></span>
+        <span class="go">helena</span>
         <span class="gp">&gt; </span>venv\Scripts\activate  <span class="c"># activate virtualenv</span>
         <span class="gp">(venv)&gt; </span>dir
         <span class="go"> Directory of C:\Users\helena</span>
diff --git a/test_naucse_render/test_notebook.py b/test_naucse_render/test_notebook.py
index 208415f..5c85571 100644
--- a/test_naucse_render/test_notebook.py
+++ b/test_naucse_render/test_notebook.py
@@ -33,7 +33,7 @@ def notebook(_notebook):
 def test_notebook_markdown_cell_conversion(notebook):
     markdown = dedent(r"""
         <h2 id="markdown">Markdown
-        <a href="#markdown" class="header-link">#</a>
+        <a class="header-link" href="#markdown">#</a>
         </h2>
         <p>This is <em>Markdown cell</em>!</p>
         <p>It even has some $\LaTeX$:</p>
@@ -43,7 +43,7 @@ def test_notebook_markdown_cell_conversion(notebook):
 
 
 def test_notebook_has_input_prompt(notebook):
-    input_prompt = '<div class="prompt input_prompt">In&nbsp;[1]:</div>'
+    input_prompt = '<div class="prompt input_prompt">In [1]:</div>'
     assert input_prompt in notebook
 
 
@@ -54,7 +54,7 @@ def test_notebook_has_output_prompt(notebook):
 
 def test_notebook_has_highlighted_input_area(notebook):
     input_area = dedent("""
-        <div class=" highlight hl-ipython3">
+        <div class="highlight hl-ipython3">
         <pre>
         <span></span><span class="nb">print</span><span class="p">(</span>
         <span class="s1">'foo'</span><span class="p">)</span>
diff --git a/tox.ini b/tox.ini
index b82ae6c..5b3e97d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
-envlist = py{37,38,39,310,311}
+envlist = py{38,39,310,311,312}
 isolated_build = True
 
 [testenv]
 deps=
     pytest
 commands=
-    python -m pytest
+    python -m pytest -vv