diff --git a/conf.org b/conf.org
index 69bd273..053a863 100644
--- a/conf.org
+++ b/conf.org
@@ -170,20 +170,6 @@ work in progress
     :init
     :ensure t)
 #+END_SRC
-** calfw
-#+BEGIN_SRC emacs-lisp
-(use-package calfw
-  :ensure t
-  :config
-  (setq cfw:fchar-junction ?╋
-		cfw:fchar-vertical-line ?┃
-		cfw:fchar-horizontal-line ?━
-		cfw:fchar-left-junction ?┣
-		cfw:fchar-right-junction ?┫
-		cfw:fchar-top-junction ?┯
-		cfw:fchar-top-left-corner ?┏
-		cfw:fchar-top-right-corner ?┓))
-#+END_SRC
 ** undo tree
 #+BEGIN_SRC emacs-lisp
 (use-package undo-tree
@@ -392,6 +378,14 @@ NOTES:
   (setq haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s"
 		haskell-interactive-popup-errors nil))
 #+END_SRC
+* magit
+#+BEGIN_SRC emacs-lisp
+(use-package magit
+  :ensure t
+  :config
+  (setq magit-push-always-verify nil
+		git-commit-summary-max-length 50))
+#+END_SRC
 * org-mode
 ** basic
 #+BEGIN_SRC emacs-lisp
@@ -1556,17 +1550,17 @@ and reverts all todo keywords to TODO"
 #+END_SRC
 ** calfw
 #+BEGIN_SRC emacs-lisp
-(use-package calfw-org
+(use-package calfw
   :ensure t
-  :custom
-  (cfw:fchar-junction ?╋)
-  (cfw:fchar-vertical-line ?┃)
-  (cfw:fchar-horizontal-line ?━)
-  (cfw:fchar-left-junction ?┣)
-  (cfw:fchar-right-junction ?┫)
-  (cfw:fchar-top-junction ?┯)
-  (cfw:fchar-top-left-corner ?┏)
-  (cfw:fchar-top-right-corner ?┓))
+  :config
+  (setq cfw:fchar-junction ?╋
+		cfw:fchar-vertical-line ?┃
+		cfw:fchar-horizontal-line ?━
+		cfw:fchar-left-junction ?┣
+		cfw:fchar-right-junction ?┫
+		cfw:fchar-top-junction ?┯
+		cfw:fchar-top-left-corner ?┏
+		cfw:fchar-top-right-corner ?┓))
 #+END_SRC
 * mu4e
 only for gmail now
@@ -1670,7 +1664,7 @@ I like being evil. All package and custom bindings go here.
   :after evil
   :init
   (setq evil-collection-modes-list '(dired flycheck company which-key
-										   helm minibuffer mu4e ediff))
+										   helm minibuffer mu4e ediff magit))
   (setq evil-collection-setup-minibuffer t)
   :config
   (evil-collection-init))
diff --git a/init.el b/init.el
index 8e09ec9..b4338c7 100644
--- a/init.el
+++ b/init.el
@@ -19,7 +19,11 @@
  ;; 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.
- '(package-selected-packages
    (quote
-	(yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package typit systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))))
-(put 'dired-find-alternate-file 'disabled nil)
+	(magit yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package typit systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))))
+(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.
+ )