diff --git a/Dockerfile b/Dockerfile
index 714ec08..3ce3c23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,538 +1,538 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as buildstage
 
 # set version label
 ARG FFMPEG_VERSION
 
 # common env
 ENV \
- DEBIAN_FRONTEND="noninteractive" \
- MAKEFLAGS="-j4"
+  DEBIAN_FRONTEND="noninteractive" \
+  MAKEFLAGS="-j4"
 
 # versions
 ENV \
- AOM=v1.0.0 \
- FDKAAC=2.0.1 \
- FFMPEG_HARD=4.4 \
- FONTCONFIG=2.13.92 \
- FREETYPE=2.9.1 \
- FRIBIDI=1.0.8 \
- KVAZAAR=2.0.0 \
- LAME=3.100 \
- LIBASS=0.14.0 \
- LIBDRM=2.4.100 \
- LIBVA=2.6.0 \
- LIBVDPAU=1.2 \
- LIBVIDSTAB=1.1.0 \
- LIBVMAF=master \
- NVCODEC=n9.1.23.1 \
- OGG=1.3.4 \
- OPENCOREAMR=0.1.5 \
- OPENJPEG=2.3.1 \
- OPUS=1.3 \
- THEORA=1.1.1 \
- VORBIS=1.3.6 \
- VPX=1.10.0 \
- X265=3.4 \
- XVID=1.3.7 
+  AOM=v1.0.0 \
+  FDKAAC=2.0.1 \
+  FFMPEG_HARD=4.4 \
+  FONTCONFIG=2.13.92 \
+  FREETYPE=2.9.1 \
+  FRIBIDI=1.0.8 \
+  KVAZAAR=2.0.0 \
+  LAME=3.100 \
+  LIBASS=0.14.0 \
+  LIBDRM=2.4.100 \
+  LIBVA=2.6.0 \
+  LIBVDPAU=1.2 \
+  LIBVIDSTAB=1.1.0 \
+  LIBVMAF=master \
+  NVCODEC=n9.1.23.1 \
+  OGG=1.3.4 \
+  OPENCOREAMR=0.1.5 \
+  OPENJPEG=2.3.1 \
+  OPUS=1.3 \
+  THEORA=1.1.1 \
+  VORBIS=1.3.6 \
+  VPX=1.10.0 \
+  X265=3.4 \
+  XVID=1.3.7 
 
 RUN \
- echo "**** install build packages ****" && \
- apt-get update && \ 
- apt-get install -y \
-	autoconf \
-	automake \
-	bzip2 \
-	ca-certificates \
-	cmake \
-	curl \
-	diffutils \
-	doxygen \
-	g++ \
-	gcc \
-	git \
-	gperf \
-	libexpat1-dev \
-	libxext-dev \
-	libgcc-7-dev \
-	libgomp1 \
-	libpciaccess-dev \
-	libssl-dev \
-	libtool \
-	libv4l-dev \
-	libx11-dev \
-	libxml2-dev \
-	make \
-	nasm \
-	ninja-build \
-	ocl-icd-opencl-dev \
-	perl \
-	pkg-config \
-	python \
-	python3 \
-	python3-pip\
-	python3-setuptools \
-	python3-wheel \
-	x11proto-xext-dev \
-	xserver-xorg-dev \
-	yasm \
-	zlib1g-dev && \
-        pip3 install meson
+  echo "**** install build packages ****" && \
+  apt-get update && \ 
+  apt-get install -y \
+    autoconf \
+    automake \
+    bzip2 \
+    ca-certificates \
+    cmake \
+    curl \
+    diffutils \
+    doxygen \
+    g++ \
+    gcc \
+    git \
+    gperf \
+    libexpat1-dev \
+    libxext-dev \
+    libgcc-7-dev \
+    libgomp1 \
+    libpciaccess-dev \
+    libssl-dev \
+    libtool \
+    libv4l-dev \
+    libx11-dev \
+    libxml2-dev \
+    make \
+    nasm \
+    ninja-build \
+    ocl-icd-opencl-dev \
+    perl \
+    pkg-config \
+    python \
+    python3 \
+    python3-pip\
+    python3-setuptools \
+    python3-wheel \
+    x11proto-xext-dev \
+    xserver-xorg-dev \
+    yasm \
+    zlib1g-dev && \
+  pip3 install meson
 
 # compile 3rd party libs
 RUN \
- echo "**** grabbing aom ****" && \
- mkdir -p /tmp/aom && \
- git clone \
-	--branch ${AOM} \
-	--depth 1 https://aomedia.googlesource.com/aom \
-	/tmp/aom
+  echo "**** grabbing aom ****" && \
+  mkdir -p /tmp/aom && \
+  git clone \
+    --branch ${AOM} \
+    --depth 1 https://aomedia.googlesource.com/aom \
+    /tmp/aom
 RUN \
- echo "**** compiling aom ****" && \
- cd /tmp/aom && \
- rm -rf \
-	CMakeCache.txt \
-	CMakeFiles && \
- mkdir -p \
-	aom_build && \
- cd aom_build && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 .. && \
- make && \
- make install
+  echo "**** compiling aom ****" && \
+  cd /tmp/aom && \
+  rm -rf \
+    CMakeCache.txt \
+    CMakeFiles && \
+  mkdir -p \
+    aom_build && \
+  cd aom_build && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 .. && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fdk-aac ****" && \
- mkdir -p /tmp/fdk-aac && \
- curl -Lf \
-	https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fdk-aac
+  echo "**** grabbing fdk-aac ****" && \
+  mkdir -p /tmp/fdk-aac && \
+  curl -Lf \
+    https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fdk-aac
 RUN \
- echo "**** compiling fdk-aac ****" && \
- cd /tmp/fdk-aac && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling fdk-aac ****" && \
+  cd /tmp/fdk-aac && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing ffnvcodec ****" && \
- mkdir -p /tmp/ffnvcodec && \
- git clone \
-        --branch ${NVCODEC} \
-        --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git \
-        /tmp/ffnvcodec
+  echo "**** grabbing ffnvcodec ****" && \
+  mkdir -p /tmp/ffnvcodec && \
+  git clone \
+    --branch ${NVCODEC} \
+    --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git \
+    /tmp/ffnvcodec
 RUN \
- echo "**** compiling ffnvcodec ****" && \
- cd /tmp/ffnvcodec && \
- make install
+  echo "**** compiling ffnvcodec ****" && \
+  cd /tmp/ffnvcodec && \
+  make install
 RUN \
- echo "**** grabbing freetype ****" && \
- mkdir -p /tmp/freetype && \
- curl -Lf \
-	https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/freetype
+  echo "**** grabbing freetype ****" && \
+  mkdir -p /tmp/freetype && \
+  curl -Lf \
+    https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
- echo "**** compiling freetype ****" && \
- cd /tmp/freetype && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling freetype ****" && \
+  cd /tmp/freetype && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fontconfig ****" && \
- mkdir -p /tmp/fontconfig && \
- curl -Lf \
-	https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fontconfig
+  echo "**** grabbing fontconfig ****" && \
+  mkdir -p /tmp/fontconfig && \
+  curl -Lf \
+    https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fontconfig
 RUN \
- echo "**** compiling fontconfig ****" && \
- cd /tmp/fontconfig && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install 
+  echo "**** compiling fontconfig ****" && \
+  cd /tmp/fontconfig && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install 
 RUN \
- echo "**** grabbing fribidi ****" && \
- mkdir -p /tmp/fribidi && \
- curl -Lf \
-	https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fribidi
+  echo "**** grabbing fribidi ****" && \
+  mkdir -p /tmp/fribidi && \
+  curl -Lf \
+    https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fribidi
 RUN \
- echo "**** compiling fribidi ****" && \
- cd /tmp/fribidi && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make -j 1 && \
- make install
+  echo "**** compiling fribidi ****" && \
+  cd /tmp/fribidi && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make -j 1 && \
+  make install
 RUN \
