diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..febccb6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.zsh diff
diff --git a/zsh/activate.zsh b/zsh/activate.zsh
index 92f9c4b..d7b7208 100644
--- a/zsh/activate.zsh
+++ b/zsh/activate.zsh
@@ -25,6 +25,7 @@ _CA__ACTIVATE() {
 	_CA__ACTIVATE_SOURCE_PATH $SOURCE_PATH
 
 	_CA__TMUX_WINDOW_RENAME $PROJECT
+	return 0
 }
 
 _CA__ACTIVATE_VIRTUAL_ENV() {
diff --git a/zsh/helpers.zsh b/zsh/helpers.zsh
index a3b896f..9dbaf3b 100644
--- a/zsh/helpers.zsh
+++ b/zsh/helpers.zsh
@@ -22,7 +22,7 @@ _CA__GET_FULL_PATH() {
 
 	local FULL_BASE_DIR=$(\
 		echo $CODE_ACTIVATOR__DIRS \
-			| sed 's/\s\+/\n/' \
+			| sed 's/\s\+/\n/g' \
 			| grep "^.*/$PROJECT_ROOT_SHORT$" \
 		)
 
diff --git a/zsh/settings.zsh b/zsh/settings.zsh
index 4ddb883..15b7de4 100644
--- a/zsh/settings.zsh
+++ b/zsh/settings.zsh
@@ -18,13 +18,13 @@ export CODE_ACTIVATOR__KNOWN_TARGETS=(
 
 #####################################################################
 
-[ ! $_CA__SOURCE_DIR_NAME  ] && export _CA__SOURCE_DIR_NAME='code'
-[ ! $_CA__VIRTUAL_ENV_NAME ] && export _CA__VIRTUAL_ENV_NAME='env'
-[ ! $_CA__CUSTOM_ENV_NAME  ] && export _CA__CUSTOM_ENV_NAME='custom-env'
-[ ! $_CA__NO_ENV_SENTINEL  ] && export _CA__NO_ENV_SENTINEL='no-env'
-[ ! $_CA__GIT_MAIN_BRANCH  ] && export _CA__GIT_MAIN_BRANCH='master'
+export _CA__SOURCE_DIR_NAME='code'
+export _CA__VIRTUAL_ENV_NAME='env'
+export _CA__CUSTOM_ENV_NAME='custom-env'
+export _CA__NO_ENV_SENTINEL='no-env'
+export _CA__GIT_MAIN_BRANCH='master'
 
-[ ! $_CA__CUSTOM_ENV_TEMPLATE ] && export _CA__CUSTOM_ENV_TEMPLATE="${0:a:h}/custom-env-template.zsh"
+export _CA__CUSTOM_ENV_TEMPLATE="${0:a:h}/custom-env-template.zsh"
 
 
 #####################################################################