diff --git a/init/mod-webdev.el b/init/mod-webdev.el
index 7db33e012..1617d43fd 100644
--- a/init/mod-webdev.el
+++ b/init/mod-webdev.el
@@ -26,7 +26,24 @@
          ("\\.erb\\'" . web-mode)
          ("wp-content/themes/.+/.+\\.php\\'" . web-mode))
   :config
-  (add-hook 'web-mode-hook 'jekyll-mode-maybe))
+  (progn
+    (setq web-mode-ac-sources-alist
+          '(("css" . (ac-source-css-property))))
+
+    (setq web-mode-markup-indent-offset 4)
+    (setq web-mode-css-indent-offset 4)
+    (setq web-mode-code-indent-offset 4)
+
+    (nvmap web-mode-map "]a" 'web-mode-attribute-next)
+    (nvmap web-mode-map "]t" 'web-mode-tag-next)
+    (nvmap web-mode-map "[t" 'web-mode-tag-previous)
+    (nvmap web-mode-map "]T" 'web-mode-element-child)
+    (nvmap web-mode-map "[T" 'web-mode-element-parent)
+    (nmap web-mode-map "zf" 'web-mode-fold-or-unfold)
+    (nmap web-mode-map ",t" 'web-mode-element-rename)
+
+    (define-key web-mode-map (kbd "s-/") 'web-mode-comment-or-uncomment)
+    (add-hook 'web-mode-hook 'jekyll-mode-maybe)))
 
 (use-package tern :ensure t
   :commands tern-mode
@@ -40,8 +57,9 @@
   (add-hook 'js-mode-hook
     (lambda ()
       (tern-mode t)
+      (tern-ac-setup)
       (imap js-mode-map (kbd "C-SPC") 'tern-ac-complete)
-      (tern-ac-setup))))
+      )))
 
 (use-package emmet-mode :ensure t
   :defer t