diff --git a/lib/extensions/clojure/core.el b/lib/extensions/clojure/core.el
index 9f42748..9c71b6d 100644
--- a/lib/extensions/clojure/core.el
+++ b/lib/extensions/clojure/core.el
@@ -179,10 +179,10 @@
 (defun clojure-mode-init ()
   (interactive)
 
+  (require 'clojure-mode-extra-font-locking)
   (require 'cider)
   (require 'paredit)
 
-
   ;; indent [quiescent.dom :as d] specially
   (define-clojure-indent
     (d/a 1)
@@ -280,11 +280,9 @@
   (setq cider-prompt-for-symbol nil)
 
   ;; eldoc for clojure
-  (add-hook 'cider-mode-hook #'eldoc-mode)
-  (add-hook 'clojure-mode-hook #'paredit-mode)
   (add-hook 'cider-repl-mode-hook #'paredit-mode)
-  (add-hook 'paredit-mode-hook 'setup-keys)
-  (add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
+  (setup-keys)
+  (rainbow-delimiters-mode)
 
   (define-key clojure-mode-map (kbd "C-`") 'live-cycle-clj-coll)
   (define-key cider-repl-mode-map (kbd "<home>") nil)
diff --git a/lib/extensions/clojure/init.el b/lib/extensions/clojure/init.el
index 0719aaa..2902026 100644
--- a/lib/extensions/clojure/init.el
+++ b/lib/extensions/clojure/init.el
@@ -4,8 +4,16 @@
 (defun extensions/clojure-initialize ()
   ; Clojure development initialization
   (ability clojure-editor ('flycheck)
-           (add-hook 'clojure-mode-hook 'clojure-mode-init)
+           (require 'clojure-mode)
 
+           (add-to-list 'auto-mode-alist '("\\.clj$" . clojure-mode))
+           (add-to-list 'auto-mode-alist '("\\.cljc$" . clojurec-mode))
+           (add-to-list 'auto-mode-alist '("\\.cljs$" . clojurescript-mode))
+
+           (add-hook 'cider-mode-hook #'eldoc-mode)
+           (add-hook 'clojure-mode-hook #'paredit-mode)
+
+           (add-hook 'clojure-mode-hook 'clojure-mode-init)
            (setq tmp-directory (concat (getenv "HOME") "/.tmp")))
 
   (ability clojure-completion ('code-completion)
diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el
index e480280..ca44f30 100644
--- a/lib/extensions/editor/init.el
+++ b/lib/extensions/editor/init.el
@@ -84,20 +84,6 @@
   ;; Don't allow tab as indent
   (setq-default indent-tabs-mode nil)
 
-  (ability indent-guides ()
-           "Show guides for indentations in code."
-
-           (indent-guide-global-mode)
-
-           (ability recursive-indent-guides ()
-                    "Show recursive indents guides."
-                    (setq indent-guide-recursive t))
-
-           (ability delayed-indent-guides ()
-                    "Show indent guides with a delay."
-                    (setq indent-guide-delay 0.3)))
-
-
   (ability nlinum ()
            "Faster alternative to linum-mode"
            (require 'nlinum)
diff --git a/lib/extensions/ruby/init.el b/lib/extensions/ruby/init.el
index 53baf59..28828d9 100644
--- a/lib/extensions/ruby/init.el
+++ b/lib/extensions/ruby/init.el
@@ -30,11 +30,19 @@
                 (require 'rbenv)
                 (global-rbenv-mode))
 
+
+
   (ability indent-guide
            "Show indent guides."
            (add-hook 'ruby-mode-hook 'indent-guide-mode)
            (add-hook 'web-mode-hook 'indent-guide-mode)
-           (set-face-foreground 'indent-guide-face "#bbb"))
+           (ability recursive-indent-guides ()
+                    "Show recursive indents guides."
+                    (setq indent-guide-recursive t))
+
+           (ability delayed-indent-guides ()
+                    "Show indent guides with a delay."
+                    (setq indent-guide-delay 0.3)))
 
   (ability ruby-editor ('flycheck)
            "Gives FG42 the ability to edit ruby files."