diff --git a/elisp/extras.el b/elisp/extras.el
index 62799cb..fbab1f0 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -12,6 +12,7 @@
   (load-theme 'zenburn t))
 
 ;;R
+(use-package auto-complete)
 (use-package ess
   :config
   (load "~/.emacs.d/elisp/ess-setup.el"))
@@ -19,12 +20,13 @@
 ;;Javascript
 (use-package js2-mode
   :config
-  (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
-  ;better imenu
-  (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
-  (load "~/.emacs.d/elisp/javascript.el"))
-
+  (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)))
+(use-package js2-refactor)
+(use-package xref-js2)
 (use-package rjsx-mode)
+(use-package company)
+(use-package company-tern)
+(load "~/.emacs.d/elisp/javascript.el")
 
 ;;Typescript
 (use-package tide
@@ -55,16 +57,15 @@
   (load "~/.emacs.d/elisp/rust-setup.el"))
 
 ;;Org
-(use-package org
-  :config
-  (load "~/.emacs.d/elisp/org-setup.el"))
+(use-package org)
+(use-package org-ref)
+(load "~/.emacs.d/elisp/org-setup.el")
 
 ;; Ivy related stuff
 (use-package ivy)
 (use-package ivy-bibtex)
 (use-package counsel)
 (use-package swiper)
-
 (load "~/.emacs.d/elisp/ivy-setup.el")
 
 (load "~/.emacs.d/elisp/outline-keymap.el")
diff --git a/elisp/javascript.el b/elisp/javascript.el
index 45186b4..76802ed 100644
--- a/elisp/javascript.el
+++ b/elisp/javascript.el
@@ -2,10 +2,7 @@
 ;(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 
 ;; Better imenu
-;(add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
-
-(require 'js2-refactor)
-(require 'xref-js2)
+(add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
 
 (add-hook 'js2-mode-hook #'js2-refactor-mode)
 (js2r-add-keybindings-with-prefix "C-c C-r")
diff --git a/elisp/org-setup.el b/elisp/org-setup.el
index 7ed77f2..76cce4c 100644
--- a/elisp/org-setup.el
+++ b/elisp/org-setup.el
@@ -48,7 +48,7 @@
  '((C          . t)
    (js         . t)
    (emacs-lisp . t)
-   (eukleides  . t)
+   ;(eukleides  . t) TODO search for ob-eukleides
    (haskell    . t)
    (scheme     . t)
    (shell      . t)))