- echo "**** grabbing kvazaar ****" && \
- mkdir -p /tmp/kvazaar && \
- curl -Lf \
-	https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/kvazaar
+  echo "**** grabbing kvazaar ****" && \
+  mkdir -p /tmp/kvazaar && \
+  curl -Lf \
+    https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/kvazaar
 RUN \
- echo "**** compiling kvazaar ****" && \
- cd /tmp/kvazaar && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling kvazaar ****" && \
+  cd /tmp/kvazaar && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing lame ****" && \
- mkdir -p /tmp/lame && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/lame
+  echo "**** grabbing lame ****" && \
+  mkdir -p /tmp/lame && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/lame
 RUN \
- echo "**** compiling lame ****" && \
- cd /tmp/lame && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-        /usr/share/automake-1.15/config.sub \
-        config.sub && \
- ./configure \
-	--disable-frontend \
-	--disable-static \
-	--enable-nasm \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling lame ****" && \
+  cd /tmp/lame && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  ./configure \
+    --disable-frontend \
+    --disable-static \
+    --enable-nasm \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libass ****" && \
- mkdir -p /tmp/libass && \
- curl -Lf \
-	https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/libass
+  echo "**** grabbing libass ****" && \
+  mkdir -p /tmp/libass && \
+  curl -Lf \
+    https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/libass
 RUN \
- echo "**** compiling libass ****" && \
- cd /tmp/libass && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling libass ****" && \
+  cd /tmp/libass && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libdrm ****" && \
- mkdir -p /tmp/libdrm && \
- curl -Lf \
-	https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/libdrm
+  echo "**** grabbing libdrm ****" && \
+  mkdir -p /tmp/libdrm && \
+  curl -Lf \
+    https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/libdrm
 RUN \
- echo "**** compiling libdrm ****" && \
- cd /tmp/libdrm && \
- ./configure \
-        --disable-static \
-        --enable-shared && \
- make && \
- make install
+  echo "**** compiling libdrm ****" && \
+  cd /tmp/libdrm && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libva ****" && \
- mkdir -p /tmp/libva && \
- curl -Lf \
-	https://github.com/intel/libva/archive/${LIBVA}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/libva
+  echo "**** grabbing libva ****" && \
+  mkdir -p /tmp/libva && \
+  curl -Lf \
+    https://github.com/intel/libva/archive/${LIBVA}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/libva
 RUN \
- echo "**** compiling libva ****" && \
- cd /tmp/libva && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling libva ****" && \
+  cd /tmp/libva && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libvdpau ****" && \
- mkdir -p /tmp/libvdpau && \
- git clone \
-	--branch libvdpau-${LIBVDPAU} \
-	--depth 1 https://gitlab.freedesktop.org/vdpau/libvdpau.git \
-	/tmp/libvdpau
+  echo "**** grabbing libvdpau ****" && \
+  mkdir -p /tmp/libvdpau && \
+  git clone \
+    --branch libvdpau-${LIBVDPAU} \
+    --depth 1 https://gitlab.freedesktop.org/vdpau/libvdpau.git \
+    /tmp/libvdpau
 RUN \
- echo "**** compiling libvdpau ****" && \
- cd /tmp/libvdpau && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling libvdpau ****" && \
+  cd /tmp/libvdpau && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vmaf ****" && \
- mkdir -p /tmp/vmaf && \
- git clone \
-        --branch ${LIBVMAF} \
-        https://github.com/Netflix/vmaf.git \
-        /tmp/vmaf
+  echo "**** grabbing vmaf ****" && \
+  mkdir -p /tmp/vmaf && \
+  git clone \
+    --branch ${LIBVMAF} \
+    https://github.com/Netflix/vmaf.git \
+    /tmp/vmaf
 RUN \
- echo "**** compiling libvmaf ****" && \
- cd /tmp/vmaf/libvmaf && \
- meson build --buildtype release && \
- ninja -vC build && \
- ninja -vC build install
+  echo "**** compiling libvmaf ****" && \
+  cd /tmp/vmaf/libvmaf && \
+  meson build --buildtype release && \
+  ninja -vC build && \
+  ninja -vC build install
 RUN \
- echo "**** grabbing ogg ****" && \
- mkdir -p /tmp/ogg && \
- curl -Lf \
-	http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/ogg
+  echo "**** grabbing ogg ****" && \
+  mkdir -p /tmp/ogg && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/ogg
 RUN \
- echo "**** compiling ogg ****" && \
- cd /tmp/ogg && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling ogg ****" && \
+  cd /tmp/ogg && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opencore-amr ****" && \
- mkdir -p /tmp/opencore-amr && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opencore-amr
+  echo "**** grabbing opencore-amr ****" && \
+  mkdir -p /tmp/opencore-amr && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opencore-amr
 RUN \
- echo "**** compiling opencore-amr ****" && \
- cd /tmp/opencore-amr && \
- ./configure \
-	--disable-static \
-	--enable-shared  && \
- make && \
- make install
+  echo "**** compiling opencore-amr ****" && \
+  cd /tmp/opencore-amr && \
+  ./configure \
+    --disable-static \
+    --enable-shared  && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing openjpeg ****" && \
- mkdir -p /tmp/openjpeg && \
- curl -Lf \
-	https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/openjpeg
+  echo "**** grabbing openjpeg ****" && \
+  mkdir -p /tmp/openjpeg && \
+  curl -Lf \
+    https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/openjpeg
 RUN \
