diff --git a/fish/config.fish b/fish/config.fish
index 68d2fd6..9af1330 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -6,54 +6,62 @@ set -x LC_ALL en_US.UTF-8
 set -x PYTHONIOENCODING UTF-8
 
 if test (uname) != "Darwin"
-        set -x TERM xterm-256color
+    set -x TERM xterm-256color
 end
 
+set -g theme_newline_cursor yes
+set -g theme_color_scheme zenburn
+set -g VIRTUAL_ENV_DISABLE_PROMPT 1
+
+set -xg WORKON_HOME /opt/envs
+set -xg MYPYPATH $HOME/.mypy
+
 # Aliases
 
 if test (uname) != "Darwin"
-        alias ls='ls --color=auto'
-        alias ll='ls -l'
-        alias la='ls -A'
-        alias l='ls -CF'
+    alias ls='ls --color=auto'
+    alias ll='ls -l'
+    alias la='ls -A'
+    alias l='ls -CF'
 
-        alias rm='rm -i --preserve-root'
+    alias rm='rm -i --preserve-root'
 else
-        alias rm='rm -i'
+    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 $PATH /Users/mcapelle/Applications/GNAT/bin
+    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 $PATH /Users/mcapelle/Applications/GNAT/bin
 end
 
 if test -e {$HOME}/Dev/python/libs
-        set -xg PYTHONPATH "$HOME/Dev/python/libs:$PYTHONPATH"
+    set -xg PYTHONPATH "$HOME/Dev/python/libs:$PYTHONPATH"
 end
 
 if test -e /usr/local/bin
     set -xg PATH $PATH /usr/local/bin
 end
 
-set -xg WORKON_HOME $HOME/envs
+set -xg PATH $PATH /opt/ibm/ILOG/CPLEX_Studio128/cpoptimizer/bin/x86-64_linux/
+set -xg PATH $PATH /opt/texlive/2019/bin/x86_64-linux/
 
 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
+    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
-                end
+        # 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
 
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
deleted file mode 100644
index 9c5e563..0000000
--- a/fish/functions/fish_prompt.fish
+++ /dev/null
@@ -1,78 +0,0 @@
-function fish_prompt --description 'Write out the prompt'
-
-    set -l last_status $status
-
-    # Just calculate these once, to save a few cycles when displaying the prompt
-    if not set -q __fish_prompt_hostname
-        set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
-    end
-
-    if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
-    end
-
-    if not set -q -g __fish_classic_git_functions_defined
-        set -g __fish_classic_git_functions_defined
-
-        function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
-            if status --is-interactive
-                set -e __fish_prompt_user
-                commandline -f repaint ^/dev/null
-            end
-        end
-
-        function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
-            if status --is-interactive
-                set -e __fish_prompt_host
-                commandline -f repaint ^/dev/null
-            end
-        end
-
-        function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
-            if status --is-interactive
-                set -e __fish_prompt_status
-                commandline -f repaint ^/dev/null
-            end
-        end
-    end
-
-    set -l delim '>'
-
-    switch $USER
-
-    case root
-
-        if not set -q __fish_prompt_cwd
-            if set -q fish_color_cwd_root
-                set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
-            else
-                set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-            end
-        end
-
-    case '*'
-
-        if not set -q __fish_prompt_cwd
-            set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-        end
-
-    end
-
-    set -l prompt_status
-    if test $last_status -ne 0
-        if not set -q __fish_prompt_status
-            set -g __fish_prompt_status (set_color $fish_color_status)
-        end
-        set prompt_status "$__fish_prompt_status [$last_status]$__fish_prompt_normal"
-    end
-
-    if not set -q __fish_prompt_user
-        set -g __fish_prompt_user (set_color $fish_color_user)
-    end
-    if not set -q __fish_prompt_host
-        set -g __fish_prompt_host (set_color $fish_color_host)
-    end
-
-    echo -n -s "$__fish_prompt_user" "$USER" "$__fish_prompt_normal" "$__fish_prompt_host" @ "$__fish_prompt_hostname" "$__fish_prompt_normal" ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_git_prompt) "$__fish_prompt_normal" "$prompt_status" "$delim" ' '
-
-end