diff --git a/git/gitconfig b/git/gitconfig
index 1e50048..c04dfd1 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -3,6 +3,7 @@
   email = stonewareslord@gmail.com
 [alias]
   i = "!git br&&git st"
+  # coa = "!for i in $(git branch -a|cut -b3-|grep remotes|sed -e 's/remotes\///'|cut -d/ -f1 --complement|cut -d\  -f1);do git checkout $i;done"
   pul = pull
   pus = push --all
   co = checkout
diff --git a/i3/config b/i3/config
index e52fa6b..58f29d7 100644
--- a/i3/config
+++ b/i3/config
@@ -183,7 +183,7 @@ exec --no-startup-id "sleep 25;/usr/bin/owncloud"
 exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
 exec --no-startup-id /usr/bin/parcellite
 exec --no-startup-id /usr/bin/numlockx
-bindsym $mod+p exec dmenu_run -p Run -l 5 -i
+bindsym $mod+p exec dmenu_run -p Run -l 5 -i -f
 bindsym $mod+shift+p exec "~/.i3/run.sh pass"
 #exec --no-startup-id /usr/bin/synapse -s
 exec --no-startup-id /usr/bin/zeal
diff --git a/i3/run.sh b/i3/run.sh
index 878d7e6..51a9fee 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -1,11 +1,17 @@
 #!/bin/zsh
 if [ "$1" = "lock" ];then
-  synclient TouchpadOff=1
-  while [ ! "$PASSWORD" = "a" ];do export PASSWORD=$(echo|dmenu -p Locked);done
-  synclient TouchpadOff=0
+  #synclient TouchpadOff=1
+  MOUSE=$(xinput list | grep Mouse | sed -e 's/.*id=//' | cut -f 1)
+  TRACK=$(xinput list | grep 'TouchPad' | sed -e 's/.*id=//' | cut -f 1)
+  xinput set-prop $MOUSE "Device Enabled" 0
+  xinput set-prop $TRACK "Device Enabled" 0
+  while [ ! "$PASSWORD" = "a" ];do export PASSWORD=$(echo|dmenu -f -p Locked);done
+  xinput set-prop $MOUSE "Device Enabled" 1
+  xinput set-prop $TRACK "Device Enabled" 1
+  #synclient TouchpadOff=0
 fi
 if [ "$1" = "pass" ];then
-  pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|dmenu -l 5|sed -e 's/\.gpg//')
+  pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|dmenu -f -l 5|sed -e 's/\.gpg//')
 fi
 if [ "$1" = "screensaver" ];then
   cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*`
diff --git a/scripts/ffmpeg.sh b/scripts/ffmpeg.sh
index 64277b8..c761711 100755
--- a/scripts/ffmpeg.sh
+++ b/scripts/ffmpeg.sh
@@ -1,4 +1,3 @@
-sudo apt-get -y install autoconf automake build-essential libass-dev libfreetype6-dev libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev libvorbis-dev libx11-dev libxext-dev libxfixes-dev pkg-config texi2html zlib1g-dev yasm libx264-dev unzip libmp3lame-dev libopus-dev
 mkdir ~/ffmpeg_sources
 cd ~/ffmpeg_sources
 wget -O fdk-aac.zip https://github.com/mstorsjo/fdk-aac/zipball/master
diff --git a/shells/liquidpromptrc b/shells/liquidpromptrc
index 4e7f4cf..c7ade41 100644
--- a/shells/liquidpromptrc
+++ b/shells/liquidpromptrc
@@ -4,7 +4,6 @@ LP_ENABLE_BATT=1
 LP_ENABLE_SSH_COLORS=1
 LP_USER_ALWAYS=0
 LP_ENABLE_OHMYGIT=1
-LP_ENABLE_BATT=1
 LP_ENABLE_JOBS=1
 LP_ENABLE_SHORTEN_PATH=0
 #LP_ENABLE_RUNTIME=1
diff --git a/shells/zshrc b/shells/zshrc
index fc2a249..33df4b2 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -17,7 +17,7 @@ setopt APPEND_HISTORY SHARE_HISTORY HISTIGNOREALLDUPS
 plugins=(wd gem pass pip python sudo vagrant)
 DISABLE_AUTO_UPDATE="true"
 source "$HOME/.antigen/antigen.zsh"
-antigen bundle stonewareslord/oh-my-git
+antigen bundle stonewareslord/omg
 #antigen bundle arialdomartini/oh-my-git
 printf "oh-my-zsh..."
 antigen use oh-my-zsh
@@ -240,7 +240,7 @@ function k(){
   elif [ -f "$@" ] ; then
     #Extract if it's extractable
     case $1 in
-      *.tar.xz)    pv $1|tar xzf -;;
+      *.tar.xz)    pv $1|tar xJf -;;
       *.tar.bz2)   pv $1|tar xjf -;;
       *.tar.gz)    pv $1|tar xzf -;;
       *.tar)       pv $1|tar xf   ;;
diff --git a/vim/vimrc b/vim/vimrc
index 71a2097..fb9c4f4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -163,7 +163,7 @@ set ttyfast
 set ff=unix
 set encoding=utf-8
 set laststatus=2
-set foldmethod=marker
+set foldmethod=indent
 set foldnestmax=10
 set foldlevel=2
 set rnu
@@ -396,4 +396,3 @@ function! Initialize()
     endif
   endif
 endfunction
-