diff --git a/README.md b/README.md
index 7c9857b..7e2b31a 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Config files for:
 * ranger
 * i3
 * vim
-* neovim
+* nvim
 
 
 ### Prompt
@@ -90,7 +90,7 @@ echo "Hello $USER!"
 ```bash
 git clone https://github.com/TheK4n/dotfiles
 cd dotfiles
-./install.sh
+./install install bash zsh ...
 ```
 
 
diff --git a/home/user/.config/nvim/lua/base/options.lua b/home/user/.config/nvim/lua/base/options.lua
index f11f36c..b582dd0 100644
--- a/home/user/.config/nvim/lua/base/options.lua
+++ b/home/user/.config/nvim/lua/base/options.lua
@@ -1,6 +1,7 @@
 local opt = vim.opt
 
 
+
 opt.ruler = true
 opt.encoding = 'utf-8'
 opt.fileencoding = 'utf-8'
@@ -96,11 +97,15 @@ opt.path:append { '**' } -- Finding files - Search down into subfolders
 
 
 vim.cmd([[
-    let &t_SI.="\e[5 q" "SI = режим вставки
-    let &t_SR.="\e[3 q" "SR = режим замены
-    let &t_EI.="\e[1 q" "EI = нормальный режим
+    let &t_SI.="\e[5 q"
+    let &t_SR.="\e[3 q"
+    let &t_EI.="\e[1 q"
 ]])
 
+-- SI - режим вставки
+-- SR - режим замены
+-- EI - нормальный режим
+
 
 vim.g.netrw_banner = 0 -- hide banner
 vim.g.netrw_liststyle = 3 -- tree instead of plain view
