diff --git a/dotfiles/bin/convert-video-avi-to-mp4 b/dotfiles/bin/convert-video-avi-to-mp4
deleted file mode 100644
index d2461df..0000000
--- a/dotfiles/bin/convert-video-avi-to-mp4
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an AVI video. I wasn't able to play the encoded videos
-# on my phone when using libx264 and libx265 encoders, but mpeg4 works. Also
-# I'm using the aac codec because some old avi's were using a codec that's not
-# supported in the mp4 container.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: convert-video-avi-to-mp4 <filename> <bitrate, e.g. \"4000k\"> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-filename=$(basename -- "$1")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-bitrate="$2"
-
-output_name="$3"
-if [[ $output_name == "" ]]; then
-    output="${filename}_CONVERTED-${bitrate}.mp4"
-else
-    output="${output_name}.mp4"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' with target bitrate $bitrate | output: $output${NORMAL}\n"
-ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -c:a aac -c:v mpeg4 -b:v $bitrate "$output"
-printf "\n${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output'${NORMAL}\n\n"
diff --git a/dotfiles/bin/convert-video-flv-to-mp4 b/dotfiles/bin/convert-video-flv-to-mp4
deleted file mode 100644
index 84b51e4..0000000
--- a/dotfiles/bin/convert-video-flv-to-mp4
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an FLV video to mp4 using an mpeg4 encoder.
-# Can optionally compress the video.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: convert-video-flv-to-mp4 <compress 1|0> <filename> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-compress="$1"
-
-filename=$(basename -- "$2")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-output="$3"
-if [[ $output == "" ]]; then
-    output="${filename}_CONVERTED"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output.mp4${NORMAL}\n"
-
-if [[ $compress -eq 1 ]]; then
-    temp_output="temp_$output.mp4"
-else
-    temp_output="$output.mp4"
-fi
-
-# convert first.
-# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
-ffmpeg -y -stats -loglevel level+error -vsync 0 -hwaccel cuvid -c:v h264_cuvid -i "$filename.$extension" -c:a aac -c:v h264_nvenc -b:v 5M "$temp_output"
-
-if [[ $compress -eq 1 ]]; then
-    compress-video 1 "$temp_output" "$output"
-    rm "$temp_output"
-else
-    printf "\n"
-fi
-
-printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output.mp4'${NORMAL}\n\n"
diff --git a/dotfiles/bin/convert-video-mkv-to-mp4 b/dotfiles/bin/convert-video-mkv-to-mp4
deleted file mode 100644
index 72dccc8..0000000
--- a/dotfiles/bin/convert-video-mkv-to-mp4
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an mkv video to mp4 using an mpeg4 encoder.
-# Can optionally compress the video.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: convert-video-mkv-to-mp4 <compress 1|0> <filename> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-compress="$1"
-
-filename=$(basename -- "$2")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-output="$3"
-if [[ $output == "" ]]; then
-    output="${filename}_CONVERTED"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output.mp4${NORMAL}\n"
-
-if [[ $compress -eq 1 ]]; then
-    temp_output="temp_$output.mp4"
-else
-    temp_output="$output.mp4"
-fi
-
-# convert first.
-# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
-ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -vcodec copy -acodec copy "$temp_output"
-
-if [[ $compress -eq 1 ]]; then
-    compress-video 1 "$temp_output" "$output"
-    rm "$temp_output"
-else
-    printf "\n"
-fi
-
-printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output.mp4'${NORMAL}\n\n"
diff --git a/dotfiles/bin/convert-video-to-mp4 b/dotfiles/bin/convert-video-to-mp4
new file mode 100644
index 0000000..d9f512b
--- /dev/null
+++ b/dotfiles/bin/convert-video-to-mp4
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+# This is for reencoding a non-mp4 video to mp4 using an mpeg4 encoder.
+# Can optionally compress the video.
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+compress="$1"
+filename="$2"
+output_name="$3"
+bitrate="$4"
+
+if [[ $compress == "" || $filename == "" || $output_name == "" ]]; then
+    printf "${BOLD}${RED}Usage: convert-video-to-mp4 <compress 1|0> <filename> <output name> <optional: bitrate, e.g. \"4000k\", defaults to source>${NORMAL}\n"
+    exit 1
+fi
+
+
+filename=$(basename -- "$filename")
+extension="${filename##*.}"
+extension="${extension,,}"  # go lower-case
+filename="${filename%.*}"
+
+output="$output_name.mp4"
+
+bitrate_args=""
+
+if [[ $compress -eq 1 ]]; then
+    temp_output="temp_$output"
+else
+    temp_output="$output"
+fi
+
+# convert first.
+# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
+
+cmd=""
+
+if [[ $extension == "mkv" || $extension == "mpg" ]]; then
+    if [[ $bitrate != "" ]]; then
+        bitrate_args="-b:v $bitrate"
+    else
+        bitrate="<source value>"
+    fi
+
+    cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -vcodec copy -acodec copy $bitrate_args \"$temp_output\""
+
+elif [[ $extension == "flv" ]]; then
+    if [[ $bitrate == "" ]]; then
+        bitrate="5M"
+    fi
+    bitrate_args="-b:v $bitrate"
+
+    cmd="ffmpeg -y -stats -loglevel level+error -vsync 0 -hwaccel cuvid -c:v h264_cuvid -i \"$filename.$extension\" -c:a aac -c:v h264_nvenc $bitrate_args \"$temp_output\""
+
+elif [[ $extension == "avi" || $extension == "wmv" ]]; then
+    cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -c:a aac -c:v mpeg4 $bitrate_args \"$output\""
+
+else
+    printf "${BOLD}${RED}Don't know how to convert a '$extension' to mp4. Add support!${NORMAL}\n"
+    exit 1
+fi
+
+printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output | bitrate: $bitrate${NORMAL}\n"
+
+eval "$cmd"
+
+if [[ $compress -eq 1 ]]; then
+    compress-video 1 "$temp_output" "$output"
+    rm "$temp_output"
+else
+    printf "\n"
+fi
+
+printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output'${NORMAL}\n\n"