diff --git a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
index 711b023d7..e261eb3ed 100644
--- a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
+++ b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
@@ -1,10 +1,7 @@
-BUILDBOT_PROJECT_PATH="$HOME/projects/buildbot/"
+BUILDBOT_PROJECT_PATH="$HOME/Projects/buildbot/"
 
 alias cdb='cd $BUILDBOT_PROJECT_PATH/main'
 alias cdp='cd $BUILDBOT_PROJECT_PATH'
-alias cdd='cd $HOME/projects/dev-tools'
-alias cdg='cd $HOME/projects/dev-tools/guake'
-alias cdg3='cd $HOME/projects/dev-tools/guake-gtk3'
 
 alias c='cactus'
 alias ci='cactus info'
@@ -54,24 +51,6 @@ alias cKcrcl='cactus kill ; cactus restart ; cactus log'
 alias cKcss='cactus kill ; cactus slaves restart'
 alias cKcssci='cactus kill ; cactus slaves restart ; cactus info'
 
-alias m='make'
-alias s='subl'
-alias a='atom'
-
-alias sagiy='sudo apt-get install -y'
-alias saguysaguy='sudo apt-get update -y ; sudo apt-get upgrade -y'
-alias saguysaguysagay='sudo apt-get update -y ; sudo apt-get upgrade -y && sudo apt-get autoremove -y'
-alias update-my-ubuntu='saguysaguysagay'
-alias update-to-next-version='do-release-upgrade'
-
-alias bing='notify-send "Stacked work finished" "Work being done in your favorite terminal is now finished. You can come back !!" -i /usr/share/pixmaps/apple-red.png -t 6000'
-alias b='bing'
-
-alias grinpy="grin -I '*.py'"
-alias grinyaml="grin -I '*.yaml'"
-alias grinsh="grin -I '*.sh'"
-alias grinlog="grin -I '*.log'"
-
 alias ssh_bbnext_sh='ssh sys_bbstage@buildbot-next.sh.intel.com'
 
 function bb_env()
@@ -101,8 +80,6 @@ function bb_envrestore()
     # export PS1=$__PS1BKP
 }
 
-alias autopep8_cur_directory='autopep8 --ignore=E501 -i **/*.py'
-
 function bb_repo_upload()
 {
     local REVIEWERS
diff --git a/custom/plugins/work-aliases/work-aliases.plugin.zsh b/custom/plugins/work-aliases/work-aliases.plugin.zsh
new file mode 100644
index 000000000..d542ba311
--- /dev/null
+++ b/custom/plugins/work-aliases/work-aliases.plugin.zsh
@@ -0,0 +1,5 @@
+
+alias cdd='cd $HOME/Projects/dev-tools'
+alias cdo='cd $HOME/Projects/dev-tools/oh-my-zsh'
+alias cdg='cd $HOME/Projects/dev-tools/guake'
+alias cdg3='cd $HOME/Projects/dev-tools/guake-gtk3'
diff --git a/dot_files/.gitconfig b/dot_files/.gitconfig
new file mode 100644
index 000000000..ae3fc670d
--- /dev/null
+++ b/dot_files/.gitconfig
@@ -0,0 +1,2 @@
+[include]
+    path = ~/.oh-my-zsh/dot_files/gitconfig
diff --git a/oh-my-zsh b/oh-my-zsh
new file mode 120000
index 000000000..c8d9a4148
--- /dev/null
+++ b/oh-my-zsh
@@ -0,0 +1 @@
+/home/renault/Projects/dev-tools/oh-my-zsh
\ No newline at end of file
diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 9e0e748c6..c31d25123 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -75,7 +75,25 @@ alias rm='rm -i'
 alias cp='cp -i'
 alias mv='mv -i'
 
+alias m='make'
+alias s='subl'
+alias a='atom'
+
 alias saguagu="sudo apt-get update && sudo apt-get upgrade"
+alias sagiy='sudo apt-get install -y'
+alias saguysaguy='sudo apt-get update -y ; sudo apt-get upgrade -y'
+alias saguysaguysagay='sudo apt-get update -y ; sudo apt-get upgrade -y && sudo apt-get autoremove -y'
+alias update-my-ubuntu='saguysaguysagay'
+alias update-to-next-version='do-release-upgrade'
+
+alias bing='notify-send "Stacked work finished" "Work being done in your favorite terminal is now finished. You can come back !!" -i /usr/share/pixmaps/apple-red.png -t 6000'
+alias b='bing'
+
+alias grinpy="grin -I '*.py'"
+alias grinyaml="grin -I '*.yaml'"
+alias grinsh="grin -I '*.sh'"
+alias grinlog="grin -I '*.log'"
+
 
 # Use Git’s colored diff when available
 hash git &>/dev/null
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 13e7063d6..bc3c2c68b 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -38,7 +38,7 @@ DISABLE_VENV_CD="true"
 plugins=(git2 python repo intel-repo cp buildbot rsync git-extras git-remote-branch\
          command-not-found debian dircycle encode64 lol extract launch_trial \
          vim-scp ufw sublime pylint pep8 autopep8 \
-         common-aliases buildbot_dev zsh-syntax-highlighting \
+         common-aliases work-aliases zsh-syntax-highlighting \
          tmux txw jump grin pip colored-man docker yocto tig \
          docker-rswl )
 
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 961ce0b24..9781a67ac 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -32,10 +32,10 @@ DISABLE_VENV_CD="true"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git2 python repo intel-repo cp buildbot rsync git-extras git-remote-branch\
+plugins=(git2 python repo cp buildbot rsync git-extras git-remote-branch\
          command-not-found debian dircycle encode64 lol extract launch_trial \
          vim-scp ufw sublime pylint pep8 autopep8 \
-         common-aliases buildbot_dev zsh-syntax-highlighting \
+         common-aliases work-aliases zsh-syntax-highlighting \
          txw jump grin pip colored-man osx tig brew)
 
 source $ZSH/oh-my-zsh.sh