diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 0ad4756..97d6542 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -58,10 +58,26 @@
     diff = auto
     status = auto
     branch = auto
-    ui = true
+    interactive = auto
+    ui = auto
+[color "branch"]
+    current = green bold
+    local = green
+    remote = red bold
+[color "diff"]
+    meta = yellow bold
+    frag = magenta bold
+    old = red bold
+    new = green bold
+[color "status"]
+    added = green bold
+    changed = yellow bold
+    untracked = red
+[color "sh"]
+    branch = yellow
 [push]
-    # push to the upstream branch but only if it is the same name
-    default = simple
+    # push will only do the current branch, not all branches
+    default = current
 [branch]
     # set up 'git pull' to rebase instead of merge
     autosetuprebase = always
@@ -71,12 +87,5 @@
 [core]
     excludesfile = ~/.gitignore_global
     pager = less -FXRS -x2
-    editor = vim
-[apply]
-    # turn off trailing whitespace warning
-    whitespace = nowarn
-[mergetool]
-    # remove backup files after a successful merge
-    keepBackup = false
 [rerere]
 	enabled = false