diff --git a/.emacs.d/jlj-generic.el b/.emacs.d/jlj-generic.el
index b1fe0ec..5bafd38 100644
--- a/.emacs.d/jlj-generic.el
+++ b/.emacs.d/jlj-generic.el
@@ -122,37 +122,22 @@
   :ensure t
   :config
   (progn
+    (helm-mode 1)
+    (define-key global-map [remap find-file] 'helm-find-files)
+    (define-key global-map [remap occur] 'helm-occur)
+    (define-key global-map [remap list-buffers] 'helm-buffers-list)
+    (define-key global-map [remap dabbrev-expand] 'helm-dabbrev)
+    (define-key global-map [remap execute-extended-command] 'helm-M-x)
+    (define-key global-map [remap apropos-command] 'helm-apropos)
+    (unless (boundp 'completion-in-region-function)
+      (define-key lisp-interaction-mode-map [remap completion-at-point] 'helm-lisp-completion-at-point)
+      (define-key emacs-lisp-mode-map       [remap completion-at-point] 'helm-lisp-completion-at-point))
     (defun helm-surfraw-duck (x)
       "Search duckduckgo in default browser"
       (interactive "sSEARCH:")
       (helm-surfraw x "duckduckgo" ))
     (global-set-key (kbd "C-c s") 'helm-surfraw-duck)))
 
-(use-package smex
-  :ensure t
-  :config
-  (progn
-    (defadvice smex (around space-inserts-hyphen activate compile)
-      (let ((ido-cannot-complete-command
-	     `(lambda ()
-		(interactive)
-		(if (string= " " (this-command-keys))
-		    (insert ?-)
-		  (funcall ,ido-cannot-complete-command)))))
-	ad-do-it))
-
-    (global-set-key (kbd "M-x") 'smex)
-    (global-set-key (kbd "M-X") 'smex-major-mode-commands)
-    ;; This is your old M-x.
-    (global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)))
-
-(use-package ido-vertical-mode
-  :ensure t
-  :config
-  (ido-mode 1)
-  (ido-vertical-mode 1)
-  (setq ido-vertical-define-keys 'C-n-and-C-p-only))
-
 (use-package try
   :ensure t)
 
diff --git a/.emacs.d/jlj-org.el b/.emacs.d/jlj-org.el
index 0febd25..51bcefb 100644
--- a/.emacs.d/jlj-org.el
+++ b/.emacs.d/jlj-org.el
@@ -10,11 +10,13 @@
   :config
   (progn
     ;;Org mode configuration
+    (require 'ox)
     (require 'org)                                       ; Enable Org mode
-    (setq ispell-program-name "/usr/local/bin/ispell")   ; set flyspell's spellchecker
+    (setq ispell-program-name "/run/current-system/sw/bin/ispell")   ; set flyspell's spellchecker
     (add-hook 'org-mode-hook 'turn-on-flyspell)          ; enable flyspell-mode in all org-mode enabled files
     (setq org-src-fontify-natively t
 	  org-src-window-setup 'current-window
+	  org-export-in-background t
 	  org-src-strip-leading-and-trailing-blank-lines t
 	  org-src-preserve-indentation t
 	  org-src-tab-acts-natively t
@@ -121,7 +123,6 @@
 
 ;; configure org exporters
 (require 'ox-md)
-
 ;; org prettifiers
 (setq org-agenda-format-date (lambda (date) (concat "\n"
 						    (make-string (window-width) 9472)