diff --git a/.config/.gitignore b/.config/.gitignore
new file mode 100644
index 0000000..111aa05
--- /dev/null
+++ b/.config/.gitignore
@@ -0,0 +1,43 @@
+.libreoffice/
+Empathy/
+GnuDiary/
+Trolltech.conf
+anjuta/
+audacious/
+autostart/
+awesome/
+banshee-1/
+chromium/
+dconf/
+desktop-couch/
+emelfm2/
+enchant/
+fehlstart/
+glade-3.conf
+gobby/
+google-chrome/
+gtk-2.0/
+gweled.conf
+gwibber/
+leafpad/
+libiphone/
+mc/
+menus/
+nitrogen/
+pDev/
+pytyle/
+rox*.sourceforge.net/
+sakura/
+sonata/
+sound-juicer/
+swfdec-mozilla.conf
+tint2/
+totem/
+transmission/
+twmn/
+tyrs/
+user-dirs.*
+vlc/
+xm1/
+xmms2/
+zim/
diff --git a/.gitignore b/.gitignore
index cd9f642..8ad68ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,100 @@
-*~
-*session.*
-*\#*
 *.dat
-local_*
+*.elc
+*.gpg
+*.log
+*.png
+*.pyc
+*.xml
+*\#*
+*history*
+*session.*
+*~
+.VirtualBox/
+.Xauthority
+.aMule/
+.abook/
+.annot/
+.appcfg_nag
+.arch-params/
+.bbdb
+.cache/
+.commitmsg
+.commitmsg.texi
+.conkeror.mozdev.org/
+.cups/
+.dbus/
+.dia/
+.dmenu_cache
+.dvdcss/
+.easytag/
+.emacs-jabber/
+.face
+.filezilla/
+.fltk/
+.fontconfig/
+.fonts/
+.freedroid_rpg/
+.gconfd/
+.gimp*
+.gitk
+.gnash/
+.gnofract4d
+.gnupg
+.gnuzilla/
+.gstreamer-0.10/
+.gtk-bookmarks
+.gtkrc*
+.htoprc
+.icedteaplugin/
+.icons/
+.ido.last
+.jabber-avatars/
+.kobodlrc
+.lesshst
+.links/
+.local/
+.lyrics/
+.mozilla
+.mpdscribble
+.muttdebug?
+.netrc
+.offlineimap/
+.pki/
+.pulse-cookie
+.pulse/
+.purple/
+.recently-used
+.sane
+.scummvm*
+.slocdata/
+.ssh/
+.subversion/
+.teamviewer/
+.themes
+.todo-*
+.toudou
+.tramp_history
+.type-break
+.viminfo
+.weechat/
+.xine/
+.zcompdump
+.zsnes/
+News/
+auto-save-list
+bin/
+development/
+documents/
+downloads/
 feeds
 fetchlog
+local_*
 log
-*.log
-*.elc
-auto-save-list
+music/
+org/
+pictures/
+public_html
+tmp/
+usr/
+var/
 xhtml-loader.rnc
-.commitmsg