diff --git a/pelicanconf.py b/pelicanconf.py
index 4b75ce699e139b50ea885e8403a086137984672e..000b9952a9f0ce7536c2bb7e1c51cf08cfae07d5 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -95,8 +95,17 @@ THEME = os.path.dirname(os.path.abspath(__file__)) + "/themes/limos"
 JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']}
 PLUGIN_PATHS = [os.path.dirname(os.path.abspath(__file__)) + '/plugins']
 # @todo https://github.com/getpelican/pelican-plugins/tree/master/assets
-PLUGINS = ['i18n_subsites', 'tag_cloud', 'tipue_search', 'extract_toc', 'math_render']
-MARKDOWN = {'extensions': ['toc']}
+PLUGINS = ['i18n_subsites', 'tag_cloud', 'tipue_search', 'math_render', 'extract_toc']
+# MARKDOWN = {'extensions': ['toc']} # collision with pygment
+MARKDOWN = {
+    'extensions': ['toc'],
+    'extension_configs': {
+        'markdown.extensions.codehilite': {'css_class': 'highlight'},
+        'markdown.extensions.extra': {},
+        'markdown.extensions.meta': {},
+    },
+    'output_format': 'html5',
+}
 I18N_TEMPLATES_LANG = 'en'
 I18N_SUBSITES = {
     'fr': {
diff --git a/setup.py b/setup.py
index 7b1d2aaae605bb60f4dc87659c41f466e0d3f462..9583b4e85702455eeaf23424b51b03249fc82db8 100644
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,7 @@ setup(
     include_package_data=True,
     install_requires=[
         'pelican',
+        'pygments',
         'markdown',
         'beautifulsoup4',
         'typogrify'