diff --git a/modules/siren-coffee.el b/modules/siren-coffee.el
index 177a47f..cf41f3d 100644
--- a/modules/siren-coffee.el
+++ b/modules/siren-coffee.el
@@ -7,11 +7,10 @@
 ;;; Code:
 
 (require 'siren-programming)
+(siren-require-packages '(coffee-mode))
 
 (eval-after-load 'coffee-mode
   '(progn
-     (siren-require-packages '(coffee-mode))
-
      (setq coffee-tab-width 2)
 
      ;; remove the "Generated by CoffeeScript" header
diff --git a/modules/siren-cucumber.el b/modules/siren-cucumber.el
index 6c40694..781e4b2 100644
--- a/modules/siren-cucumber.el
+++ b/modules/siren-cucumber.el
@@ -13,7 +13,7 @@
 (defun siren-feature-mode-defaults ()
   (siren-prog-mode-defaults)
   (setq tab-width 2)
-  (setq highlight-indentation-offset 2)
+  (highlight-indentation-set-offset 2)
   (highlight-indentation-mode)
   (highlight-indentation-current-column-mode))
 
diff --git a/modules/siren-go.el b/modules/siren-go.el
index 43eb3be..0246efd 100644
--- a/modules/siren-go.el
+++ b/modules/siren-go.el
@@ -7,6 +7,7 @@
 ;;; Code:
 
 (require 'siren-programming)
+(siren-require-packages '(go-mode company-go go-eldoc go-projectile gotest))
 
 (setenv "GOPATH" (expand-file-name "~/.go"))
 
@@ -17,9 +18,6 @@
 
 (eval-after-load 'go-mode
   '(progn
-     (siren-require-packages
-      '(go-mode company-go go-eldoc go-projectile gotest))
-
      (require 'go-projectile)
      (require 'company-go)
 
diff --git a/modules/siren-haml.el b/modules/siren-haml.el
index 1968cb0..a511166 100644
--- a/modules/siren-haml.el
+++ b/modules/siren-haml.el
@@ -15,7 +15,7 @@
 (defun siren-haml-mode-defaults ()
   (siren-prog-mode-defaults)
   (setq tab-width 2)
-  (setq highlight-indentation-offset 2)
+  (highlight-indentation-set-offset 2)
   (highlight-indentation-mode)
   (highlight-indentation-current-column-mode))
 
diff --git a/modules/siren-js.el b/modules/siren-js.el
index dc80ad1..b519f4e 100644
--- a/modules/siren-js.el
+++ b/modules/siren-js.el
@@ -1,8 +1,8 @@
-;;; siren-js.el --- jimeh's Emacs Siren: js-mode configuration.
+;;; siren-js.el --- jimeh's Emacs Siren: js2-mode configuration.
 
 ;;; Commentary:
 
-;; Basic configuration for js-mode.
+;; Basic configuration for js2-mode.
 
 ;;; Code:
 
diff --git a/modules/siren-makefile.el b/modules/siren-makefile.el
index bff8f12..c1aeabb 100644
--- a/modules/siren-makefile.el
+++ b/modules/siren-makefile.el
@@ -14,7 +14,7 @@
   (siren-prog-mode-defaults)
   (subword-mode)
   (setq tab-width 4)
-  (setq highlight-indentation-offset 4)
+  (highlight-indentation-set-offset 4)
   (highlight-indentation-mode)
   (highlight-indentation-current-column-mode))
 
diff --git a/modules/siren-neotree.el b/modules/siren-neotree.el
index 8d35b35..8832cd1 100644
--- a/modules/siren-neotree.el
+++ b/modules/siren-neotree.el
@@ -13,6 +13,7 @@
 
 (setq neo-show-hidden-files t)
 (setq neo-smart-open nil)
+(setq neo-dont-be-alone t)
 (setq neo-theme (quote nerd))
 (setq neo-window-width 54)
 
diff --git a/siren-modules.el b/siren-modules.el
index 2a3ef8e..d8fb521 100644
--- a/siren-modules.el
+++ b/siren-modules.el
@@ -34,9 +34,9 @@
 
 ;; Project management
 (require 'siren-projectile)
+;; (require 'siren-neotree)
 (require 'siren-project-explorer)
 (require 'siren-ecb) ;; evil and slows down all of emacs
-;; (require 'siren-neotree)
 
 ;; Workspace management
 (require 'siren-escreen)