diff --git a/init/80_web-mode.el b/init/80_web-mode.el
index ff4cc11..fd5a3d4 100644
--- a/init/80_web-mode.el
+++ b/init/80_web-mode.el
@@ -1,7 +1,11 @@
 (bundle web-mode
-  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.tag?\\'" . web-mode))
   (setq web-mode-markup-indent-offset 2)
   (setq web-mode-css-indent-offset 2)
   (setq web-mode-code-indent-offset 2)
-)
\ No newline at end of file
+
+  ; Normal HTML
+  (add-to-list 'auto-mode-alist '("\\.html\\'" . web-mode))
+  ; Riot.js
+  (add-to-list 'auto-mode-alist '("\\.tag\\'" . web-mode))
+  (setq web-mode-engines-alist '(("riot" . "\\.tag\\'")))
+)