diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b3a5536..2346bba 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -179,6 +179,7 @@
   (minibuffer-electric-default-mode)
   (electric-pair-mode)
   (repeat-mode)
+  (fset 'yes-or-no-p 'y-or-n-p)
 
   (setq
    auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
@@ -195,7 +196,13 @@
    tab-bar-new-tab-choice "*scratch*"
    tab-bar-show nil
    user-full-name "Tobias Ostner"
-   user-mail-address "tobias.ostner@gmail.com")
+   user-mail-address "tobias.ostner@gmail.com"
+   undo-limit 6710886400 ;; 64mb
+   undo-strong-limit 100663296 ;; x 1.5 (96mb)
+   undo-outer-limit 1006632960 ;; x 10 (960mb)
+   truncate-string-ellipsis "..."
+   use-dialog-box nil
+   fast-but-imprecise-scrolling t)
 
   (setq-default indent-tabs-mode nil)