diff --git a/emacs.d/.gitignore b/emacs.d/.gitignore
index e2ef80f..d90d7da 100644
--- a/emacs.d/.gitignore
+++ b/emacs.d/.gitignore
@@ -2,3 +2,4 @@ tramp
 elpa
 bookmarks
 abbrev_defs
+custom.el
diff --git a/emacs.el b/emacs.el
index 0c52e51..24fcf76 100644
--- a/emacs.el
+++ b/emacs.el
@@ -4,7 +4,10 @@
 ;; Autopair
 (require 'autopair)
 (autopair-global-mode t)       ; automatically add the other delimiter
-(setq autopair-skip-criteria 'always)
+(setq autopair-skip-criteria 'always
+      autopair-autowrap      t
+      autopair-blink         nil)
+(setq-default autopair-dont-pair '(:string (?\' ?\") :comment (?\')))
 
 ;; Column marker
 (defun set-column-markers (cm1 cm2)
@@ -314,17 +317,6 @@
 (set-face-foreground 'font-lock-operator-face "#EDD400")
 (set-face-foreground 'font-lock-end-statement "#888A85")
 
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(org-agenda-files (quote ("~/documents/work/aethon/aethon.org" "~/org/notes.org" "~/development/projects/aethon/myaethon/README.org" "~/documents/org/main.org")))
- '(safe-local-variable-values (quote ((ispell-dictionary . "nl") (ispell-dictionary . nl) (Mode . shell-script) (ispell-local-dictionary . nl)))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
-(put 'narrow-to-region 'disabled nil)
+;; Custom file
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file)