diff --git a/.bash_aliases b/.bash_aliases
index 375a1b3..03d4722 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,12 +1,12 @@
 # some more ls aliases
 alias ll='ls -l'
-alias la='ls -A'
+alias la='ls -l'
 alias l='ls -CF'
 
 alias ..='cd ..'
 alias ...='cd ../..'
 
-alias rm='rm -i'
+alias rm='rm -I'
 alias mv='mv -i'
 alias cp='cp -i'
 
diff --git a/.gtk-bookmarks b/.gtk-bookmarks
index d2e4f61..aab76e8 100644
--- a/.gtk-bookmarks
+++ b/.gtk-bookmarks
@@ -4,4 +4,10 @@ file:///home/stv0g/Bilder
 file:///home/stv0g/Videos
 file:///home/stv0g/Downloads
 davs://sv111090@www2.elearning.rwth-aachen.de/ss12/12ss-06119/materials/documents L²P Info 4
-sftp://steffen@appserver.fset.rwth-aachen.de/ FSET appserver
+ftp://stv0g@styx/home/stv0g styx
+ftp://stv0g@sea/home/stv0g sea
+sftp://stv0g@lux/home/stv0g lux
+sftp://stv0g@lux/dropbox/Dropbox dropbox
+ftp://ryl@0l.de/home/ryl
+sftp://steffen@appserver.fset.rwth-aachen.de/ appserver
+
diff --git a/.pbuilderrc b/.pbuilderrc
new file mode 100644
index 0000000..5665e31
--- /dev/null
+++ b/.pbuilderrc
@@ -0,0 +1,25 @@
+# generic pbuilder configuration
+DIR=/home/stv0g/pbuilder
+BUILDPLACE=$DIR/build/
+BUILDRESULT=$DIR/result
+
+MIRRORSITE=http://ftp.de.debian.org/debian
+OTHERMIRROR="deb http://packages.0l.de/debian/ testing main"
+
+APTCACHEHARDLINK=no
+DISTRIBUTION=testing
+APTKEYRINGS=/home/stv0g/.gnupg/pubring.gpg
+
+if [ "$ARCHITECTURE" = "armel" ]; then
+	KERNEL_VERSION=3.2.0-4-versatile
+
+	BASEPATH=$DIR/arch/$ARCHITECTURE/base.qemu
+	INITRD=$DIR/arch/$ARCHITECTURE/initrd.img-$KERNEL_VERSION
+	KERNEL_IMAGE=$DIR/arch/$ARCHITECTURE/vmlinuz-$KERNEL_VERSION
+
+	MEMORY_MEGS=1024
+else
+	BASETGZ=$DIR/arch/$ARCHITECTURE/base.tgz
+fi
+
+
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..4f377be
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,74 @@
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" General
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" Vim Modus statt Vi Modus verwenden
+set nocompatible
+
+" Sets how many lines of history VIM has to remember
+set history=1000
+
+" Enable filetype plugins
+filetype plugin on
+filetype indent on
+
+" automatisches Indenting aktivieren
+set ai
+
+" Smart Indenting aktivieren
+set si
+
+" Set to auto read when a file is changed from the outside
+set autoread
+
+" Always show current position
+set ruler
+set cursorline
+
+" Enable line numbers
+set number
+
+" Height of the command bar
+set cmdheight=2
+
+" Ignore case when searching
+set ignorecase
+
+" When searching try to be smart about cases 
+set smartcase
+
+" Highlight search results
+set hlsearch
+
+" Makes search act like search in modern browsers
+set incsearch
+
+" Don't redraw while executing macros (good performance config)
+set lazyredraw
+
+" For regular expressions turn magic on
+set magic
+
+" Show matching brackets when text indicator is over them
+set showmatch
+
+" Show commands in status bar
+set showcmd
+
+" How many tenths of a second to blink when matching brackets
+set mat=4
+
+" Enable syntax highlighting
+syntax enable
+
+colorscheme desert
+set background=dark
+
+" Set utf8 as standard encoding and en_US as the standard language
+set encoding=utf8
+
+" Use Unix as the standard file type
+set ffs=unix,dos,mac
+
+" Enable mouse support in all modi
+set mouse=a