- echo "**** compiling openjpeg ****" && \
- cd /tmp/openjpeg && \
- rm -Rf \
-	thirdparty/libpng/* && \
- curl -Lf \
-	https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
-	tar -zx --strip-components=1 -C thirdparty/libpng/ && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 \
-	-DBUILD_THIRDPARTY:BOOL=ON . && \
- make && \
- make install
+  echo "**** compiling openjpeg ****" && \
+  cd /tmp/openjpeg && \
+  rm -Rf \
+    thirdparty/libpng/* && \
+  curl -Lf \
+    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
+    tar -zx --strip-components=1 -C thirdparty/libpng/ && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 \
+    -DBUILD_THIRDPARTY:BOOL=ON . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opus ****" && \
- mkdir -p /tmp/opus && \
- curl -Lf \
-	https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opus
+  echo "**** grabbing opus ****" && \
+  mkdir -p /tmp/opus && \
+  curl -Lf \
+    https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opus
 RUN \
- echo "**** compiling opus ****" && \
- cd /tmp/opus && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling opus ****" && \
+  cd /tmp/opus && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing theora ****" && \
- mkdir -p /tmp/theora && \
- curl -Lf \
-	http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/theora
+  echo "**** grabbing theora ****" && \
+  mkdir -p /tmp/theora && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/theora
 RUN \
- echo "**** compiling theora ****" && \
- cd /tmp/theora && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-	/usr/share/automake-1.15/config.sub \
-	config.sub && \
- curl -fL \
-	'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
-	> png.patch && \
- patch ./examples/png2theora.c < png.patch && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling theora ****" && \
+  cd /tmp/theora && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  curl -fL \
+    'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
+    > png.patch && \
+  patch ./examples/png2theora.c < png.patch && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vid.stab ****" && \
- mkdir -p /tmp/vid.stab && \
- curl -Lf \
-	https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vid.stab
+  echo "**** grabbing vid.stab ****" && \
+  mkdir -p /tmp/vid.stab && \
+  curl -Lf \
+    https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vid.stab
 RUN \
- echo "**** compiling vid.stab ****" && \
- cd /tmp/vid.stab && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 . && \
- make && \
- make install
+  echo "**** compiling vid.stab ****" && \
+  cd /tmp/vid.stab && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vorbis ****" && \
- mkdir -p /tmp/vorbis && \
- curl -Lf \
-	http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vorbis
+  echo "**** grabbing vorbis ****" && \
+  mkdir -p /tmp/vorbis && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vorbis
 RUN \
- echo "**** compiling vorbis ****" && \
- cd /tmp/vorbis && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling vorbis ****" && \
+  cd /tmp/vorbis && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vpx ****" && \
- mkdir -p /tmp/vpx && \
- curl -Lf \
-	https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vpx
+  echo "**** grabbing vpx ****" && \
+  mkdir -p /tmp/vpx && \
+  curl -Lf \
+  https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
+  tar -zx --strip-components=1 -C /tmp/vpx
 RUN \
- echo "**** compiling vpx ****" && \
- cd /tmp/vpx && \
- ./configure \
-	--disable-debug \
-	--disable-docs \
-	--disable-examples \
-	--disable-install-bins \
-	--disable-static \
-	--disable-unit-tests \
-	--enable-pic \
-	--enable-shared \
-	--enable-vp8 \
-	--enable-vp9 \
-	--enable-vp9-highbitdepth && \
- make && \
- make install
+  echo "**** compiling vpx ****" && \
+  cd /tmp/vpx && \
+  ./configure \
+    --disable-debug \
+    --disable-docs \
+    --disable-examples \
+    --disable-install-bins \
+    --disable-static \
+    --disable-unit-tests \
+    --enable-pic \
+    --enable-shared \
+    --enable-vp8 \
+    --enable-vp9 \
+    --enable-vp9-highbitdepth && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing x264 ****" && \
- mkdir -p /tmp/x264 && \
- curl -Lf \
-	https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
-	tar -jx --strip-components=1 -C /tmp/x264
+  echo "**** grabbing x264 ****" && \
+  mkdir -p /tmp/x264 && \
+  curl -Lf \
+    https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/x264
 RUN \
- echo "**** compiling x264 ****" && \
- cd /tmp/x264 && \
- ./configure \
-	--disable-cli \
-	--disable-static \
-	--enable-pic \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling x264 ****" && \
+  cd /tmp/x264 && \
+  ./configure \
+    --disable-cli \
+    --disable-static \
+    --enable-pic \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing x265 ****" && \
- mkdir -p /tmp/x265 && \
- curl -Lf \
-	http://anduin.linuxfromscratch.org/BLFS/x265/x265_${X265}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/x265
+  echo "**** grabbing x265 ****" && \
+  mkdir -p /tmp/x265 && \
+  curl -Lf \
+    http://anduin.linuxfromscratch.org/BLFS/x265/x265_${X265}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/x265
 RUN \
- echo "**** compiling x265 ****" && \
- cd /tmp/x265/build/linux && \
- ./multilib.sh && \
- make -C 8bit install
+  echo "**** compiling x265 ****" && \
+  cd /tmp/x265/build/linux && \
+  ./multilib.sh && \
+  make -C 8bit install
 RUN \
- echo "**** grabbing xvid ****" && \
- mkdir -p /tmp/xvid && \
- curl -Lf \
-	https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/xvid
+  echo "**** grabbing xvid ****" && \
+  mkdir -p /tmp/xvid && \
+  curl -Lf \
+    https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/xvid
 RUN \
- echo "**** compiling xvid ****" && \
- cd /tmp/xvid/build/generic && \
- ./configure && \ 
- make && \
- make install
+  echo "**** compiling xvid ****" && \
+  cd /tmp/xvid/build/generic && \
+  ./configure && \ 
+  make && \
+  make install
 
 # main ffmpeg build
 RUN \
- echo "**** Versioning ****" && \
- if [ -z ${FFMPEG_VERSION+x} ]; then \
-	FFMPEG=${FFMPEG_HARD}; \
- else \
-	FFMPEG=${FFMPEG_VERSION}; \
- fi && \
- echo "**** grabbing ffmpeg ****" && \
- mkdir -p /tmp/ffmpeg && \
- echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
- curl -Lf \
-        https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
-        tar -jx --strip-components=1 -C /tmp/ffmpeg
+  echo "**** Versioning ****" && \
+  if [ -z ${FFMPEG_VERSION+x} ]; then \
+    FFMPEG=${FFMPEG_HARD}; \
+  else \
+    FFMPEG=${FFMPEG_VERSION}; \
+  fi && \
+  echo "**** grabbing ffmpeg ****" && \
+  mkdir -p /tmp/ffmpeg && \
+  echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
+  curl -Lf \
+    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/ffmpeg
 RUN \
- echo "**** compiling ffmpeg ****" && \
- cd /tmp/ffmpeg && \
- ./configure \
-	--disable-debug \
-	--disable-doc \
-	--disable-ffplay \
-	--enable-ffprobe \
-	--enable-avresample \
-	--enable-cuvid \
-	--enable-gpl \
-	--enable-libaom \
-	--enable-libass \
-	--enable-libfdk_aac \
-	--enable-libfreetype \
-	--enable-libkvazaar \
-	--enable-libmp3lame \
-	--enable-libopencore-amrnb \
-	--enable-libopencore-amrwb \
-	--enable-libopenjpeg \
-	--enable-libopus \
-	--enable-libtheora \
-	--enable-libv4l2 \
-	--enable-libvidstab \
-	--enable-libvmaf \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libxml2 \
-	--enable-libx264 \
-	--enable-libx265 \
-	--enable-libxvid \
-	--enable-nonfree \
-	--enable-nvdec \
-	--enable-nvenc \
-	--enable-opencl \
-	--enable-openssl \
-	--enable-small \
-	--enable-stripping \
-	--enable-vaapi \
-	--enable-vdpau \
-	--enable-version3 && \
- make
+  echo "**** compiling ffmpeg ****" && \
+  cd /tmp/ffmpeg && \
+    ./configure \
+    --disable-debug \
+    --disable-doc \
+    --disable-ffplay \
+    --enable-ffprobe \
+    --enable-avresample \
+    --enable-cuvid \
+    --enable-gpl \
+    --enable-libaom \
+    --enable-libass \
+    --enable-libfdk_aac \
+    --enable-libfreetype \
+    --enable-libkvazaar \
+    --enable-libmp3lame \
+    --enable-libopencore-amrnb \
+    --enable-libopencore-amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvmaf \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libxml2 \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-nonfree \
+    --enable-nvdec \
+    --enable-nvenc \
+    --enable-opencl \
+    --enable-openssl \
+    --enable-small \
+    --enable-stripping \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-version3 && \
+  make
 
 RUN \
- echo "**** arrange files ****" && \
- ldconfig && \
- mkdir -p \
- 	/buildout/usr/local/bin \
-	/buildout/usr/lib \
-	/buildout/etc/OpenCL/vendors && \
- cp \
-	/tmp/ffmpeg/ffmpeg \
-	/buildout/usr/local/bin && \
- cp \
-	/tmp/ffmpeg/ffprobe \
-	/buildout/usr/local/bin && \
- ldd /tmp/ffmpeg/ffmpeg \
-	| awk '/local/ {print $3}' \
-	| xargs -i cp -L {} /buildout/usr/lib/ && \
- cp -a \
-	/usr/local/lib/libdrm_* \
-	/buildout/usr/lib/ && \
- echo \
- 	'libnvidia-opencl.so.1' > \
-	/buildout/etc/OpenCL/vendors/nvidia.icd
+  echo "**** arrange files ****" && \
+  ldconfig && \
+  mkdir -p \
+    /buildout/usr/local/bin \
+    /buildout/usr/lib \
+    /buildout/etc/OpenCL/vendors && \
+  cp \
+    /tmp/ffmpeg/ffmpeg \
+    /buildout/usr/local/bin && \
+  cp \
+    /tmp/ffmpeg/ffprobe \
+    /buildout/usr/local/bin && \
+  ldd /tmp/ffmpeg/ffmpeg \
+    | awk '/local/ {print $3}' \
+    | xargs -i cp -L {} /buildout/usr/lib/ && \
+  cp -a \
+    /usr/local/lib/libdrm_* \
+    /buildout/usr/lib/ && \
+  echo \
+    'libnvidia-opencl.so.1' > \
+    /buildout/etc/OpenCL/vendors/nvidia.icd
 
 # Storage layer consumed downstream
 FROM scratch
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e80f26a..15e20c0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,433 +1,433 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal as buildstage
 
 # set version label
 ARG FFMPEG_VERSION
 
 # common env
 ENV \
- DEBIAN_FRONTEND="noninteractive" \
- MAKEFLAGS="-j4"
+  DEBIAN_FRONTEND="noninteractive" \
+  MAKEFLAGS="-j4"
 
 # versions
 ENV \
- AOM=v1.0.0 \
- FDKAAC=2.0.1 \
- FFMPEG_HARD=4.4 \
- FREETYPE=2.9.1 \
- FRIBIDI=1.0.8 \
- KVAZAAR=2.0.0 \
- LAME=3.100 \
- LIBASS=0.14.0 \
- LIBDRM=2.4.98 \
- LIBVA=2.6.0 \
- LIBVDPAU=1.2 \
- LIBVIDSTAB=1.1.0 \
- NVCODEC=n9.1.23.1 \
- OGG=1.3.4 \
- OPENCOREAMR=0.1.5 \
- OPENJPEG=2.3.1 \
- OPUS=1.3 \
- THEORA=1.1.1 \
- VORBIS=1.3.6 \
- VPX=1.10.0 \
- X265=3.3 \
- XVID=1.3.7 
+  AOM=v1.0.0 \
+  FDKAAC=2.0.1 \
+  FFMPEG_HARD=4.4 \
+  FREETYPE=2.9.1 \
+  FRIBIDI=1.0.8 \
+  KVAZAAR=2.0.0 \
+  LAME=3.100 \
+  LIBASS=0.14.0 \
+  LIBDRM=2.4.98 \
+  LIBVA=2.6.0 \
+  LIBVDPAU=1.2 \
+  LIBVIDSTAB=1.1.0 \
+  NVCODEC=n9.1.23.1 \
+  OGG=1.3.4 \
+  OPENCOREAMR=0.1.5 \
+  OPENJPEG=2.3.1 \
+  OPUS=1.3 \
+  THEORA=1.1.1 \
+  VORBIS=1.3.6 \
+  VPX=1.10.0 \
+  X265=3.3 \
+  XVID=1.3.7 
 
 RUN \
- echo "**** install build packages ****" && \
- apt-get update && \ 
- apt-get install -y \
-	autoconf \
-	automake \
-	bzip2 \
-	ca-certificates \
-	cmake \
-	curl \
-	diffutils \
-	g++ \
-	gcc \
-	git \
-	gperf \
-	libexpat1-dev \
-	libfontconfig1-dev \
-	libxext-dev \
-	libgcc-7-dev \
-	libgomp1 \
-	libpciaccess-dev \
-	libssl-dev \
-	libtool \
-	libv4l-dev \
-	libx11-dev \
-	libxml2-dev \
-	make \
-	nasm \
-	perl \
-	pkg-config \
-	python \
-	x11proto-xext-dev \
-	xserver-xorg-dev \
-	yasm \
-	zlib1g-dev 
+  echo "**** install build packages ****" && \
+  apt-get update && \ 
+  apt-get install -y \
+    autoconf \
+    automake \
+    bzip2 \
+    ca-certificates \
+    cmake \
+    curl \
+    diffutils \
+    g++ \
+    gcc \
+    git \
+    gperf \
+    libexpat1-dev \
+    libfontconfig1-dev \
+    libxext-dev \
+    libgcc-7-dev \
+    libgomp1 \
+    libpciaccess-dev \
+    libssl-dev \
+    libtool \
+    libv4l-dev \
+    libx11-dev \
+    libxml2-dev \
+    make \
+    nasm \
+    perl \
+    pkg-config \
+    python \
+    x11proto-xext-dev \
+    xserver-xorg-dev \
+    yasm \
+    zlib1g-dev
 
 # compile 3rd party libs
 RUN \
- echo "**** grabbing aom ****" && \
- mkdir -p /tmp/aom && \
- git clone \
-	--branch ${AOM} \
-	--depth 1 https://aomedia.googlesource.com/aom \
-	/tmp/aom
+  echo "**** grabbing aom ****" && \
+  mkdir -p /tmp/aom && \
+  git clone \
+    --branch ${AOM} \
+    --depth 1 https://aomedia.googlesource.com/aom \
+    /tmp/aom
 RUN \
- echo "**** compiling aom ****" && \
- cd /tmp/aom && \
- rm -rf \
-	CMakeCache.txt \
-	CMakeFiles && \
- mkdir -p \
-	aom_build && \
- cd aom_build && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 .. && \
- make && \
- make install
+  echo "**** compiling aom ****" && \
+  cd /tmp/aom && \
+  rm -rf \
+    CMakeCache.txt \
+    CMakeFiles && \
+  mkdir -p \
+    aom_build && \
+  cd aom_build && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 .. && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fdk-aac ****" && \
- mkdir -p /tmp/fdk-aac && \
- curl -Lf \
-	https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fdk-aac
+  echo "**** grabbing fdk-aac ****" && \
+  mkdir -p /tmp/fdk-aac && \
+  curl -Lf \
+    https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fdk-aac
 RUN \
- echo "**** compiling fdk-aac ****" && \
- cd /tmp/fdk-aac && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling fdk-aac ****" && \
+  cd /tmp/fdk-aac && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing freetype ****" && \
- mkdir -p /tmp/freetype && \
- curl -Lf \
-	https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/freetype
+  echo "**** grabbing freetype ****" && \
+  mkdir -p /tmp/freetype && \
+  curl -Lf \
+    https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
- echo "**** compiling freetype ****" && \
- cd /tmp/freetype && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling freetype ****" && \
+  cd /tmp/freetype && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fribidi ****" && \
- mkdir -p /tmp/fribidi && \
- curl -Lf \
-	https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fribidi
+  echo "**** grabbing fribidi ****" && \
+  mkdir -p /tmp/fribidi && \
+  curl -Lf \
+    https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fribidi
 RUN \
- echo "**** compiling fribidi ****" && \
- cd /tmp/fribidi && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make -j 1 && \
- make install
+  echo "**** compiling fribidi ****" && \
+  cd /tmp/fribidi && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make -j 1 && \
+  make install
 RUN \
- echo "**** grabbing kvazaar ****" && \
- mkdir -p /tmp/kvazaar && \
- curl -Lf \
-	https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/kvazaar
+  echo "**** grabbing kvazaar ****" && \
+  mkdir -p /tmp/kvazaar && \
+  curl -Lf \
+    https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/kvazaar
 RUN \
- echo "**** compiling kvazaar ****" && \
- cd /tmp/kvazaar && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling kvazaar ****" && \
+  cd /tmp/kvazaar && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing lame ****" && \
- mkdir -p /tmp/lame && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/lame
+  echo "**** grabbing lame ****" && \
+  mkdir -p /tmp/lame && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/lame
 RUN \
- echo "**** compiling lame ****" && \
- cd /tmp/lame && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-        /usr/share/automake-1.15/config.sub \
-        config.sub && \
- ./configure \
-	--disable-frontend \
-	--disable-static \
-	--enable-nasm \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling lame ****" && \
+  cd /tmp/lame && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  ./configure \
+    --disable-frontend \
+    --disable-static \
+    --enable-nasm \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libass ****" && \
- mkdir -p /tmp/libass && \
- curl -Lf \
-	https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/libass
+  echo "**** grabbing libass ****" && \
+  mkdir -p /tmp/libass && \
+  curl -Lf \
+    https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/libass
 RUN \
- echo "**** compiling libass ****" && \
- cd /tmp/libass && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling libass ****" && \
+  cd /tmp/libass && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing ogg ****" && \
- mkdir -p /tmp/ogg && \
- curl -Lf \
-	http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/ogg
+  echo "**** grabbing ogg ****" && \
+  mkdir -p /tmp/ogg && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/ogg
 RUN \
- echo "**** compiling ogg ****" && \
- cd /tmp/ogg && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling ogg ****" && \
+  cd /tmp/ogg && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opencore-amr ****" && \
- mkdir -p /tmp/opencore-amr && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opencore-amr
+  echo "**** grabbing opencore-amr ****" && \
+  mkdir -p /tmp/opencore-amr && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opencore-amr
 RUN \
- echo "**** compiling opencore-amr ****" && \
- cd /tmp/opencore-amr && \
- ./configure \
-	--disable-static \
-	--enable-shared  && \
- make && \
- make install
+  echo "**** compiling opencore-amr ****" && \
+  cd /tmp/opencore-amr && \
+  ./configure \
+    --disable-static \
+    --enable-shared  && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing openjpeg ****" && \
- mkdir -p /tmp/openjpeg && \
- curl -Lf \
-	https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/openjpeg
+  echo "**** grabbing openjpeg ****" && \
+  mkdir -p /tmp/openjpeg && \
+  curl -Lf \
+    https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/openjpeg
 RUN \
- echo "**** compiling openjpeg ****" && \
- cd /tmp/openjpeg && \
- rm -Rf \
-	thirdparty/libpng/* && \
- curl -Lf \
-	https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
-	tar -zx --strip-components=1 -C thirdparty/libpng/ && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 \
-	-DBUILD_THIRDPARTY:BOOL=ON . && \
- make && \
- make install
+  echo "**** compiling openjpeg ****" && \
+  cd /tmp/openjpeg && \
+  rm -Rf \
+    thirdparty/libpng/* && \
+  curl -Lf \
+    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
+    tar -zx --strip-components=1 -C thirdparty/libpng/ && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 \
+    -DBUILD_THIRDPARTY:BOOL=ON . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opus ****" && \
- mkdir -p /tmp/opus && \
- curl -Lf \
-	https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opus
+  echo "**** grabbing opus ****" && \
+  mkdir -p /tmp/opus && \
+  curl -Lf \
+    https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opus
 RUN \
- echo "**** compiling opus ****" && \
- cd /tmp/opus && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling opus ****" && \
+  cd /tmp/opus && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing theora ****" && \
- mkdir -p /tmp/theora && \
- curl -Lf \
-	http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/theora
+  echo "**** grabbing theora ****" && \
+  mkdir -p /tmp/theora && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/theora
 RUN \
- echo "**** compiling theora ****" && \
- cd /tmp/theora && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-	/usr/share/automake-1.15/config.sub \
-	config.sub && \
- curl -fL \
-	'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
-	> png.patch && \
- patch ./examples/png2theora.c < png.patch && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling theora ****" && \
+  cd /tmp/theora && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  curl -fL \
+    'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
+    > png.patch && \
+  patch ./examples/png2theora.c < png.patch && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vid.stab ****" && \
- mkdir -p /tmp/vid.stab && \
- curl -Lf \
-	https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vid.stab
+  echo "**** grabbing vid.stab ****" && \
+  mkdir -p /tmp/vid.stab && \
+  curl -Lf \
+    https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vid.stab
 RUN \
- echo "**** compiling vid.stab ****" && \
- cd /tmp/vid.stab && \
- echo "" > \
-	CMakeModules/FindSSE.cmake && \
- cmake . && \
- make && \
- make install
+  echo "**** compiling vid.stab ****" && \
+  cd /tmp/vid.stab && \
+  echo "" > \
+    CMakeModules/FindSSE.cmake && \
+  cmake . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vorbis ****" && \
- mkdir -p /tmp/vorbis && \
- curl -Lf \
-	http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vorbis
+  echo "**** grabbing vorbis ****" && \
+  mkdir -p /tmp/vorbis && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vorbis
 RUN \
- echo "**** compiling vorbis ****" && \
- cd /tmp/vorbis && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling vorbis ****" && \
+  cd /tmp/vorbis && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vpx ****" && \
- mkdir -p /tmp/vpx && \
- curl -Lf \
-	https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vpx
+  echo "**** grabbing vpx ****" && \
+  mkdir -p /tmp/vpx && \
+  curl -Lf \
+    https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vpx
 RUN \
- echo "**** compiling vpx ****" && \
- cd /tmp/vpx && \
- ./configure \
-	--disable-debug \
-	--disable-docs \
-	--disable-examples \
-	--disable-install-bins \
-	--disable-static \
-	--disable-unit-tests \
-	--enable-pic \
-	--enable-shared \
-	--enable-vp8 \
-	--enable-vp9 \
-	--enable-vp9-highbitdepth && \
- make && \
- make install
+  echo "**** compiling vpx ****" && \
+  cd /tmp/vpx && \
+  ./configure \
+    --disable-debug \
+    --disable-docs \
+    --disable-examples \
+    --disable-install-bins \
+    --disable-static \
+    --disable-unit-tests \
+    --enable-pic \
+    --enable-shared \
+    --enable-vp8 \
+    --enable-vp9 \
+    --enable-vp9-highbitdepth && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing x264 ****" && \
- mkdir -p /tmp/x264 && \
- curl -Lf \
-	https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
-	tar -jx --strip-components=1 -C /tmp/x264
+  echo "**** grabbing x264 ****" && \
+  mkdir -p /tmp/x264 && \
+  curl -Lf \
+    https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/x264
 RUN \
- echo "**** compiling x264 ****" && \
- cd /tmp/x264 && \
- ./configure \
-	--disable-cli \
-	--disable-static \
-	--enable-pic \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling x264 ****" && \
+  cd /tmp/x264 && \
+  ./configure \
+    --disable-cli \
+    --disable-static \
+    --enable-pic \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing x265 ****" && \
- mkdir -p /tmp/x265 && \
- curl -Lf \
-	https://github.com/videolan/x265/archive/refs/tags/${X265}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/x265
+  echo "**** grabbing x265 ****" && \
+  mkdir -p /tmp/x265 && \
+  curl -Lf \
+    https://github.com/videolan/x265/archive/refs/tags/${X265}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/x265
 RUN \
- echo "**** compiling x265 ****" && \
- cd /tmp/x265/build/linux && \
- export CXXFLAGS="-fPIC" && \
- ./multilib.sh && \
- make -C 8bit install
+  echo "**** compiling x265 ****" && \
+  cd /tmp/x265/build/linux && \
+  export CXXFLAGS="-fPIC" && \
+  ./multilib.sh && \
+  make -C 8bit install
 RUN \
- echo "**** grabbing xvid ****" && \
- mkdir -p /tmp/xvid && \
- curl -Lf \
-	https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/xvid
+  echo "**** grabbing xvid ****" && \
+  mkdir -p /tmp/xvid && \
+  curl -Lf \
+    https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/xvid
 RUN \
- echo "**** compiling xvid ****" && \
- cd /tmp/xvid/build/generic && \
- ./configure && \ 
- make && \
- make install
+  echo "**** compiling xvid ****" && \
+  cd /tmp/xvid/build/generic && \
+  ./configure && \ 
+  make && \
+  make install
 
 # main ffmpeg build
 RUN \
- echo "**** Versioning ****" && \
- if [ -z ${FFMPEG_VERSION+x} ]; then \
-	FFMPEG=${FFMPEG_HARD}; \
- else \
-	FFMPEG=${FFMPEG_VERSION}; \
- fi && \
- echo "**** grabbing ffmpeg ****" && \
- mkdir -p /tmp/ffmpeg && \
- echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
- curl -Lf \
-        https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
-        tar -jx --strip-components=1 -C /tmp/ffmpeg
+  echo "**** Versioning ****" && \
+  if [ -z ${FFMPEG_VERSION+x} ]; then \
+    FFMPEG=${FFMPEG_HARD}; \
+  else \
+    FFMPEG=${FFMPEG_VERSION}; \
+  fi && \
+  echo "**** grabbing ffmpeg ****" && \
+  mkdir -p /tmp/ffmpeg && \
+  echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
+  curl -Lf \
+    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/ffmpeg
 RUN \
- echo "**** compiling ffmpeg ****" && \
- cd /tmp/ffmpeg && \
- ./configure \
-	--disable-debug \
-	--disable-doc \
-	--disable-ffplay \
-	--enable-ffprobe \
-	--enable-avresample \
-	--enable-gpl \
-	--enable-libaom \
-	--enable-libass \
-	--enable-libfdk_aac \
-	--enable-libfreetype \
-	--enable-libkvazaar \
-	--enable-libmp3lame \
-	--enable-libopencore-amrnb \
-	--enable-libopencore-amrwb \
-	--enable-libopenjpeg \
-	--enable-libopus \
-	--enable-libtheora \
-	--enable-libv4l2 \
-	--enable-libvidstab \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libxml2 \
-	--enable-libx264 \
-	--enable-libx265 \
-	--enable-libxvid \
-	--enable-nonfree \
-	--enable-openssl \
-	--enable-small \
-	--enable-stripping \
-	--enable-version3 && \
- make
+  echo "**** compiling ffmpeg ****" && \
+  cd /tmp/ffmpeg && \
+  ./configure \
+    --disable-debug \
+    --disable-doc \
+    --disable-ffplay \
+    --enable-ffprobe \
+    --enable-avresample \
+    --enable-gpl \
+    --enable-libaom \
+    --enable-libass \
+    --enable-libfdk_aac \
+    --enable-libfreetype \
+    --enable-libkvazaar \
+    --enable-libmp3lame \
+    --enable-libopencore-amrnb \
+    --enable-libopencore-amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libxml2 \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-nonfree \
+    --enable-openssl \
+    --enable-small \
+    --enable-stripping \
+    --enable-version3 && \
+  make
 
 RUN \
- echo "**** arrange files ****" && \
- ldconfig && \
- mkdir -p /buildout/usr/local/bin && \
- cp \
-	/tmp/ffmpeg/ffmpeg \
-	/buildout/usr/local/bin && \
- cp \
-	/tmp/ffmpeg/ffprobe \
-	/buildout/usr/local/bin && \
- mkdir -p /buildout/usr/lib && \
- ldd /tmp/ffmpeg/ffmpeg \
-	| awk '/local/ {print $3}' \
-	| xargs -i cp -L {} /buildout/usr/lib/
+  echo "**** arrange files ****" && \
+  ldconfig && \
+  mkdir -p /buildout/usr/local/bin && \
+  cp \
+    /tmp/ffmpeg/ffmpeg \
+    /buildout/usr/local/bin && \
+  cp \
+    /tmp/ffmpeg/ffprobe \
+    /buildout/usr/local/bin && \
+  mkdir -p /buildout/usr/lib && \
+  ldd /tmp/ffmpeg/ffmpeg \
+    | awk '/local/ {print $3}' \
+    | xargs -i cp -L {} /buildout/usr/lib/
 
 # Storage layer consumed downstream
 FROM scratch
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index bbe094c..6b8d3f8 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,443 +1,443 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal as buildstage
 
 # set version label
 ARG FFMPEG_VERSION
 
 # common env
 ENV \
- DEBIAN_FRONTEND="noninteractive" \
- MAKEFLAGS="-j4"
+  DEBIAN_FRONTEND="noninteractive" \
+  MAKEFLAGS="-j4"
 
 # versions
 ENV \
- AOM=v1.0.0 \
- FDKAAC=2.0.1 \
- FFMPEG_HARD=4.4 \
- FREETYPE=2.9.1 \
- FRIBIDI=1.0.8 \
- KVAZAAR=2.0.0 \
- LAME=3.100 \
- LIBASS=0.14.0 \
- LIBDRM=2.4.98 \
- LIBVA=2.6.0 \
- LIBVDPAU=1.2 \
- LIBVIDSTAB=1.1.0 \
- NVCODEC=n9.1.23.1 \
- OGG=1.3.4 \
- OPENCOREAMR=0.1.5 \
- OPENJPEG=2.3.1 \
- OPUS=1.3 \
- THEORA=1.1.1 \
- VORBIS=1.3.6 \
- VPX=1.10.0 \
- X265=3.4 \
- XVID=1.3.7 
+  AOM=v1.0.0 \
+  FDKAAC=2.0.1 \
+  FFMPEG_HARD=4.4 \
+  FREETYPE=2.9.1 \
+  FRIBIDI=1.0.8 \
+  KVAZAAR=2.0.0 \
+  LAME=3.100 \
+  LIBASS=0.14.0 \
+  LIBDRM=2.4.98 \
+  LIBVA=2.6.0 \
+  LIBVDPAU=1.2 \
+  LIBVIDSTAB=1.1.0 \
+  NVCODEC=n9.1.23.1 \
+  OGG=1.3.4 \
+  OPENCOREAMR=0.1.5 \
+  OPENJPEG=2.3.1 \
+  OPUS=1.3 \
+  THEORA=1.1.1 \
+  VORBIS=1.3.6 \
+  VPX=1.10.0 \
+  X265=3.4 \
+  XVID=1.3.7
 
 RUN \
- echo "**** install build packages ****" && \
- apt-get update && \ 
- apt-get install -y \
-	autoconf \
-	automake \
-	bzip2 \
-	ca-certificates \
-	cmake \
-	curl \
-	diffutils \
-	g++ \
-	gcc \
-	git \
-	gperf \
-	libexpat1-dev \
-        libfontconfig1-dev \
-	libxext-dev \
-	libgcc-7-dev \
-	libgomp1 \
-	libpciaccess-dev \
-	libssl-dev \
-	libtool \
-	libv4l-dev \
-	libx11-dev \
-	libxml2-dev \
-	make \
-	nasm \
-	perl \
-	pkg-config \
-	python \
-	x11proto-xext-dev \
-	xserver-xorg-dev \
-	yasm \
-	zlib1g-dev 
+  echo "**** install build packages ****" && \
+  apt-get update && \ 
+  apt-get install -y \
+    autoconf \
+    automake \
+    bzip2 \
+    ca-certificates \
+    cmake \
+    curl \
+    diffutils \
+    g++ \
+    gcc \
+    git \
+    gperf \
+    libexpat1-dev \
+    libfontconfig1-dev \
+    libxext-dev \
+    libgcc-7-dev \
+    libgomp1 \
+    libpciaccess-dev \
+    libssl-dev \
+    libtool \
+    libv4l-dev \
+    libx11-dev \
+    libxml2-dev \
+    make \
+    nasm \
+    perl \
+    pkg-config \
+    python \
+    x11proto-xext-dev \
+    xserver-xorg-dev \
+    yasm \
+    zlib1g-dev 
 
 # compile 3rd party libs
 RUN \
- echo "**** grabbing aom ****" && \
- mkdir -p /tmp/aom && \
- git clone \
-	--branch ${AOM} \
-	--depth 1 https://aomedia.googlesource.com/aom \
-	/tmp/aom
+  echo "**** grabbing aom ****" && \
+  mkdir -p /tmp/aom && \
+  git clone \
+    --branch ${AOM} \
+    --depth 1 https://aomedia.googlesource.com/aom \
+    /tmp/aom
 RUN \
- echo "**** compiling aom ****" && \
- cd /tmp/aom && \
- rm -rf \
-	CMakeCache.txt \
-	CMakeFiles && \
- mkdir -p \
-	aom_build && \
- cd aom_build && \
- cmake \
-	-DAOM_TARGET_CPU=generic \
-	-DBUILD_STATIC_LIBS=0 .. && \
- make && \
- make install
+  echo "**** compiling aom ****" && \
+  cd /tmp/aom && \
+  rm -rf \
+    CMakeCache.txt \
+    CMakeFiles && \
+  mkdir -p \
+    aom_build && \
+  cd aom_build && \
+  cmake \
+    -DAOM_TARGET_CPU=generic \
+    -DBUILD_STATIC_LIBS=0 .. && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fdk-aac ****" && \
- mkdir -p /tmp/fdk-aac && \
- curl -Lf \
-	https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fdk-aac
+  echo "**** grabbing fdk-aac ****" && \
+  mkdir -p /tmp/fdk-aac && \
+  curl -Lf \
+    https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fdk-aac
 RUN \
- echo "**** compiling fdk-aac ****" && \
- cd /tmp/fdk-aac && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling fdk-aac ****" && \
+  cd /tmp/fdk-aac && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
+  RUN \
+  echo "**** grabbing freetype ****" && \
+  mkdir -p /tmp/freetype && \
+  curl -Lf \
+    https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
- echo "**** grabbing freetype ****" && \
- mkdir -p /tmp/freetype && \
- curl -Lf \
-	https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/freetype
+  echo "**** compiling freetype ****" && \
+  cd /tmp/freetype && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
+  RUN \
+  echo "**** grabbing fribidi ****" && \
+  mkdir -p /tmp/fribidi && \
+  curl -Lf \
+    https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fribidi
 RUN \
- echo "**** compiling freetype ****" && \
- cd /tmp/freetype && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling fribidi ****" && \
+  cd /tmp/fribidi && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make -j 1 && \
+  make install
+  RUN \
+  echo "**** grabbing kvazaar ****" && \
+  mkdir -p /tmp/kvazaar && \
+  curl -Lf \
+    https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/kvazaar
+  RUN \
+  echo "**** compiling kvazaar ****" && \
+  cd /tmp/kvazaar && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing fribidi ****" && \
- mkdir -p /tmp/fribidi && \
- curl -Lf \
-	https://github.com/fribidi/fribidi/archive/v${FRIBIDI}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/fribidi
+  echo "**** grabbing lame ****" && \
+  mkdir -p /tmp/lame && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/lame
 RUN \
- echo "**** compiling fribidi ****" && \
- cd /tmp/fribidi && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make -j 1 && \
- make install
+  echo "**** compiling lame ****" && \
+  cd /tmp/lame && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+          /usr/share/automake-1.16/config.sub \
+          config.sub && \
+  ./configure \
+    --disable-frontend \
+    --disable-static \
+    --enable-nasm \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing kvazaar ****" && \
- mkdir -p /tmp/kvazaar && \
- curl -Lf \
-	https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/kvazaar
+  echo "**** grabbing libass ****" && \
+  mkdir -p /tmp/libass && \
+  curl -Lf \
+    https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/libass
 RUN \
- echo "**** compiling kvazaar ****" && \
- cd /tmp/kvazaar && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling libass ****" && \
+  cd /tmp/libass && \
+  ./autogen.sh && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing lame ****" && \
- mkdir -p /tmp/lame && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/lame
+  echo "**** grabbing ogg ****" && \
+  mkdir -p /tmp/ogg && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/ogg
 RUN \
- echo "**** compiling lame ****" && \
- cd /tmp/lame && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-        /usr/share/automake-1.15/config.sub \
-        config.sub && \
- ./configure \
-	--disable-frontend \
-	--disable-static \
-	--enable-nasm \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling ogg ****" && \
+  cd /tmp/ogg && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing libass ****" && \
- mkdir -p /tmp/libass && \
- curl -Lf \
-	https://github.com/libass/libass/archive/${LIBASS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/libass
+  echo "**** grabbing opencore-amr ****" && \
+  mkdir -p /tmp/opencore-amr && \
+  curl -Lf \
+    http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opencore-amr
 RUN \
- echo "**** compiling libass ****" && \
- cd /tmp/libass && \
- ./autogen.sh && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling opencore-amr ****" && \
+  cd /tmp/opencore-amr && \
+  ./configure \
+    --disable-static \
+    --enable-shared  && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing ogg ****" && \
- mkdir -p /tmp/ogg && \
- curl -Lf \
-	http://downloads.xiph.org/releases/ogg/libogg-${OGG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/ogg
+  echo "**** grabbing openjpeg ****" && \
+  mkdir -p /tmp/openjpeg && \
+  curl -Lf \
+    https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/openjpeg
 RUN \
- echo "**** compiling ogg ****" && \
- cd /tmp/ogg && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling openjpeg ****" && \
+  cd /tmp/openjpeg && \
+  rm -Rf \
+    thirdparty/libpng/* && \
+  curl -Lf \
+    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
+    tar -zx --strip-components=1 -C thirdparty/libpng/ && \
+  cmake \
+    -DBUILD_STATIC_LIBS=0 \
+    -DBUILD_THIRDPARTY:BOOL=ON . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opencore-amr ****" && \
- mkdir -p /tmp/opencore-amr && \
- curl -Lf \
-	http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${OPENCOREAMR}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opencore-amr
+  echo "**** grabbing opus ****" && \
+  mkdir -p /tmp/opus && \
+  curl -Lf \
+    https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/opus
 RUN \
- echo "**** compiling opencore-amr ****" && \
- cd /tmp/opencore-amr && \
- ./configure \
-	--disable-static \
-	--enable-shared  && \
- make && \
- make install
+  echo "**** compiling opus ****" && \
+  cd /tmp/opus && \
+  autoreconf -fiv && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing openjpeg ****" && \
- mkdir -p /tmp/openjpeg && \
- curl -Lf \
-	https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/openjpeg
+  echo "**** grabbing theora ****" && \
+  mkdir -p /tmp/theora && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/theora
 RUN \
- echo "**** compiling openjpeg ****" && \
- cd /tmp/openjpeg && \
- rm -Rf \
-	thirdparty/libpng/* && \
- curl -Lf \
-	https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
-	tar -zx --strip-components=1 -C thirdparty/libpng/ && \
- cmake \
-	-DBUILD_STATIC_LIBS=0 \
-	-DBUILD_THIRDPARTY:BOOL=ON . && \
- make && \
- make install
+  echo "**** compiling theora ****" && \
+  cd /tmp/theora && \
+  cp \
+    /usr/share/automake-1.16/config.guess \
+    config.guess && \
+  cp \
+    /usr/share/automake-1.16/config.sub \
+    config.sub && \
+  curl -fL \
+    'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
+    > png.patch && \
+  patch ./examples/png2theora.c < png.patch && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing opus ****" && \
- mkdir -p /tmp/opus && \
- curl -Lf \
-	https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/opus
+  echo "**** grabbing vid.stab ****" && \
+  mkdir -p /tmp/vid.stab && \
+  curl -Lf \
+    https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vid.stab
 RUN \
- echo "**** compiling opus ****" && \
- cd /tmp/opus && \
- autoreconf -fiv && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling vid.stab ****" && \
+  cd /tmp/vid.stab && \
+  echo "" > \
+    CMakeModules/FindSSE.cmake && \
+  cmake . && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing theora ****" && \
- mkdir -p /tmp/theora && \
- curl -Lf \
-	http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/theora
+  echo "**** grabbing vorbis ****" && \
+  mkdir -p /tmp/vorbis && \
+  curl -Lf \
+    http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vorbis
 RUN \
- echo "**** compiling theora ****" && \
- cd /tmp/theora && \
- cp \
-	/usr/share/automake-1.15/config.guess \
-	config.guess && \
- cp \
-	/usr/share/automake-1.15/config.sub \
-	config.sub && \
- curl -fL \
-	'https://gitlab.xiph.org/xiph/theora/-/commit/7288b539c52e99168488dc3a343845c9365617c8.diff' \
-	> png.patch && \
- patch ./examples/png2theora.c < png.patch && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling vorbis ****" && \
+  cd /tmp/vorbis && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vid.stab ****" && \
- mkdir -p /tmp/vid.stab && \
- curl -Lf \
-	https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vid.stab
+  echo "**** grabbing vpx ****" && \
+  mkdir -p /tmp/vpx && \
+  curl -Lf \
+    https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vpx
 RUN \
- echo "**** compiling vid.stab ****" && \
- cd /tmp/vid.stab && \
- echo "" > \
-	CMakeModules/FindSSE.cmake && \
- cmake . && \
- make && \
- make install
+  echo "**** compiling vpx ****" && \
+  cd /tmp/vpx && \
+  LDFLAGS=-mfloat-abi=hard ./configure \
+    --disable-debug \
+    --disable-docs \
+    --disable-examples \
+    --disable-install-bins \
+    --disable-static \
+    --disable-unit-tests \
+    --enable-pic \
+    --enable-shared \
+    --enable-vp8 \
+    --enable-vp9 \
+    --enable-vp9-highbitdepth \
+    --extra-cflags="-mfloat-abi=hard" \
+    --extra-cxxflags="-mfloat-abi=hard" && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vorbis ****" && \
- mkdir -p /tmp/vorbis && \
- curl -Lf \
-	http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vorbis
+  echo "**** grabbing x264 ****" && \
+  mkdir -p /tmp/x264 && \
+  curl -Lf \
+    https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/x264
 RUN \
- echo "**** compiling vorbis ****" && \
- cd /tmp/vorbis && \
- ./configure \
-	--disable-static \
-	--enable-shared && \
- make && \
- make install
+  echo "**** compiling x264 ****" && \
+  cd /tmp/x264 && \
+  ./configure \
+    --disable-cli \
+    --disable-static \
+    --enable-pic \
+    --enable-shared && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing vpx ****" && \
- mkdir -p /tmp/vpx && \
- curl -Lf \
-	https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/vpx
+  echo "**** grabbing x265 ****" && \
+  mkdir -p /tmp/x265 && \
+  curl -Lf \
+    http://anduin.linuxfromscratch.org/BLFS/x265/x265_${X265}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/x265
 RUN \
- echo "**** compiling vpx ****" && \
- cd /tmp/vpx && \
- LDFLAGS=-mfloat-abi=hard ./configure \
-	--disable-debug \
-	--disable-docs \
-	--disable-examples \
-	--disable-install-bins \
-	--disable-static \
-	--disable-unit-tests \
-	--enable-pic \
-	--enable-shared \
-	--enable-vp8 \
-	--enable-vp9 \
-	--enable-vp9-highbitdepth \
-	--extra-cflags="-mfloat-abi=hard" \
-	--extra-cxxflags="-mfloat-abi=hard" && \
- make && \
- make install
+  echo "**** compiling x265 ****" && \
+  cd /tmp/x265/build/linux && \
+  curl -fL \
+    https://sources.debian.org/data/main/x/x265/3.4-2/debian/patches/0001-Fix-arm-flags.patch \
+    > arm.patch && \
+  patch ../../source/CMakeLists.txt < arm.patch && \
+  cmake \
+    -D ENABLE_ASSEMBLY=OFF \
+    -D ENABLE_CLI=OFF \
+    -G "Unix Makefiles" ../../source && \
+  make && \
+  make install
 RUN \
- echo "**** grabbing x264 ****" && \
- mkdir -p /tmp/x264 && \
- curl -Lf \
-	https://code.videolan.org/videolan/x264/-/archive/master/x264-stable.tar.bz2 | \
-	tar -jx --strip-components=1 -C /tmp/x264
-RUN \
- echo "**** compiling x264 ****" && \
- cd /tmp/x264 && \
- ./configure \
-	--disable-cli \
-	--disable-static \
-	--enable-pic \
-	--enable-shared && \
- make && \
- make install
-RUN \
- echo "**** grabbing x265 ****" && \
- mkdir -p /tmp/x265 && \
- curl -Lf \
-	http://anduin.linuxfromscratch.org/BLFS/x265/x265_${X265}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/x265
-RUN \
- echo "**** compiling x265 ****" && \
- cd /tmp/x265/build/linux && \
- curl -fL \
-	https://sources.debian.org/data/main/x/x265/3.4-2/debian/patches/0001-Fix-arm-flags.patch \
-	> arm.patch && \
- patch ../../source/CMakeLists.txt < arm.patch && \
- cmake \
-	-D ENABLE_ASSEMBLY=OFF \
-	-D ENABLE_CLI=OFF \
-	-G "Unix Makefiles" ../../source && \
- make && \
- make install
-RUN \
- echo "**** grabbing xvid ****" && \
- mkdir -p /tmp/xvid && \
- curl -Lf \
-	https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
-	tar -zx --strip-components=1 -C /tmp/xvid
-RUN \
- echo "**** compiling xvid ****" && \
- cd /tmp/xvid/build/generic && \
- ./configure && \ 
- make && \
- make install
+  echo "**** grabbing xvid ****" && \
+  mkdir -p /tmp/xvid && \
+  curl -Lf \
+    https://downloads.xvid.com/downloads/xvidcore-${XVID}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/xvid
+  RUN \
+  echo "**** compiling xvid ****" && \
+  cd /tmp/xvid/build/generic && \
+  ./configure && \ 
+  make && \
+  make install
 
 # main ffmpeg build
 RUN \
- echo "**** Versioning ****" && \
- if [ -z ${FFMPEG_VERSION+x} ]; then \
-	FFMPEG=${FFMPEG_HARD}; \
- else \
-	FFMPEG=${FFMPEG_VERSION}; \
- fi && \
- echo "**** grabbing ffmpeg ****" && \
- mkdir -p /tmp/ffmpeg && \
- echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
- curl -Lf \
-        https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
-        tar -jx --strip-components=1 -C /tmp/ffmpeg
+  echo "**** Versioning ****" && \
+  if [ -z ${FFMPEG_VERSION+x} ]; then \
+    FFMPEG=${FFMPEG_HARD}; \
+  else \
+    FFMPEG=${FFMPEG_VERSION}; \
+  fi && \
+  echo "**** grabbing ffmpeg ****" && \
+  mkdir -p /tmp/ffmpeg && \
+  echo "https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2" && \
+  curl -Lf \
+    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
+    tar -jx --strip-components=1 -C /tmp/ffmpeg
 RUN \
- echo "**** compiling ffmpeg ****" && \
- cd /tmp/ffmpeg && \
- ./configure \
-	--disable-debug \
-	--disable-doc \
-	--disable-ffplay \
-	--enable-ffprobe \
-	--enable-avresample \
-	--enable-gpl \
-	--enable-libaom \
-	--enable-libass \
-	--enable-libfdk_aac \
-	--enable-libfreetype \
-	--enable-libkvazaar \
-	--enable-libmp3lame \
-	--enable-libopencore-amrnb \
-	--enable-libopencore-amrwb \
-	--enable-libopenjpeg \
-	--enable-libopus \
-	--enable-libtheora \
-	--enable-libv4l2 \
-	--enable-libvidstab \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libxml2 \
-	--enable-libx264 \
-	--enable-libx265 \
-	--enable-libxvid \
-	--enable-nonfree \
-	--enable-openssl \
-	--enable-small \
-	--enable-stripping \
-	--enable-version3 && \
- make
+  echo "**** compiling ffmpeg ****" && \
+  cd /tmp/ffmpeg && \
+  ./configure \
+    --disable-debug \
+    --disable-doc \
+    --disable-ffplay \
+    --enable-ffprobe \
+    --enable-avresample \
+    --enable-gpl \
+    --enable-libaom \
+    --enable-libass \
+    --enable-libfdk_aac \
+    --enable-libfreetype \
+    --enable-libkvazaar \
+    --enable-libmp3lame \
+    --enable-libopencore-amrnb \
+    --enable-libopencore-amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libxml2 \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-nonfree \
+    --enable-openssl \
+    --enable-small \
+    --enable-stripping \
+    --enable-version3 && \
+  make
 
 RUN \
- echo "**** arrange files ****" && \
- ldconfig && \
- mkdir -p /buildout/usr/local/bin && \
- cp \
-	/tmp/ffmpeg/ffmpeg \
-	/buildout/usr/local/bin && \
- cp \
-	/tmp/ffmpeg/ffprobe \
-	/buildout/usr/local/bin && \
- mkdir -p /buildout/usr/lib && \
- ldd /tmp/ffmpeg/ffmpeg \
-	| awk '/local/ {print $3}' \
-	| xargs -i cp -L {} /buildout/usr/lib/
+  echo "**** arrange files ****" && \
+  ldconfig && \
+  mkdir -p /buildout/usr/local/bin && \
+  cp \
+    /tmp/ffmpeg/ffmpeg \
+    /buildout/usr/local/bin && \
+  cp \
+    /tmp/ffmpeg/ffprobe \
+    /buildout/usr/local/bin && \
+  mkdir -p /buildout/usr/lib && \
+  ldd /tmp/ffmpeg/ffmpeg \
+    | awk '/local/ {print $3}' \
+    | xargs -i cp -L {} /buildout/usr/lib/
 
 # Storage layer consumed downstream
 FROM scratch