diff --git a/home/.bash_aliases b/home/.bash_aliases
index f342d19..dbd8d92 100644
--- a/home/.bash_aliases
+++ b/home/.bash_aliases
@@ -111,12 +111,9 @@ function aws() {
 }
 
 function restic() {
-	local PASS=$(pass providers/aws)
 	local RESTIC=$(which restic)
 
 	# Start original restic executable with short-lived keys
-	AWS_ACCESS_KEY_ID=$(sed -En 's/^Access-Key: (.*)/\1/p' <<< "$PASS")	\
-	AWS_SECRET_ACCESS_KEY=$(sed -En 's/^Secret-Key: (.*)/\1/p' <<< "$PASS")	\
 	RESTIC_PASSWORD="$(pass restic)"					\
 		$RESTIC $@
 }
diff --git a/home/.bash_env b/home/.bash_env
index 731fe01..f388424 100644
--- a/home/.bash_env
+++ b/home/.bash_env
@@ -1,21 +1,19 @@
-export GOPATH=~/build/go/
+export GOPATH=~/build/go
+
+source $HOME/.cargo/env
 
 if [ -d ~/bin ]; then
 	export PATH=$PATH:~/bin/scripts:~/bin
 fi
 
 if [ -d $GOPATH/bin ]; then
-	export PATH=$PATH:$GOPATH/bin
+	export PATH=$GOPATH/bin:$PATH
 fi
 
 # OS X stuff if availabe
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	if [ -d /opt/local/bin ]; then
-		export PATH=/opt/local/bin:$PATH
-	fi
-
-	if [ -d /opt/local/sbin/ -a "$(id -u)" -eq "0" ]; then
-		export PATH=/opt/local/sbin:$PATH
+		export PATH=/opt/local/bin:/opt/local/sbin:$PATH
 	fi
 
 	if [ -d /opt/local/libexec/gnubin ]; then
@@ -42,12 +40,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 		export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH
 	fi
 
-	if [ -d ]/opt/local/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/ ]; then
-		export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/:$PYTHONPATH
-	fi
-	
-	if [ -d /opt/local/lib/python/site-packages ]; then
-		export PYTHONPATH=/opt/local/lib/python/site-packages:$PYTHONPATH
+	if [ -d /opt/local/Library/Frameworks/Python.framework/Versions/3.5/bin ]; then
+		export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/3.5/bin:$PATH
 	fi
 fi
 
@@ -65,13 +59,13 @@ else
 	export EDITOR=vim
 fi
 
-if [ -d /Volumes/OS\ X/Docker/ ]; then
-	export MACHINE_STORAGE_PATH="/Volumes/OS X/Docker/"
-fi
-export MACHINE=default
-
 export RESTIC_REPOSITORY="sftp://lian.wg.0l.dn42//overlay/lower/data4/Backup/Restic/"
 export DEBEMAIL="post@steffenvogel.de"
 export DEBFULLNAME="Steffen Vogel"
 
 export DROPBOX=/Volumes/Extern/Sync/Dropbox
+
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+
+export GRC_BLOCKS_PATH=/usr/local/share/gnuradio/grc/blocks/
diff --git a/home/.bash_profile b/home/.bash_profile
index 865116d..7306359 100644
--- a/home/.bash_profile
+++ b/home/.bash_profile
@@ -1,14 +1,3 @@
-# if running bash
-if [ -n "$BASH_VERSION" ] &&  [ -f "$HOME/.bashrc" ]; then
+if [ -f "$HOME/.bashrc" ]; then
 	source "$HOME/.bashrc"
 fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ]; then
-	PATH="$HOME/bin:$PATH"
-fi
-
-# start gui
-if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ]; then
-	exec startx
-fi
diff --git a/home/.bashrc b/home/.bashrc
index c76e983..8ade559 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -23,15 +23,17 @@ HISTFILESIZE=99999999
 # make less more friendly for non-text input files, see lesspipe(1)
 if [ -x /usr/bin/lesspipe ]; then eval "$(lesspipe)"; fi
 
-# Include more scripts
-
 # Debian completions
 if [ -r /etc/bash_completion ]; then
 	source /etc/bash_completion;
 fi
 
+# Completions
+if [ -d /usr/local/share/bash-completion/completions ]; then
+	source /usr/local/share/bash-completion/completions/*
+fi
+
 # MacPorts completions
-# bash-completion
 if [ -f /opt/local/etc/profile.d/bash_completion.sh ]; then
 	source /opt/local/etc/profile.d/bash_completion.sh
 fi