diff --git a/emacs/init.el b/emacs/init.el
index 678165c..07f7343 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -345,11 +345,25 @@ you should place your code here."
                                  ("iedit-insert" "firebrick1" (bar . 2)))
         )
 
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; ORGMODE
+  ;; Define the orgmode directory explicitly
+  (custom-set-variables
+   '(org-directory "~/org"))
+  ;; Orgmode-downlaod: sane defaults dir
+  (setq-default org-download-image-dir "~/org/resources/")
+  ;; Enable word wrap
+  (add-hook 'org-mode-hook #'visual-line-mode)
+  ;; Orgmode: Enable md export
+  (eval-after-load "org" '(require 'ox-md nil t))
+  ;; Deft:    Set path to Org-mope Directory
+  (setq deft-directory "~/org/")
+
+
   ;; Load Custom user-config.el file.
   (when (file-readable-p (expand-file-name "user-config.el" dotspacemacs-directory))
     (load-file (expand-file-name "user-config.el" dotspacemacs-directory))
     )
-
   )
 
   )