diff --git a/.gitmodules b/.gitmodules
index 51442a9..4106e6c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "nvim/pack/syntaxes/start/emmet-vim"]
 	path = nvim/pack/syntaxes/start/emmet-vim
 	url = https://github.com/mattn/emmet-vim.git
+[submodule "nvim/pack/colors/start/onedark.vim"]
+	path = nvim/pack/colors/start/onedark.vim
+	url = https://github.com/joshdick/onedark.vim.git
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 835e919..18fe448 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -94,7 +94,6 @@
                 doom-themes-enable-italic t)
   (load-theme 'doom-monokai-spectrum t))
 
-
 ;; highlights the current line
 (use-package hlinum
   :ensure t
@@ -137,8 +136,25 @@
 (use-package helm
   :ensure t
   :config
+  (setq helm-M-x-fuzzy-match t)
+  (setq helm-buffers-fuzzy-matching t
+	helm-recent-fuzzy-match t)
   (global-set-key (kbd "M-x") 'helm-M-x)
-  (global-set-key (kbd "C-x C-f") 'helm-find-files))
+  (global-set-key (kbd "C-x C-f") 'helm-find-files)
+  )
+
+;; Project management
+(use-package projectile
+  :ensure t
+  :init
+  (projectile-mode +1)
+  :bind (:map projectile-mode-map
+	      ("s-p" . projectile-command-map)
+	      ("C-c p" . projectile-command-map))
+  )
+
+(use-package helm-projectile
+  :ensure t)
 
 ;; auto-pairs
 (electric-pair-mode 1)
@@ -178,8 +194,10 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(custom-safe-themes
+   '("835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" default))
  '(package-selected-packages
-   '(editorconfig diff-hl hlinum use-package rust-mode doom-themes auto-package-update)))
+   '(helm-projectile projectile editorconfig diff-hl hlinum use-package rust-mode doom-themes auto-package-update)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish
index bdeb5e5..0e41a54 100644
--- a/fish/conf.d/aliases.fish
+++ b/fish/conf.d/aliases.fish
@@ -1,7 +1,5 @@
-alias vim nvim
 alias open xdg-open
 alias cat 'bat --paging=never'
 alias less 'bat --paging=always'
 alias ls exa
 alias rcp 'rsync -rclh --progress --'
-
diff --git a/nvim/pack/colors/start/onedark.vim b/nvim/pack/colors/start/onedark.vim
new file mode 160000
index 0000000..ee4b22c
--- /dev/null
+++ b/nvim/pack/colors/start/onedark.vim
@@ -0,0 +1 @@
+Subproject commit ee4b22cbae8a3a434fad832bd89a6981c7c061af