diff --git a/conf.d/vars.fish b/conf.d/vars.fish
index 732ab33..3fd19a0 100644
--- a/conf.d/vars.fish
+++ b/conf.d/vars.fish
@@ -1,13 +1,17 @@
 
 # Theme setup
+set -g theme_show_exit_status yes
+
 set -g theme_newline_cursor clean
 set -g theme_newline_cursor_arrow_glyph no
-set -g theme_git_worktree_support yes
-set -g theme_display_hg yes
-set -g theme_show_exit_status yes
-# set -g theme_color_scheme dark
+#set -g theme_color_scheme dark
 set -U fish_color_autosuggestion 666
 
+# Disabled worktree (https://github.com/oh-my-fish/theme-bobthefish/issues/181)
+#set -g theme_git_worktree_support yes
+
+set -g theme_display_hg yes
+
 # Use locate for file and directory completion
 set -U FZF_FIND_FILE_COMMAND "command locate \$PWD | sed 's#'\$PWD/'##'"
 # set -U FZF_FIND_FILE_COMMAND "command pt -l ''"