diff --git a/emacs/custom.el b/emacs/custom.el
index a4cc0a6..5191d1e 100644
--- a/emacs/custom.el
+++ b/emacs/custom.el
@@ -6,6 +6,7 @@
  '(custom-safe-themes
    '("6e23a74a8c3e71515aafaa2c39d337c9b032ab8bd98530819c862b223ff3638f" default))
  '(deft-extensions '("kotl" "txt" "text" "md" "markdown" "org"))
+ '(emcn-host "famthun.nl")
  '(package-selected-packages
    '(yasnippet protobuf-mode lsp-ui lsp-mode exwm ement plz ts quelpa deft hyperbole phps-mode telega gnus-desktop-notify xclip ix esh-autosuggest company-shell docker-compose-mode docker muse writeroom-mode vscode-icon mastodon smtpmail-multi vterm pyvenv pyenv-mode python-mode markdown-mode+ websocket sql-indent company-lsp flymake-go noflet ido-vertical-mode counsel swiper typescript-mode flymake-shellcheck omnisharp plantuml-mode all-the-icons-dired all-the-icons dired-sidebar company-irony-c-headers irony-eldoc company-irony irony go-eldoc company-go go-mode webpaste emojify csv csv-mode js2-mode company-tern php-mode xmlgen request-deferred auto-package-update web-mode company magit powerline nginx-mode cpanfile-mode dotenv-mode mustache-mode htmlize dockerfile-mode indent-tools markdown-mode yaml-mode))
  '(php-lineup-cascaded-calls t)
@@ -16,6 +17,7 @@
  '(tab-bar-border 4 t)
  '(tab-bar-close-button-show nil)
  '(tab-bar-separator "|" t)
+ '(warning-suppress-types '((ement)))
  '(window-divider-default-right-width 4)
  '(window-divider-mode nil))
 (custom-set-faces
diff --git a/emacs/init.el b/emacs/init.el
index 0da148c..52f55b8 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -416,8 +416,6 @@ closed or not, to not confuse elements with Svelte components."
 ;; `ido-list-directory' if I ever really want to use dired. Also there is {C-c
 ;; C-x C-d} to open `dired-sidebar'.
 (global-unset-key (kbd "C-x d"))
-(global-set-key (kbd "C-x d d") 'deft)
-(global-set-key (kbd "C-x d f") 'deft-new-file-named)
 
 (global-set-key (kbd "C-c e") 'emojify-insert-emoji)
 
@@ -443,25 +441,18 @@ closed or not, to not confuse elements with Svelte components."
 
 ;; END KEYBINDS
 
-;;;;;;;;;;;;;;;;
-;;;;; DEFT ;;;;;
-;;;;;;;;;;;;;;;;
-(require 'deft)
-
-(defun hugot-deft-window-width (old-function)
-  (- (funcall old-function) 1))
-
-(advice-add 'deft-current-window-width :around #'hugot-deft-window-width)
-
-(eval-after-load "deft"
-  (progn
-    (setq deft-directory "~/projects/deft")
-    (custom-set-variables '(deft-extensions '("kotl" "txt" "text" "md" "markdown" "org")))
-    (setq-default deft-default-extension "kotl")
-    (setq deft-use-filename-as-title t)
-    (setq deft-strip-summary-regexp "^\\(\n\\|;;\\|\"\\|[[:digit:]]\\|[[:blank:]]*\\[\\|[a-z]\\|\\|[[:blank:]]+(creator\\|.*\\]$\\).*\\|\\|[\n \t]+")))
+;;;;;;;;;;;;;;;;;;;;;;
+;;;;; NOTES LIST ;;;;;
+;;;;;;;;;;;;;;;;;;;;;;
+(when (and (require 'emcn-notes-list nil t)
+           (require 'notes-list nil t))
+  (setq notes-list-collect-notes-function #'emcn-notes-list-collect-notes)
+  (setq notes-list-open-function #'emcn-notes-list-open)
+  (setq notes-list-highlight-face 'font-lock-string-face)
+  (setq notes-list-stripe-face 'fringe)
+  (setq notes-list-display-tags nil))
 
-;; END DEFT
+;; END NOTES LIST
 
 ;;;;;;;;;;;;;;;;;;;;
 ;;;;; EWW MODE ;;;;;
@@ -487,11 +478,14 @@ OLD-FUNCTION must be the function that is being adviced."
 ;;;;; EMENT ;;;;;
 ;;;;;;;;;;;;;;;;;
 
-(defun hugot-ement-hook ()
-  (emojify-mode))
+(when (require 'ement nil t)
+  (setq ement-save-sessions t)
+
+  (defun hugot-ement-hook ()
+    (emojify-mode))
 
-(add-hook 'ement-room-list-mode-hook #'hugot-ement-hook)
-(add-hook 'ement-room-mode-hook #'hugot-ement-hook)
+  (add-hook 'ement-room-list-mode-hook #'hugot-ement-hook)
+  (add-hook 'ement-room-mode-hook #'hugot-ement-hook))
 
 ;; END EMENT