@@ -1,17 +1,16 @@
 AUDIO_PLAYER="open"
 VIDEO_PLAYER="open"
-ARCHIVE_FORMATS=(7z bz2 gz tar tbz tbz2 tgz tar.gz tar.bz2 tar.xz rar xz zip)
+ARCHIVE_FORMATS=(7z bz2 gz xz tar tbz tbz2 tgz txz tar.gz tar.bz2 tar.xz rar zip)
 AUDIO_PLAYER_FORMATS=(aac flac it m4a mod mp3 mpc ogg sid spc wma wv xm)
 VIDEO_PLAYER_FORMATS=(avi divx flv mkv mov mpeg mp4 mpg ogm wmv)
-EDITOR="/usr/local/bin/vim"
+EDITOR="vim"
 PAGER="less"
 GREP=""
 GREP_COLOUR="auto"
 FGREP=""
-FGREP_COLOUR="auto"
-LS="gls"
+LS="ls"
 LS_COLOUR="auto"
 LS_ON_CD="yes"
 LS_ON_INIT="no"
 FEMALE="no"	# Whether the user is female ;)
 LISTMAX=32768
@@ -35,15 +34,15 @@
 	[ ! -z "$GREP_COLOUR" -a "$GREP_COLOUR[1]" != "-" ] && \
 		GREP_COLOUR="--colour=$GREP_COLOUR"
 	alias grep="$GREP $GREP_COLOUR"
 fi
 
-if [ "$FGREP" -o "$FGREP_COLOUR" ]; then
+if [ "$FGREP" -o "$GREP_COLOUR" ]; then
 	[ -z "$FGREP" ] && FGREP="fgrep"
-	[ ! -z "$FGREP_COLOUR" -a "$FGREP_COLOUR[1]" != "-" ] && \
-		FGREP_COLOUR="--colour=$FGREP_COLOUR"
-	alias fgrep="$FGREP $FGREP_COLOUR"
+	[ ! -z "$GREP_COLOUR" -a "$GREP_COLOUR[1]" != "-" ] && \
+		GREP_COLOUR="--colour=$GREP_COLOUR"
+	alias fgrep="$FGREP $GREP_COLOUR"
 fi
 
 if [ "$LS" -o "$LS_COLOUR" ]; then
 	[ -z "$LS" ] && LS="ls"
 	[ ! -z "$LS_COLOUR" -a "$LS_COLOUR[1]" != "-" ] && \
@@ -123,12 +122,10 @@
 			_precmd
 		}
 		;;
 esac
 
-alias vi="vim"
-
 extr() {
 	for i in $@; do
 		case $i in
 			*.7z)
 				7za x $i
@@ -138,11 +135,11 @@
 				;;
 			*.tbz | *.tbz2 | *.tar.bz2)
 				bzcat $i | tar xfv -
 				;;
 			*.tgz | *.tar.gz)
-				gzcat $i | tar xfv -
+				zcat $i | tar xfv -
 				;;
 			*.txz | *.tar.xz)
 				xzcat $i | tar xfv -
 				;;
 			*.rar)
@@ -156,10 +153,13 @@
 				bunzip2 $i
 				;;
 			*.gz)
 				gunzip $i
 				;;
+			*.xz)
+				unxz $i
+				;;
 			*)
 				echo "$i: Unknown file type"
 				false
 				;;
 		esac
@@ -175,16 +175,10 @@
 
 sprunge() {
 	curl -F "sprunge=<-" http://sprunge.us
 }
 
-mencoder-iphone() {
-	for i in "$@"; do
-		mencoder -vf scale=480:-10,harddup -oac faac -faacopts mpeg=4:object=2:raw:br=128 -of lavf -lavfopts format=mp4 -ovc x264 -x264encopts nocabac:level_idc=30:bframes=0:global_header:threads=auto:subq=5:frameref=6:partitions=all:bitrate=800 -o "${i%.*}.iphone.m4v" "$i"
-	done
-}
-
 for ext in $ARCHIVE_FORMATS; do alias -s $ext=extr; done
 
 [ "$AUDIO_PLAYER" ] && \
 	for ext in $AUDIO_PLAYER_FORMATS; do alias -s $ext=$AUDIO_PLAYER; done
 
@@ -196,6 +190,6 @@
 
 [ "$LS_ON_INIT" = "yes" ] && ls
 
 unset AUDIO_PLAYER VIDEO_PLAYER
 unset ARCHIVE_FORMATS AUDIO_PLAYER_FORMATS VIDEO_PLAYER_FORMATS
-unset FGREP FGREP_COLOUR GREP GREP_COLOUR LS LS_COLOUR LS_ON_CD LS_ON_INIT
+unset FGREP GREP GREP_COLOUR LS LS_COLOUR LS_ON_CD LS_ON_INIT