diff --git a/Makefile b/Makefile
index 1e12126095711e62047db5177ccf2ad705254262..7a67e4b77b57b18e864a5354e8629b7389cbf566 100644
--- a/Makefile
+++ b/Makefile
@@ -13,5 +13,8 @@ deploy: all
 	cp index.html site/
 	cp -r css site/
 
+update:
+	git pull --recurse-submodules
+
 clean:
 	rm -rf index.html
diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs
index ffccec43af58b578bff1029b9561db6eaa97c237..5d487ad3636ccd937345957d8fd628b3b6e1ee69 100644
--- a/hakyll-bootstrap/Main.hs
+++ b/hakyll-bootstrap/Main.hs
@@ -285,6 +285,8 @@ pandocCrossrefNumberingCompiler = do
         >>= withItemBody (unixFilter "pandoc" ["-F"
                                             , "pandoc-numbering"
                                             , "-F"
+                                            , "mermaid-filter"
+                                            , "-F"
                                             , "pandoc-crossref"
                                             , "-t"
                                             , "markdown"
@@ -300,6 +302,8 @@ pandocRevealCompiler = do
         >>= withItemBody (unixFilter "pandoc" ["-F"
                                             , "pandoc-numbering"
                                             , "-F"
+                                            , "mermaid-filter"
+                                            , "-F"
                                             , "pandoc-crossref"
                                             , "-t"
                                             , "revealjs"
diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile
index 7f4c54f47e72276058daf1c55e26759f1d19b94a..3b2c6d62bdb0ce5e70606515cbf47d328b9a8b5f 100644
--- a/hakyll-bootstrap/Makefile
+++ b/hakyll-bootstrap/Makefile
@@ -1,8 +1,10 @@
 watch: build
-	stack exec blog -- watch
+	# stack exec blog -- watch
+	blog watch
 
 deploy: build 
-	stack exec blog -- deploy
+	# stack exec blog -- deploy
+	blog deploy
 
 build: Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
 	make hakyll_gen -C cours/math_tech_info
@@ -10,14 +12,15 @@ build: Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
 	make -C cours/math_tech_info
 	make -C cours/isc_physics
 	make markdown -C cours/prog_seq/slides
-	stack build && stack exec blog -- build
+	# stack build && stack exec blog -- build
+	cabal install && blog build
 
 build_revealjs:
 	cd reveal.js && npm install && npm run build && cd ..
 		
 
 update:
-	git submodule update --recursive --remote
+	make update -C ..
 
 clean:
 	rm -rf _cache _site