diff --git a/install.sh b/install.sh
index 509f831..8fa2c95 100755
--- a/install.sh
+++ b/install.sh
@@ -38,6 +38,7 @@ LINKED_FILES_HOME=(
     ".config/compton"
     ".config/dconf"
     ".config/dunst"
+    ".config/git"
     ".config/gtk-3.0"
     ".config/htop"
     ".config/i3"
@@ -49,7 +50,6 @@ LINKED_FILES_HOME=(
     ".crontab"
     ".dircolors"
     ".env"
-    ".gitconfig"
     ".gtkrc-2.0.mine"
     ".gtkrc-2.0"
     ".keyleds"
@@ -120,7 +120,7 @@ do
 done
 
 print_header "Copy custom udev rules"
-for file in $SYSTEM_DIR/udev/rules.d/*.rules
+for file in ${SYSTEM_DIR}/udev/rules.d/*.rules
 do
     copy_udev_rule "${file}"
 done
diff --git a/system/.config/compton/compton.conf b/system/.config/compton/compton.conf
index 26453c5..7535944 100644
--- a/system/.config/compton/compton.conf
+++ b/system/.config/compton/compton.conf
@@ -1,5 +1,5 @@
 # SCRIPT NAME:
-# .config/compton.conf
+# .config/compton/compton.conf
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>
diff --git a/system/.gitconfig b/system/.config/git/config
similarity index 98%
rename from system/.gitconfig
rename to system/.config/git/config
index 4fdd915..1fa3d58 100644
--- a/system/.gitconfig
+++ b/system/.config/git/config
@@ -1,5 +1,5 @@
 # SCRIPT NAME:
-# .gitconfig
+# .config/git/config
 #
 # AUTHOR:
 # Severin Kaderli <severin.kaderli@gmail.com>