diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index 367c0a4..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[user]
-	email = tran.tuan-dat@mailbox.org
-	name = TuDatTr
-[alias]
-	ls = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
-	stat = status
-	cd = git rev-parse --show-toplevel
-	ignore = update-index --assume-unchanged
-[core]
-	excludesfile = ~/.gitignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4042f71..d3a3935 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *~
 \#*\#
 *.log
-auto
\ No newline at end of file
diff --git a/.scripts/dotfiles.sh b/.scripts/dotfiles.sh
index 6eacb32..9d88a87 100755
--- a/.scripts/dotfiles.sh
+++ b/.scripts/dotfiles.sh
@@ -21,11 +21,6 @@ copy .config/i3/
 printf "\nCopying Termite configs...\n"
 copy .config/termite/
 
-# Git
-printf "\nCopying Git configs...\n"
-copy .gitignore
-copy .gitconfig
-
 # Scripts
 printf "\nCopying Scripts...\n"
 copy .scripts/
diff --git a/.zshrc b/.zshrc
index ea42501..9f5a6f5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,5 @@
 # Path to your oh-my-zsh installation.
-export ZSH=/home/tuan/.oh-my-zsh
+export ZSH=~/.oh-my-zsh
 
 # Set name of the theme to load. Optionally, if you set this to "random"
 # it'll load a random theme each time that oh-my-zsh is loaded.
diff --git a/README.md b/README.md
index b2d29b6..2394582 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 These are my personal dotfiles.
 I'm using:
 * [Manjaro i3](https://manjaro.org/2017/03/07/manjaro-i3-community-edition-17-0-released/)
+* [i3-gaps](https://github.com/Airblader/i3)
 * [GNU Emacs](https://www.gnu.org/software/emacs/)
 * [Z shell](http://zsh.sourceforge.net)
 * [Oh My Zsh](http://ohmyz.sh)
@@ -11,6 +12,7 @@ I'm using:
 2. Making an own conky, conky_maia-like
 3. Adding common keybindings of Emacs, i3 and aliases of zsh
 4. Improve the README.md or maybe make a wiki.
+5. Getting away from Manjaro i3 (?)
 
 ## Getting Started
 
diff --git a/Templates/kao b/Templates/kao
old mode 100755
new mode 100644