diff --git a/home/user/.zlogout b/home/user/.zlogout
new file mode 100644
index 0000000..60d70d9
--- /dev/null
+++ b/home/user/.zlogout
@@ -0,0 +1 @@
+[ -x /usr/bin/clear ] && /usr/bin/clear
diff --git a/install b/install
new file mode 100755
index 0000000..0b4a796
--- /dev/null
+++ b/install
@@ -0,0 +1,218 @@
+#!/bin/bash
+
+SANDBOX_PATH="/tmp/.dotfiles-install-$(date +%H-%M-%s)"
+TARGET_PATH="$HOME"
+
+
+SUB="$(pwd)/home/user"
+
+
+_die() {
+    echo "$0: $1" >&2
+    exit $2
+}
+
+test "$0" = "./install" || _die "Error: Please, run this file from root of dotfiles, like this './install.sh install TARGET" 1
+
+
+_die_if_installed() {
+    if [ -e "$1" ]; then
+        _die "Already installed" 1
+    fi
+}
+
+_link_files_in_sandbox() {
+    mkdir "$SANDBOX_PATH"
+    for target in "$@"; do
+        echo "installing: $target"
+        if [ ! "$(dirname "$target")" = "." ]; then
+            mkdir -p "$SANDBOX_PATH/$(dirname "$target")"
+        fi
+        ln -sT "$SUB/$target" "$SANDBOX_PATH/$target"
+    done
+}
+
+_compare_sandbox_to_home() {
+    local comparisons="$(diff -rq "$SANDBOX_PATH" "$TARGET_PATH")"
+    echo "$comparisons" | grep -vE "^Only in .+"
+}
+
+_merge_sandbox_to_home() {
+    cp -RTnP "$SANDBOX_PATH" "$TARGET_PATH"
+}
+
+__install_from_sandbox() {
+
+    local comparisons="$(_compare_sandbox_to_home)"
+
+    if [ -n "$comparisons" ]; then
+        echo "$comparisons" >&2
+        echo "Reverting..."
+        rm -rf "$SANDBOX_PATH"
+        _die "Found conflicting files. Exiting" 1
+    fi
+
+    echo "Merging to home..."
+    _merge_sandbox_to_home
+    rm -rf "$SANDBOX_PATH"
+}
+
+cmd_bash() {
+    _link_files_in_sandbox ".subbash" ".bashrc" ".profile"
+    __install_from_sandbox
+}
+
+cmd_zsh() {
+
+    _link_files_in_sandbox ".subbash" ".subzsh" ".zshrc" ".zprofile" ".zfunc" ".zlogout"
+
+    mkdir "$SANDBOX_PATH/.subzsh/plugins"
+    git clone https://github.com/zsh-users/zsh-autosuggestions     "$SANDBOX_PATH/.subzsh/plugins/zsh-autosuggestions"
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting "$SANDBOX_PATH/.subzsh/plugins/zsh-syntax-highlighting"
+    git clone https://github.com/hlissner/zsh-autopair             "$SANDBOX_PATH/.subzsh/plugins/hlissner/zsh-autopair"
+    git clone https://github.com/unixorn/fzf-zsh-plugin.git        "$SANDBOX_PATH/.subzsh/plugins/unixorn/fzf-zsh-plugin" && \
+        mkdir -p "$SANDBOX_PATH/.local/bin" && \
+        ln -s "$SANDBOX_PATH"/.subzsh/plugins/unixorn/fzf-zsh-plugin/bin/* "$SANDBOX_PATH/.local/bin"
+    __install_from_sandbox
+}
+
+
+cmd_tmux() {
+    _link_files_in_sandbox ".tmux.conf"
+    __install_from_sandbox
+}
+
+cmd_alacritty() {
+    _link_files_in_sandbox ".config/alacritty"
+    __install_from_sandbox
+}
+
+cmd_nvim() {
+    echo "sudo pacman -S npm ctags fzf glow; mkdir ~/.npm-global; npm config set prefix '~/.npm-global'"
+
+    _link_files_in_sandbox ".config/nvim" ".local/bin/vim_askpass_helper" ".local/bin/vim_askpass_helper_python"
+
+    git clone --depth 1 https://github.com/wbthomason/packer.nvim "$SANDBOX_PATH/.local/share/nvim/site/pack/packer/start/packer.nvim"
+    __install_from_sandbox
+    nvim +PackerCompile +PackerSync +PackerSync
+}
+
+cmd_ssh() {
+    cat "$SUB/.ssh/config" >> "$HOME/.ssh/config"
+}
+
+cmd_git() {
+    _link_files_in_sandbox ".gitconfig" ".githooks" ".gitignore"
+    __install_from_sandbox
+}
+
+cmd_ranger() {
+    echo "sudo pacman -S highlight ttf-joypixels noto-fonts-emoji ueberzug poppler"
+
+    _link_files_in_sandbox ".config/ranger"
+
+    mkdir -p "$SANDBOX_PATH/.config/ranger/plugins"
+    git clone https://github.com/alexanderjeurissen/ranger_devicons "$SANDBOX_PATH/.config/ranger/plugins/ranger_devicons"
+    __install_from_sandbox
+    ranger --copy-config=all
+}
+
+cmd_gpg() {
+    _die_if_installed "$HOME/.gnupg"
+
+    cat "$SUB/.gnupg/gpg.conf" >> "$HOME/.gnupg/gpg.conf"
+    echo -e "default-cache-ttl 1\nmax-cache-ttl 1" > "$HOME/.gnupg/gpg-agent.conf"; echo RELOADAGENT | gpg-connect-agent
+}
+
+cmd_i3() {
+    echo "sudo pacman -S nitrogen picom compton ttf-font-awesome xdotool xclip maim"
+    _link_files_in_sandbox ".config/i3" ".config/i3status" ".local/bin/i3status_wrapper"
+    __install_from_sandbox
+}
+
+cmd_bat() {
+    _link_files_in_sandbox ".config/bat"
+    __install_from_sandbox
+}
+
+cmd_ipython() {
+    local sub=".ipython"
+
+    _die_if_installed "$HOME/$sub"
+
+    mkdir -p "$HOME/$sub/profile_default"
+    ln -s "$SUB/$sub/profile_default/ipython_config.py" "$HOME/$sub/profile_default/ipython_config.py"
+}
+
+cmd_font() {
+    local sub="$HOME/.local/share/fonts"
+
+    mkdir -p "$sub"
+    cd "$sub"
+    wget 'https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip'
+    unzip FiraCode.zip -d "$sub"
+    git clone 'https://github.com/powerline/fonts.git' --depth=1
+    cd fonts
+    ./install.sh
+}
+
+cmd_termux() {
+    echo "apt install termux-api tsu"
+}
+
+cmd_arch() {
+    echo 'echo "ParallelDownloads = 5" >> /etc/pacman.conf'
+}
+
+cmd_psql() {
+    _link_files_in_sandbox ".psqlrc"
+    __install_from_sandbox
+}
+
+cmd_unlink() {
+    #####################################################
+    return 0
+}
+
+cmd_no_target() {
+    _die "TARGET not exists" 1
+}
+
+cmd_install() {
+    for target in "$@"; do
+        case "$target" in
+            bash) shift;       cmd_bash       "$@" ;;
+            zsh) shift;        cmd_zsh        "$@" ;;
+            tmux) shift;       cmd_tmux       "$@" ;;
+            alacritty) shift;  cmd_alacritty  "$@" ;;
+            nvim) shift;       cmd_nvim       "$@" ;;
+            ssh) shift;        cmd_ssh        "$@" ;;
+            git) shift;        cmd_git        "$@" ;;
+            ranger) shift;     cmd_ranger     "$@" ;;
+            gpg) shift;        cmd_gpg        "$@" ;;
+            i3) shift;         cmd_i3         "$@" ;;
+            bat) shift;        cmd_bat        "$@" ;;
+            font) shift;       cmd_font       "$@" ;;
+            termux) shift;     cmd_termux     "$@" ;;
+            arch) shift;       cmd_arch       "$@" ;;
+            psql) shift;       cmd_psql       "$@" ;;
+            *) shift;          cmd_no_target  "$@" ;;
+        esac
+    done
+}
+
+cmd_help() {
+    echo "Dotfiles installation script:
+Usage: ./install.sh install TARGET...
+Usage: ./install.sh unlink TARGET"
+}
+
+
+case "$1" in
+    install) shift;  cmd_install  "$@" ;;
+    unlink) shift;   cmd_unlink   "$@" ;;
+    help) shift;     cmd_help     "$@" ;;
+    *) shift;        cmd_help   "$@" ;;
+esac
+exit 0
+
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 757b479..0000000
--- a/install.sh
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-
-
-SUB="$(pwd)/home/user/"
-
-
-_die() {
-    echo "$1" >&2
-    exit $2
-}
-
-
-_die_if_installed() {
-    if [ -e "$1" ]; then
-        _die "Already installed" 1
-    fi
-}
-
-cmd_backup() {
-    mv ~/.bashrc ~/.bashrc.bak
-    mv ~/.zshrc ~/.zshrc.bak
-    mv ~/.vimrc ~/.vimrc.bak
-    mv ~/.vim ~/.vim.bak
-    mv ~/.subbash ~/.subbash.bak
-    mv ~/.subzsh ~/.subzsh.bak
-    mv ~/.tmux.conf ~/.tmux.conf.bak
-    mv ~/.gitconfig ~/.gitconfig.bak
-    mv ~/.gitignore ~/.gitignore.bak
-}
-
-cmd_bash() {
-    local sub=".subbash"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-    ln -s "$SUB/.bashrc" "$HOME/.bashrc"
-}
-
-cmd_zsh() {
-    local sub=".subzsh"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-    ln -s "$SUB/.zshrc" "$HOME/.zshrc"
-    ln -s "$SUB/.zfunc" "$HOME/.zfunc"
-    mkdir "$SUB/$sub/plugins"
-    git clone https://github.com/zsh-users/zsh-autosuggestions     "$SUB/$sub/plugins/zsh-autosuggestions"
-    git clone https://github.com/zsh-users/zsh-syntax-highlighting "$SUB/$sub/plugins/zsh-syntax-highlighting"
-    git clone https://github.com/hlissner/zsh-autopair             "$SUB/$sub/plugins/hlissner/zsh-autopair"
-    git clone https://github.com/unixorn/fzf-zsh-plugin.git        "$SUB/$sub/plugins/unixorn/fzf-zsh-plugin" && \
-        ln -s ~/.subzsh/plugins/unixorn/fzf-zsh-plugin/bin/* ~/.local/bin/
-}
-
-cmd_tmux() {
-    ln -s "$SUB/.tmux.conf" "$HOME/.tmux.conf"
-}
-
-cmd_alacritty() {
-    local sub=".config/alacritty"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-}
-
-cmd_nvim() {
-    echo "sudo pacman -S npm ctags fzf glow; mkdir ~/.npm-global; npm config set prefix '~/.npm-global'"
-
-    ln -s "$SUB/.config/nvim" "$HOME/.config/nvim"
-    mkdir -p "$HOME/.local/bin"
-    ln -s "$SUB"/.local/bin/* "$HOME/.local/bin"
-    git clone --depth 1 https://github.com/wbthomason/packer.nvim "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim"
-    nvim +PackerCompile +PackerSync +PackerSync
-}
-
-cmd_ssh() {
-    cat "$SUB/.ssh/config" >> "$HOME/.ssh/config"
-}
-
-cmd_git() {
-    ln -s "$SUB/.gitconfig" "$HOME/.gitconfig"
-    ln -s "$SUB/.gitignore" "$HOME/.gitignore"
-    ln -s "$SUB/.githooks" "$HOME/.githooks"
-}
-
-cmd_ranger() {
-    echo "sudo pacman -S highlight ttf-joypixels noto-fonts-emoji ueberzug poppler"
-
-    local sub=".config/ranger"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-    mkdir -p "$SUB/$sub/plugins"
-    git clone https://github.com/alexanderjeurissen/ranger_devicons "$SUB/$sub/plugins/ranger_devicons"
-    ranger --copy-config=all
-}
-
-cmd_gpg() {
-    _die_if_installed "$HOME/.gnupg"
-
-    cat "$SUB/.gnupg/gpg.conf" >> "$HOME/.gnupg/gpg.conf"
-    echo -e "default-cache-ttl 1\nmax-cache-ttl 1" > "$HOME/.gnupg/gpg-agent.conf"; echo RELOADAGENT | gpg-connect-agent
-}
-
-_install_i3status() {
-    local sub=".config/i3status"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-}
-
-_install_i3() {
-    local sub=".config/i3"
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-}
-
-cmd_i3() {
-    echo "sudo pacman -S nitrogen picom compton ttf-font-awesome xdotool xclip maim"
-
-    _install_i3
-    _install_i3status
-}
-
-cmd_bat() {
-    local sub=".config/bat"
-    
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-}
-
-cmd_ipython() {
-    local sub=".ipython"
-
-    _die_if_installed "$HOME/$sub"
-
-    mkdir -p "$HOME/$sub/profile_default"
-    ln -s "$SUB/$sub/profile_default/ipython_config.py" "$HOME/$sub/profile_default/ipython_config.py"
-}
-
-cmd_font() {
-    local sub="$HOME/.local/share/fonts"
-
-    mkdir -p "$sub"
-    cd "$sub"
-    wget 'https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip'
-    unzip FiraCode.zip -d "$sub"
-    git clone 'https://github.com/powerline/fonts.git' --depth=1
-    cd fonts
-    ./install.sh
-}
-
-cmd_termux() {
-    echo "apt install termux-api tsu"
-}
-
-cmd_arch() {
-    echo 'echo "ParallelDownloads = 5" >> /etc/pacman.conf'
-}
-
-cmd_psql() {
-    local sub=".psqlrc"
-
-    _die_if_installed "$HOME/$sub"
-
-    ln -s "$SUB/$sub" "$HOME/$sub"
-}
-
-cmd_unlink() {
-#####################################################
-return 0
-}
-
-cmd_install() {
-    case "$1" in
-        bash) shift;           cmd_bash    "$@" ;;
-        zsh) shift;            cmd_zsh    "$@" ;;
-        tmux) shift;           cmd_tmux    "$@" ;;
-        alacritty) shift;      cmd_alacritty    "$@" ;;
-        nvim) shift;           cmd_nvim    "$@" ;;
-        ssh) shift;            cmd_ssh    "$@" ;;
-        git) shift;            cmd_git    "$@" ;;
-        ranger) shift;         cmd_ranger    "$@" ;;
-        gpg) shift;            cmd_gpg    "$@" ;;
-        i3) shift;             cmd_i3    "$@" ;;
-        bat) shift;            cmd_bat    "$@" ;;
-        font) shift;           cmd_font    "$@" ;;
-        termux) shift;         cmd_termux    "$@" ;;
-        arch) shift;           cmd_arch    "$@" ;;
-        psql) shift;           cmd_psql    "$@" ;;
-    esac
-}
-
-cmd_help() {
-
-    echo "Dotfiles installation script:
-Usage: ./install.sh install (target)
-Usage: ./install.sh unlink (target)
-Usage: ./install.sh install-functions
-
-targets:
- - bash
- - zsh
- - tmux
- - alacritty
- - nvim
- - ssh
- - git
- - ranger
- - gpg
- - i3
- - bat
- - font
- - termux
- - arch
- - psql
-"
-
-}
-
-
-case "$1" in
-    help) shift;                 cmd_help              "$@" ;;
-    install) shift;              cmd_install           "$@" ;;
-    unlink) shift;               cmd_unlink            "$@" ;;
-esac
-exit 0
-