diff --git a/bashrc b/bashrc
index f41d142..e9b5696 100644
--- a/bashrc
+++ b/bashrc
@@ -26,6 +26,8 @@ if [ -d $HOME/.bash/aliases.d ]; then for file in $(ls $HOME/.bash/aliases.d/*);
 # Source bash completion definitions
 [[ -f /etc/bash-completion ]] && source /etc/bash-completion
 [[ -f /etc/profile.d/bash-completion ]] && source /etc/profile.d/bash-completion
+[[ -f /etc/profile.d/bash-completion.sh ]] && source /etc/profile.d/bash-completion.sh
+
 if [ -f $HOME/.bash_completion ]; then source $HOME/.bash_completion; fi
 if [ -f $HOME/.bash/completion ]; then source $HOME/.bash/completion; fi
 if [ -d $HOME/.bash/completion ]; then for file in $(ls $HOME/.bash/completion/*); do source $file; done; fi
diff --git a/libs/urxvt.bash b/libs/urxvt.bash
index 7f90ad9..fd5f30e 100755
--- a/libs/urxvt.bash
+++ b/libs/urxvt.bash
@@ -1,7 +1,4 @@
 #!/bin/bash
-URXVT_FONT_NAME="Terminus"
-URXVT_FONT_SIZE=8
-URXVT_FONT_INCREMENT=1
 
 function urxvt_set_font
 {
@@ -14,15 +11,3 @@ function urxvt_set_title
           # set window title
           printf '\33]2;%s\007' "$1"
 }
-
-# Quick functions
-
-zp() {
-	URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE+$URXVT_FONT_INCREMENT" | bc )
-	urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
-}
-
-zm() {
-	URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE-$URXVT_FONT_INCREMENT" | bc )
-	urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
-}
diff --git a/rc.d/urxvt b/rc.d/urxvt
new file mode 100755
index 0000000..83f4728
--- /dev/null
+++ b/rc.d/urxvt
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+URXVT_FONT_NAME="Terminus"
+URXVT_FONT_SIZE=8
+URXVT_FONT_INCREMENT=1
+
+urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
+
+# Quick functions
+
+zp() {
+	URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE+$URXVT_FONT_INCREMENT" | bc )
+	urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
+}
+
+zm() {
+	URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE-$URXVT_FONT_INCREMENT" | bc )
+	urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
+}
diff --git a/rc.d/zz-powerline b/rc.d/zz-powerline
index b9c6e55..bb906e5 100644
--- a/rc.d/zz-powerline
+++ b/rc.d/zz-powerline
@@ -1,14 +1,26 @@
 #!/bin/bash
 
 # Powerline
-SCRIPT=/usr/lib64/python3.2/site-packages/powerline/bindings/bash/powerline.sh
-if [ -f $SCRIPT ]
+POWERLINE_FILE=/usr/share/powerline/bash/powerline.sh
+
+if [ -f "${POWERLINE_FILE}" -a -z "$SSH_CONNECTION" ]
 then
-	if [ -n "$SSH_CONNECTION" ]
-	then
-			#urxvt_set_font "Terminus for Powerline-12"
-			export URXVT_FONT_NAME="DejaVu Sans Mono"
-			urxvt_set_font "DejaVu Sans Mono for Powerline-10"
-			source $SCRIPT
-	fi
+
+		#export URXVT_FONT_NAME="Terminus for Powerline"
+		export URXVT_FONT_NAME="DejaVu Sans Mono for Powerline"
+		export URXVT_FONT_SIZE="8"
+
+		xrdb -merge <<"EOF"
+XTerm*utf8:		1
+XTerm*faceName:		${URXVT_FONT_NAME}
+XTerm*faceSize:		${URXVT_FONT_SIZE}
+UXTerm*utf8:		1
+UXTerm*faceName:	${URXVT_FONT_NAME}
+UXTerm*faceSize:	${URXVT_FONT_SIZE}
+URxvt*font:             xft:${URXVT_FONT_NAME}-${URXVT_FONT_SIZE}
+EOF
+		test -f ~/.Xresources.powerline && xrdb -merge ~/.Xresources.powerline
+
+		urxvt_set_font "${URXVT_FONT_NAME}-${URXVT_FONT_SIZE}"
+		source ${POWERLINE_FILE}
 fi