diff --git a/emacs/.emacs b/emacs/.emacs
index 5ad0882..d275f2d 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -69,7 +69,9 @@
  '(shell-pop-window-position "top")
  '(shell-pop-window-size 20)
  '(show-trailing-whitespace t)
- '(tool-bar-mode nil))
+ '(tool-bar-mode nil)
+ '(org-directory "~/org")
+ '(org-agenda-files "~/org/agenda"))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -142,7 +144,9 @@
 
 ;; Org-mode
 (use-package org
-  :ensure t)
+  :ensure t
+  :config (progn
+            (global-set-key (kbd "<f12>") 'org-agenda)))
 
 ;; Evil-mode
 (defun my/evil-go-back ()
@@ -171,6 +175,15 @@
   (define-key evil-motion-state-map [mouse-1] 'silence)
   (setq-default evil-cross-lines t))
 
+;; (use-package evil-org
+;;   :ensure t
+;;   :after org
+;;   :config
+;;   (add-hook 'org-mode-hook 'evil-org-mode)
+;;   (add-hook 'evil-org-mode-hook
+;;             (lambda ()
+;;               (evil-org-set-key-theme))))
+
 (use-package projectile
   :ensure t
   :demand t
@@ -332,10 +345,10 @@
 (global-set-key (kbd "C-x <right>") 'windmove-right)
 
 ; New keys
-(global-set-key (kbd "<M-up>") 'windmove-up)
-(global-set-key (kbd "<M-down>") 'windmove-down)
-(global-set-key (kbd "<M-left>") 'windmove-left)
-(global-set-key (kbd "<M-right>") 'windmove-right)
+; (global-set-key (kbd "<M-up>") 'windmove-up)
+; (global-set-key (kbd "<M-down>") 'windmove-down)
+; (global-set-key (kbd "<M-left>") 'windmove-left)
+; (global-set-key (kbd "<M-right>") 'windmove-right)
 
 ; Whitespace mode toggle
 (global-set-key (kbd "C-c C-l") 'whitespace-mode)