diff --git a/init.org b/init.org
index 5c66bf4..6109b88 100644
--- a/init.org
+++ b/init.org
@@ -650,9 +650,22 @@ TODO Unterverzeichnisse wurden noch nicht getestet
   :config
   (setq yas-snippet-dirs (list (concat MY--PATH_USER_GLOBAL "snippets")))
   (yas-global-mode t)
-  (yas-reload-all))
+  (yas-reload-all)
+  (unbind-key "TAB" yas-minor-mode-map)
+  (unbind-key "<tab>" yas-minor-mode-map))
 #+end_src
 
+** hippie expand
+With hippie expand I am able to use yasnippet and emmet at the same time with the same key.
+#+begin_src emacs-lisp
+(use-package hippie-exp
+  :defer t
+  :bind
+  ("C-<return>" . hippie-expand)
+  :config
+  (setq hippie-expand-try-functions-list
+        '(yas-hippie-try-expand emmet-expand-line)))
+#+end_src
 ** flycheck
 #+BEGIN_SRC emacs-lisp
   (use-package flycheck
@@ -738,6 +751,20 @@ Manage projects and jump quickly between its files
      (add-hook 'web-mode-hook 'smartparens-mode))
  #+END_SRC
 
+Emmet offers snippets, similar to yasnippet.
+Default completion is C-j
+[[https://github.com/smihica/emmet-mode#usage][Github]]
+
+#+begin_src emacs-lisp
+(use-package emmet-mode
+  :ensure t
+  :defer t
+  :hook
+  ((web-mode . emmet-mode)
+   (css-mode . emmet-mode))
+  :config
+  (unbind-key "C-<return>" . emmet-mode-keymap))
+#+end_src
 ** YAML
 #+begin_src emacs-lisp
 (use-package yaml-mode