diff --git a/init.el b/init.el
index b8491a8..afb52b9 100644
--- a/init.el
+++ b/init.el
@@ -102,9 +102,6 @@
 (setq custom-file (concat user-emacs-directory "custom.el"))
 
 ;;;;;;;;;;;;;;;;;;;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; ;; Next/Previous buffer
-;; (global-set-key (kbd "C-c <left>") 'previous-buffer)
-;; (global-set-key (kbd "C-c <right>") 'next-buffer)
 ;; Scroll in other window
 (global-set-key (kbd "S-<prior>") 'scroll-other-window-down)
 (global-set-key (kbd "S-<next>") 'scroll-other-window)
@@ -296,11 +293,12 @@
 ;; Theme
 (unless slow-computer
   (use-package doom-themes
-    :after all-the-icons
+    :after (all-the-icons neotree)
     :config
     (load-theme 'doom-molokai t)
-    (doom-themes-neotree-config)))
-
+    (doom-themes-neotree-config)
+    :custom
+    (doom-neotree-file-icons 'icons)))
 ;; Modeline
 (use-package doom-modeline
   :after all-the-icons
@@ -313,15 +311,19 @@
 (global-hl-line-mode t)
 (global-display-line-numbers-mode)
 (size-indication-mode)
-(setq show-trailing-whitespace t)
+(setq show-trailing-whitespace t) ; Doesn't work with fill-column-indicator
 (show-paren-mode t)
 
 ;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Directory tree
 (use-package neotree
   :demand t
-  :config
-  (setq neo-smart-open t)
+  :after all-the-icons
+  :custom
+  (neo-smart-open t)
+  (neo-show-updir-line t)           ; Disabled by doom-themes?
+  (neo-window-width 30)
+  ;; (setq neo-theme (if (display-graphic-p) 'icons 'arrow))
   :bind
   ("<f8>" . neotree-toggle))
 
@@ -388,13 +390,13 @@
 
     ;; I have to define these 2 times, don't know why.
     (set-face-attribute 'tabbar-selected nil
-                        :background "#333638"
-                        :foreground "LightGray"
+                        :background "gray11"
+                        :foreground "light gray"
                         :family "Sans Serif"
                         :bold t)
     (set-face-attribute 'tabbar-unselected nil
-                        :background "#1C1E1F"
-                        :foreground "DarkGray"
+                        :background "gray18"
+                        :foreground "dark gray"
                         :family "Sans Serif"
                         :italic t)
     :bind
@@ -403,13 +405,13 @@
     :custom-face
     ;; I Have to define these 2 times, don't know why.
     (tabbar-selected (nil
-                      :background "#333638"
-                      :foreground "LightGray"
+                      :background "gray11"
+                      :foreground "light gray"
                       :family "Sans Serif"
                       :bold t))
     (tabbar-unselected (nil
-                        :background "#1C1E1F"
-                        :foreground "DarkGray"
+                        :background "gray18"
+                        :foreground "dark gray"
                         :family "Sans Serif"
                         :italic t))))
 
@@ -418,7 +420,7 @@
   :config
   (delete 'newline-mark whitespace-style)
   :bind
-  ("C-C w" . 'whitespace-mode))
+  ("C-c w" . 'whitespace-mode))
 
 ;; Spell checking
 (use-package flyspell
diff --git a/server/server b/server/server
index 9df43c3..bda8bf3 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 20353
+127.0.0.1:51313 17125
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file