diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
deleted file mode 100644
index 897de2a..0000000
--- a/.emacs.d/custom.el
+++ /dev/null
@@ -1,205 +0,0 @@
-;;; custom.el -- Face & Variable customization
-
-;;; Commentary:
-
-;; This file is mainly generated by Emacs' customize-* commands.
-
-;;; Code:
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; 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.
- '(compilation-scroll-output t)
- '(electric-pair-pairs (quote ((34 . 34) (123 . 125))))
- '(flycheck-c/c++-clang-executable "clang-3.8")
- '(flycheck-gcc-args (quote ("")))
- '(flycheck-gnat-include-path (quote (".")))
- '(flycheck-python-flake8-executable nil)
- '(package-selected-packages
-   (quote
-    (dockerfile-mode dired+ flycheck-pyflakes abyss-theme helm-projectile projectile ggtags ssh nlinum solarized-theme helm-flycheck helm-flyspell yaml-mode web-mode sr-speedbar sokoban smart-compile pythonic python-mode powerline poker php-mode openwith markdown-mode magit json-mode js-comint jedi javadoc-lookup java-snippets java-imports hydandata-light-theme helm-spotify helm-package helm-ls-git helm-bibtex flycheck-pos-tip flycheck-color-mode-line fish-mode diffview cython-mode company-web company-math company-jedi company-dict company-c-headers company-auctex ac-octave ac-math ac-c-headers 2048-game)))
- '(py-flake8-command "/usr/bin/python3 -m flake8")
- '(py-python-command "python3")
- '(safe-local-variable-values
-   (quote
-    ((eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/rapidjson/include/")
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/lib/build/include/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1271/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1271/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX"
-                 (concat "-I" root-path "/vendor/rapidjson/include/")
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/lib/build/include/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1271/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1271/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/rapidjson/include/")
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/lib/build/include/")
-                  "/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio127/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX"
-                 (concat "-I" root-path "/vendor/rapidjson/include/")
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/lib/build/include/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio127/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio127/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/lemon/include/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX" "-DIL_STD"
-                 (concat "-I" root-path "/lemon/include/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/vendor/tclap-tuple/include/")
-                  (concat root-path "/lib/inc/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX" "-DIL_STD")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX" "-DIL_STD"
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
-                 (concat "-I" root-path "/lib/inc/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/vendor/tclap-tuple/include/")
-                  (concat root-path "/lib/inc/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/vendor/tclap-tuple/include/")
-                  (concat root-path "/lib/inc")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX"
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
-                 (concat "-I" root-path "/lib/inc/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/rapidjson/include/")
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/lib/build/include/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX"
-                 (concat "-I" root-path "/vendor/rapidjson/include/")
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/lib/build/include/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-     (eval progn
-           (setq flycheck-clang-include-path
-                 (list
-                  (concat root-path "/vendor/tclap/include/")
-                  (concat root-path "/vendor/tclap-tuple/include/")
-                  "/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-           (setq flycheck-clang-args
-                 (quote
-                  ("-W" "-Wall" "-DS_CPLEX")))
-           (setq flycheck-clang-language-standard "c++14"))
-     (eval setq company-clang-arguments
-           (list "-std=c++14" "-DS_CPLEX"
-                 (concat "-I" root-path "/vendor/tclap/include/")
-                 (concat "-I" root-path "/vendor/tclap-tuple/include/")
-                 "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include"))
-     (eval set
-           (make-local-variable
-            (quote root-path))
-           (file-name-directory
-            (let
-                ((d
-                  (dir-locals-find-file ".")))
-              (if
-                  (stringp d)
-                  d
-                (car d)))))
-     (company-clang-arguments "-std=c++14" "-DS_CPLEX" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
-     (company-clang-arguments "-std=c++14" "-Iinclude")
-     (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/lns/vendor/rapidjson/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
-     (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/" "-I/opt/ibm/ILOG/CPLEX_Studio1263/cplex/include" "-I/opt/ibm/ILOG/CPLEX_Studio1263/concert/include")
-     (company-clang-arguments
-      ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/"))
-     (company-clang-arguments . clang-args)
-     (eval setq clang-args
-           ("-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/"))
-     (encoding . utf-8)
-     (company-clang-arguments "-std=c++14" "-I/home/mcapelle/Dev/cpp/include/" "-I/home/mcapelle/Dev/cpp/lns/lib/build/include/"))))
- '(tab-width 4))
-;; (custom-set-faces
-;;  ;; custom-set-faces was added by Custom.
-;;  ;; 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.
-;;  '(powerline-active1 ((t (:inherit nil :background "grey11" :foreground "white"))))
-;;  '(powerline-active2 ((t (:inherit nil :background "grey40" :foreground "white"))))
-;;  '(powerline-inactive1 ((t (:inherit nil :background "gray11" :foreground "white"))))
-;;  '(powerline-inactive2 ((t (:inherit nil :background "grey20" :foreground "white")))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; 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.
- '(flycheck-color-mode-line-warning-face ((t (:inherit flycheck-fringe-error :background "coral"))))
- '(flycheck-error-list-error ((t (:inherit font-lock-warning-face :background "white" :foreground "firebrick" :slant normal :weight bold :height 1.0 :width normal))))
- '(flycheck-error-list-warning ((t (:inherit warning))))
- '(flycheck-fringe-error ((t (:inherit font-lock-warning-face :background "firebrick" :foreground "white"))))
- '(flycheck-fringe-warning ((t (:inherit warning))))
- '(linum ((t (:inherit fringe :background "white" :foreground "gray"))))
- '(mmm-code-submode-face ((t (:background "white"))))
- '(mmm-default-submode-face ((t (:background "white"))))
- '(web-mode-doctype-face ((t (:foreground "darkgray"))))
- '(web-mode-html-attr-equal-face ((t (:inherit web-mode-html-attr-name-face :foreground "chocolate"))))
- '(web-mode-html-attr-name-face ((t (:foreground "chocolate"))))
- '(web-mode-html-attr-value-face ((t (:inherit font-lock-string-face :foreground "sea green"))))
- '(web-mode-html-tag-face ((t (:foreground "steel blue"))))
- '(whitespace-line ((t (:background "lightgray" :foreground "dark violet" :init font-lock-warning-face))))
- '(whitespace-space ((t (:foreground "gray")))))
-
-(provide 'custom)
-;;; custom.el ends here
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 5105521..5708307 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -35,6 +35,7 @@
   (scroll-bar-mode -1))
 (column-number-mode t)
 (line-number-mode t)
+(desktop-save-mode t)
 
 ;; Command rebinding
 
@@ -74,6 +75,11 @@
       (ansi-color-apply-on-region compilation-filter-start (point-max))))
   (add-hook 'compilation-filter-hook 'my-colorize-compilation-buffer))
 
+;; Retrieve PATH from fish shell
+(when (memq window-system '(mac ns x))
+  (setq exec-path-from-shell-shell-name "/usr/local/bin/fish")
+  (exec-path-from-shell-initialize))
+
 ;; Auto complete + Yasnippet
 
 (use-package sr-speedbar
diff --git a/.gitignore b/.gitignore
index 0517e96..e430bd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,14 @@
-.emacs.d/elpa
-.emacs.d/session.*
-.emacs.d/auto-save-list
-.emacs.d/ac-comphist.dat
+# Emacs file
 *~
-.emacs.d/tramp
-fish/fish_history
-fish/fishd.*
-/.emacs.d/elpa/*
-*.elc
-/.emacs.d/abbrev_defs
-/.emacs.d/semanticdb/!home!mcapelle!Dev!cpp!lns!lib!inc!semantic.cache
-/.emacs.d/semanticdb/!home!mcapelle!Dev!cpp!lns!lib!src!semantic.cache
+.emacs.d/custom.el
+.emacs.d/.python-environments
+.emacs.d/auto-save-list
+.emacs.d/elpa
+.emacs.d/projectile-bookmarks.eld
+.emacs.d/eshell/
+
+# Mac file
+**/.DS_Store
+
+# Fish
+fish/fishd.*
\ No newline at end of file
diff --git a/.oh-my-zsh b/.oh-my-zsh
index 291e96d..c3b072e 160000
--- a/.oh-my-zsh
+++ b/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 291e96dcd034750fbe7473482508c08833b168e3
+Subproject commit c3b072eace1ce19a48e36c2ead5932ae2d2e06d9
diff --git a/fish/config.fish b/fish/config.fish
index 3e2835a..ea5bbde 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,33 +1,53 @@
 # Fish configuration file
 
-set -x LC_ALL en_US.utf8
-set -x TERM xterm-256color
+set -x LC_CTYPE en_US.UTF-8
+set -x LC_ALL en_US.UTF-8
+
+set -x PYTHONIOENCODING UTF-8
+
+if test (uname) != "Darwin"
+        set -x TERM xterm-256color
+end
 
 # Aliases
-alias ls='ls --color=auto'
-alias ll='ls -l'
-alias la='ls -A'
-alias l='ls -CF'
 
-alias rm='rm -i --preserve-root'
+if test (uname) != "Darwin"
+        alias ls='ls --color=auto'
+        alias ll='ls -l'
+        alias la='ls -A'
+        alias l='ls -CF'
+
+        alias rm='rm -i --preserve-root'
+else
+        alias rm='rm -i'
+end
+
+if test (uname) = "Darwin"
+        set -xg PATH /usr/local/bin /usr/local/sbin $PATH
+        set -xg PATH /Library/Frameworks/Python.framework/Versions/3.5/bin $PATH
+        set -xg PATH /Users/mcapelle/Applications/GNAT/bin $PATH
+end
+
+if test -e {$HOME}/Dev/python/libs
+        set -xg PYTHONPATH "$HOME/Dev/python/libs:$PYTHONPATH"
+end
 
 if test -z "$MYSOFT_PATH"
 
-    set -xg MYSOFT_PATH {$HOME}/.softwares
+        set -xg MYSOFT_PATH {$HOME}/.softwares
 
-    if test -e $MYSOFT_PATH
-        set -xg PATH $PATH $MYSOFT_PATH/bin
-        set -xg PYTHONPATH "$MYSOFT_PATH/pythonlibs:$PYTHONPATH"
+        if test -e $MYSOFT_PATH
+                set -xg PATH $PATH $MYSOFT_PATH/bin
 
-        # GUROBI
-        if ls $MYSOFT_PATH | grep "gurobi" > /dev/null
-            set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1)
-            set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib"
-            set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
-            set -xg PATH $GUROBI_PATH/bin $PATH
-            #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH
+                # GUROBI
+                if ls $MYSOFT_PATH | grep "gurobi" > /dev/null
+                        set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1)
+                        set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib"
+                        set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
+                        set -xg PATH $GUROBI_PATH/bin $PATH
+                        #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH
+                end
         end
-    end
 
 end
 
diff --git a/fish/fishd b/fish/fishd
new file mode 100644
index 0000000..d72771a
--- /dev/null
+++ b/fish/fishd
@@ -0,0 +1,35 @@
+# This file is automatically generated by the fish.
+# Do NOT edit it directly, your changes will be overwritten.
+SET __fish_init_1_22_0:\x1d
+SET __fish_init_1_50_0:\x1d
+SET __fish_init_2_39_8:\x1d
+SET __fish_init_2_3_0:\x1d
+SET __prompt_initialized_2:\x1d
+SET fish_color_autosuggestion:555\x1eyellow
+SET fish_color_cancel:\x2dr
+SET fish_color_command:005fd7\x1epurple
+SET fish_color_comment:ff5f5f
+SET fish_color_cwd:green
+SET fish_color_cwd_root:red
+SET fish_color_end:brmagenta
+SET fish_color_error:red\x1e\x2d\x2dbold
+SET fish_color_escape:cyan
+SET fish_color_history_current:cyan
+SET fish_color_host:\x2do\x1ecyan
+SET fish_color_match:cyan
+SET fish_color_normal:normal
+SET fish_color_operator:cyan
+SET fish_color_param:00afff\x1ecyan
+SET fish_color_quote:brown
+SET fish_color_redirection:normal
+SET fish_color_search_match:\x2d\x2dbackground\x3dpurple
+SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_status:red
+SET fish_color_user:\x2do\x1egreen
+SET fish_color_valid_path:\x2d\x2dunderline
+SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x1b\x5b32mhelp\x1b\x5b30m\x1b\x28B\x1b\x5bm\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
+SET fish_key_bindings:fish_default_key_bindings
+SET fish_pager_color_completion:normal
+SET fish_pager_color_description:555\x1eyellow
+SET fish_pager_color_prefix:cyan
+SET fish_pager_color_progress:cyan
\ No newline at end of file
diff --git a/script.sh b/script.sh
index 8b29874..2e8f9c4 100755
--- a/script.sh
+++ b/script.sh
@@ -5,9 +5,9 @@ ln -f -s $(pwd)/.emacs.d  $HOME/
 
 # Shell configurations
 ln -f -s $(pwd)/.bashrc    $HOME/
-ln -f -s $(pwd)/.zshrc     $HOME/
-ln -f -s $(pwd)/.oh-my-zsh $HOME/
-ln -f -s $(pwd)/zsh-custom $HOME/.config/zsh-custom
+# ln -f -s $(pwd)/.zshrc     $HOME/
+# ln -f -s $(pwd)/.oh-my-zsh $HOME/
+# ln -f -s $(pwd)/zsh-custom $HOME/.config/zsh-custom
 ln -f -s $(pwd)/fish       $HOME/.config
 
 ln -f -s $(pwd)/alias.sh   $HOME/.config