diff --git a/Xresources b/Xresources
index 7ce4884..81631ce 100644
--- a/Xresources
+++ b/Xresources
@@ -28,6 +28,46 @@
 #define S_base2         #eee8d5
 #define S_base3         #fdf6e3
 
+*background:            S_base03
+*foreground:            S_base00
+*fading:                40
+*fadeColor:             S_base03
+*cursorColor:           S_base1
+*pointerColorBackground:S_base01
+*pointerColorForeground:S_base1
+
+!! black dark/light
+*color0:                S_base02
+*color8:                S_base03
+!
+!!! red dark/light
+*color1:                S_red
+*color9:                S_orange
+!
+!!! green dark/light
+*color2:                S_green
+*color10:               S_base01
+!
+!!! yellow dark/light
+*color3:                S_yellow
+*color11:               S_base00
+!
+!!! blue dark/light
+*color4:                S_blue
+*color12:               S_base0
+!
+!!! magenta dark/light
+*color5:                S_magenta
+*color13:               S_violet
+!
+!!! cyan dark/light
+*color6:                S_cyan
+*color14:               S_base1
+!
+!!! white dark/light
+*color7:                S_base2
+*color15: S_base3
+
 ! Light
 ! #define S_base03        #fdf6e3
 ! #define S_base02        #eee8d5
@@ -47,7 +87,7 @@ URxvt.font:            xft:Hack-9:regular
 URxvt.boldFont:        xft:Hack-9:bold
 URxvt.italicfont:      xft:Hack-9:italic
 URxvt.bolditalicFont:  xft:Hack-9:bold:italic
-URxvt.letterSpace:     -2
+URxvt.letterSpace:     -1
 URxvt.perl-ext-common: default,matcher
 !,bell-command
 ! this setting assumes that the current browser is set correctly via update-alternatives
diff --git a/aliases.zsh b/aliases.zsh
index f9be3c5..6da5109 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -7,22 +7,23 @@ alias gzc='gzip --best --no-name'
 alias xzc='xz --best --extreme'
 alias halt='systemctl poweroff'
 alias reboot='systemctl reboot'
-
+#alias pyvenv='python3 -m venv'
 alias extip='curl -LR1fs --compressed https://ipinfo.io/ | jq -Sc'
 
 alias jjar='java -jar'
 
+alias td='todo.sh'
+alias todo='todo.sh'
+
 current_dist=`lsb_release -c -s`
 all_dkms_packages="`apt-cache rdepends --installed dkms | sed -rn 's/^ +([^ ]+)$/\1/p' | sort -iu`"
 
 if [ $use_sudo -eq 1 ];
 then
     alias adbu='sudo $apt_pref -t ${current_dist}-backports $apt_upgr'
-    alias aar='sudo apt-get --purge autoremove' #this command is only with apt-get
     alias drd='[ -n "$all_dkms_packages" ] && sudo dpkg-reconfigure $all_dkms_packages'
 else
     alias adbu='su -lc "$apt_pref -t ${current_dist}-backports $apt_upgr" root'
-    alias aar='su -lc "apt-get --purge autoremove" root' #this command is only with apt-get
     alias drd='[ -n "$all_dkms_packages" ] && su -lc "dpkg-reconfigure $all_dkms_packages" root'
 fi
 
diff --git a/curlrc b/curlrc
index 6b41118..bc00cc9 100644
--- a/curlrc
+++ b/curlrc
@@ -1,5 +1,5 @@
 capath = /etc/ssl/certs
-ciphers = HIGH:kEDH:-AES128:!3DES:!DES:!CAMELLIA128:!aNULL:!MD5:!SEED:!ECDH:!PSK:!DSS
+#ciphers = HIGH:kEDH:-AES128:!3DES:!DES:!CAMELLIA128:!aNULL:!MD5:!SEED:!ECDH:!PSK:!DSS
 tlsv1.2
 fail
 compressed
diff --git a/gitconfig b/gitconfig
index 8cba240..a065597 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,31 +1,32 @@
-[color]
-	ui = auto
-[credential]
-	helper = store
+[user]
+	name = Tobias Schmidl
+
+[alias]
+	author = !git-author
+	unique-author = !git-unique-author
+	bdiff = !git --no-pager diff
+
+[url "https://"]
+	insteadOf = http://
+
+[diff "image"]
+	command = /home/schtobia/bin/imgdiff
 
 [rebase]
-	autoStash = true
 	autoSquash = true
 
-[push]
-	default = simple
+[credential]
+	helper = store
 
 [diff]
 	renames = copies
 	renameLimit = 65536
 
-[branch "master"]
-	rebase = true
-
-[pull]
-	rebase = true
-
 [http]
 	sslCAPath = /etc/ssl/certs
 	sslVerify = true
-
-[core]
-	preloadindex = 1
+	sslversion = tlsv1.2
+	#sslVersion = tlsv1.2
 
 [merge]
 	renormalize = true
@@ -33,3 +34,26 @@
 
 [pack]
 	threads = 0
+
+[pull]
+	rebase = true
+
+[branch "master"]
+	rebase = true
+
+[core]
+	autocrlf = input
+
+[gitflow "branch"]
+	master = stable
+	develop = master
+
+[gitflow "prefix"]
+	feature = dev/
+
+[branch]
+	autosetuprebase = always
+[tig]
+	line-graphics = utf-8
+	tab-size = 4
+	blob-view = line-number:yes,interval=5 text
diff --git a/profile b/profile
index 39bf02a..4d3e69d 100644
--- a/profile
+++ b/profile
@@ -18,6 +18,7 @@ then
 	# set PATH so it includes user's private bin if it exists
 	[ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH"
 	[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
-
-	[ -f "$HOME/bin/set_environ.sh" ] && . "$HOME/bin/set_environ.sh";
 fi
+mkdir -p -m 0700 /run/shm/sslkeyexport
+export SSLKEYLOGFILE=/run/shm/sslkeyexport/keyexport
+
diff --git a/vimrc b/vimrc
index aae7bfe..79f302f 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,4 @@
+execute pathogen#infect()
 syntax enable
 if has('gui_running')
     set background=light
@@ -5,8 +6,6 @@ if has('gui_running')
 else
     set background=dark
 endif
-let g:solarized_hitrail=1
-"let g:solarized_termcolors=256
 colorscheme solarized
 call togglebg#map("<F5>")
 let load_doxygen_syntax = 1