diff --git a/init/core-keymaps.el b/init/core-keymaps.el
index c7c877385..7b861c17e 100644
--- a/init/core-keymaps.el
+++ b/init/core-keymaps.el
@@ -42,7 +42,7 @@
   "M"       'open-major-mode-conf
   "g"       'magit-status
   "/"       'imenu
-  "\\"      'toggle-speedbar
+  "\\"      'toggle-sidebar
   ";"       'helm-imenu
   ","       'ido-switch-buffer
   "="       'align-regexp
@@ -217,5 +217,11 @@
     (define-key ido-completion-map " " 'ido-exit-minibuffer)
     ))
 
+;; Preserve buffer-movement in emacs mode
+(emap (kbd "C-w h") 'evil-window-left)
+(emap (kbd "C-w l") 'evil-window-right)
+(emap (kbd "C-w j") 'evil-window-down)
+(emap (kbd "C-w k") 'evil-window-up)
+
 ;;
 (provide 'core-keymaps)
diff --git a/init/core-project.el b/init/core-project.el
index eebd28d98..f21c2d474 100644
--- a/init/core-project.el
+++ b/init/core-project.el
@@ -4,9 +4,9 @@
     helm               ; augments search of, well, anything
     grizzl             ; better searching engine for projectile
     ag                 ; the_silver_searcher support
-    sr-speedbar        ; speedbar, w/o the separate frame
     flx-ido            ; enhances ido's flex matching
     ido-vertical-mode  ; vertical listing for ido completion
+    project-explorer   ; sidebar for navigation project files
     ))
 
 ;;#dired
@@ -49,11 +49,14 @@
 (setq projectile-completion-system 'grizzl
       projectile-enable-caching t)
 
-;;#sr-speedbar
-(setq speedbar-use-images nil)
-
 (add-to-list 'ido-ignore-buffers "\\`\\*[^s].*\\*")
 (add-to-list 'ido-ignore-files "\\`.DS_Store\\'")
 
+;;#project-explorer
+(setq pe/width 24)
+(evil-set-initial-state 'project-explorer-mode 'emacs)
+(add-hook 'project-explorer-mode-hook
+          (lambda() (no-linum)))
+
 ;;
 (provide 'core-project)
diff --git a/init/core.el b/init/core.el
index cf584d64b..d1346f561 100644
--- a/init/core.el
+++ b/init/core.el
@@ -76,8 +76,7 @@
 
 (defun toggle-sidebar ()
   (interactive)
-  (sr-speedbar-toggle)
-  (sr-speedbar-refresh-turn-off))
+  (project-explorer-open))
 
 (defun major-mode-name ()
   (symbol-name major-mode))
@@ -96,6 +95,8 @@
   `(evil-define-key 'visual my-mode-map ,@body))
 (defmacro imap (&rest body)
   `(evil-define-key 'insert my-mode-map ,@body))
+(defmacro emap (&rest body)
+  `(evil-define-key 'emacs my-mode-map ,@body))
 
 ;; Global mapping
 (defmacro gmap (key command)