diff --git a/common.toml b/common.toml
index f7016fc..0173dd3 100644
--- a/common.toml
+++ b/common.toml
@@ -32,9 +32,12 @@
 	cmds = [["@install", "tmux"]]
 	links = [[".zshrc", "config/tmux"]]
 
+[tasks.nano]
+	links = [[".nanorc", "config/nanorc"]]
+
 [tasks.git]
 	cmds = [["@install", "git"]]
-	templates = [[".gitconfig", "gitconfig"]]
+	templates = [[".gitconfig", "config/gitconfig"]]
 
 [tasks.zsh]
 	rejects = [["which", "zsh"]]
@@ -65,9 +68,8 @@
 		"automake",
 		"gcc"
 		]]
-
 [tasks.term]
-	cms = [
+	cmds = [
 		["wget", "https://raw.githubusercontent.com/thestinger/termite/master/termite.terminfo"],
 		["tic", "-x", "termite.terminfo"]
 	]
@@ -89,4 +91,4 @@
 ### Run
 ###
 [tasks.default]
-	deps = ["htop", "tmux", "git", "zsh", "dev", "vim", "golang", "ssh"]
+	deps = ["htop", "tmux", "git", "zsh", "dev", "vim", "golang", "ssh", "nano"]
diff --git a/gitconfig b/config/gitconfig
similarity index 100%
rename from gitconfig
rename to config/gitconfig
diff --git a/config/zshrc b/config/zshrc
index 84050d3..83c1263 100644
--- a/config/zshrc
+++ b/config/zshrc
@@ -15,7 +15,7 @@ ZSH_THEME="agnoster"
 # COMPLETION_WAITING_DOTS="true"
 
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
-HIST_STAMPS="yyy-mm-dd"
+HIST_STAMPS="yyyy-mm-dd"
 
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
@@ -104,11 +104,11 @@ encode64
 #gem
 git
 git-extras
-git-flow
-git-flow-avh
-git-hubflow
-git-prompt
-git-remote-branch
+#git-flow
+#git-flow-avh
+#git-hubflow
+#git-prompt
+#git-remote-branch
 #gitfast
 #github
 gitignore
@@ -311,8 +311,6 @@ alias ll='ls -ahl'
 alias fr='setxkbmap fr'
 alias us='setxkbmap us'
 
-
-
 status() {
     print ""
         print "Date..: "$(date "+%Y-%m-%d %H:%M:%S")""