diff --git a/README.md b/README.md
index 2bcdd28..286abee 100644
--- a/README.md
+++ b/README.md
@@ -39,28 +39,17 @@ Install
 
 ```vim
 Plug 'luochen1990/rainbow'
-let g:rainbow_active = 1 "set to 0 if you want to enable it later via :RainbowToggle
 ```
 
 #### install manually:
 
-- first, execute the following commands (for windows users, use `~/vimfiles` instead of `~/.vim`)
-
-	```sh
-	git clone https://github.com/luochen1990/rainbow.git
-	cd rainbow
-	mkdir -p ~/.vim/plugin ~/.vim/autoload
-	cp plugin/* ~/.vim/plugin
-	cp autoload/* ~/.vim/autoload
-	```
-
-- second, add the follow sentences to your `.vimrc` or `_vimrc` :
-
-	```vim
-	let g:rainbow_active = 1 "set to 0 if you want to enable it later via :RainbowToggle
-	```
+```sh
+git clone --depth=1 https://github.com/luochen1990/rainbow.git ~/.vim/pack/rainbow
+```
 
-- third, restart your vim and enjoy coding.
+```vim
+packadd rainbow
+```
 
 Configure
 ---------
diff --git a/autoload/rainbow.vim b/opt/rainbow/autoload/rainbow.vim
similarity index 98%
rename from autoload/rainbow.vim
rename to opt/rainbow/autoload/rainbow.vim
index 10551c5..8b8504c 100644
--- a/autoload/rainbow.vim
+++ b/opt/rainbow/autoload/rainbow.vim
@@ -1,7 +1,5 @@
 " Copyright 2013 LuoChen (luochen1990@gmail.com). Licensed under the Apache License 2.0.
 
-if exists('s:loaded') | finish | endif | let s:loaded = 1
-
 fun s:trim(s)
 	return substitute(a:s, '\v^\s*(.{-})\s*$', '\1', '')
 endfun
diff --git a/autoload/rainbow_main.vim b/opt/rainbow/autoload/rainbow_main.vim
similarity index 100%
rename from autoload/rainbow_main.vim
rename to opt/rainbow/autoload/rainbow_main.vim
diff --git a/doc/rainbow.txt b/opt/rainbow/doc/rainbow.txt
similarity index 100%
rename from doc/rainbow.txt
rename to opt/rainbow/doc/rainbow.txt
diff --git a/opt/rainbow/plugin/rainbow_main.vim b/opt/rainbow/plugin/rainbow_main.vim
new file mode 100644
index 0000000..8bc03e2
--- /dev/null
+++ b/opt/rainbow/plugin/rainbow_main.vim
@@ -0,0 +1,7 @@
+" Copyright 2013 LuoChen (luochen1990@gmail.com). Licensed under the Apache License 2.0.
+
+command! RainbowToggle call rainbow_main#toggle()
+command! RainbowToggleOn call rainbow_main#load()
+command! RainbowToggleOff call rainbow_main#clear()
+
+autocmd Syntax,ColorScheme * RainbowToggleOn
diff --git a/plugin/rainbow_main.vim b/plugin/rainbow_main.vim
deleted file mode 100644
index 340ca20..0000000
--- a/plugin/rainbow_main.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-" Copyright 2013 LuoChen (luochen1990@gmail.com). Licensed under the Apache License 2.0.
-
-if exists('s:loaded') || !(exists('g:rainbow_active') || exists('g:rainbow_conf')) | finish | endif | let s:loaded = 1
-
-command! RainbowToggle call rainbow_main#toggle()
-command! RainbowToggleOn call rainbow_main#load()
-command! RainbowToggleOff call rainbow_main#clear()
-
-if (exists('g:rainbow_active') && g:rainbow_active)
-	auto syntax * call rainbow_main#load()
-	auto colorscheme * call rainbow_main#load()
-endif