diff --git a/bin/2png.sh b/bin/2png
similarity index 100%
rename from bin/2png.sh
rename to bin/2png
diff --git a/bin/clump.sh b/bin/clump
similarity index 100%
rename from bin/clump.sh
rename to bin/clump
diff --git a/bin/git-move-root-to.sh b/bin/git-move-root-to
similarity index 100%
rename from bin/git-move-root-to.sh
rename to bin/git-move-root-to
diff --git a/bin/git-stats.sh b/bin/git-stats
similarity index 90%
rename from bin/git-stats.sh
rename to bin/git-stats
index 243d97b0..df287301 100755
--- a/bin/git-stats.sh
+++ b/bin/git-stats
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/bin/lesspipe.sh b/bin/lesspipe
similarity index 100%
rename from bin/lesspipe.sh
rename to bin/lesspipe
diff --git a/bin/lsarchive.sh b/bin/lsarchive
similarity index 100%
rename from bin/lsarchive.sh
rename to bin/lsarchive
diff --git a/bin/mov2gif.sh b/bin/mov2gif
similarity index 100%
rename from bin/mov2gif.sh
rename to bin/mov2gif
diff --git a/bin/pushover b/bin/pushover
new file mode 100644
index 00000000..6b0bd568
--- /dev/null
+++ b/bin/pushover
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+# TODO
diff --git a/bin/replace.sh b/bin/replace
similarity index 100%
rename from bin/replace.sh
rename to bin/replace
diff --git a/bin/since.sh b/bin/since
similarity index 100%
rename from bin/since.sh
rename to bin/since
diff --git a/bin/til b/bin/til
new file mode 120000
index 00000000..8fa4be82
--- /dev/null
+++ b/bin/til
@@ -0,0 +1 @@
+since
\ No newline at end of file
diff --git a/bin/transmission-list.sh b/bin/transmission-list
similarity index 100%
rename from bin/transmission-list.sh
rename to bin/transmission-list
diff --git a/bin/unarchive.sh b/bin/unarchive
similarity index 100%
rename from bin/unarchive.sh
rename to bin/unarchive
diff --git a/bin/update.sh b/bin/update
similarity index 96%
rename from bin/update.sh
rename to bin/update
index 994be953..a1a1d1f1 100755
--- a/bin/update.sh
+++ b/bin/update
@@ -30,6 +30,8 @@ case "$OSTYPE" in
         fi
 esac
 
+$DOTFILES/bootstrap update
+
 # Update editors
 update ~/.emacs.d "make update"
 update ~/.vim     "make update"
@@ -37,5 +39,4 @@ update ~/.vim     "make update"
 # Others
 update ~/.zgen
 update ~/.cask
-update ~/.{rb,py}env
 
diff --git a/os/arch/bin/volume.sh b/os/arch/bin/volume
similarity index 100%
rename from os/arch/bin/volume.sh
rename to os/arch/bin/volume