diff --git a/.Dockerfile.kate-swp b/.Dockerfile.kate-swp
deleted file mode 100644
index 4f04fe0..0000000
Binary files a/.Dockerfile.kate-swp and /dev/null differ
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2b6f0bb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# accountfree-docker
+---
+
+This repository contains the Dockerfiles required to build AccountFree:    
+- ubuntu-pyside2-xvfb: Ubuntu focal base containing PySide2 (Qt for Python) & Xvfb (virtual X server that does not require a display).    
+- ubuntu-pyside2-xvfb-wine: Contains the latest wine installation, with Windows python3, PySide2 & pyinstaller + Xvfb.    
+- accountfree-build-img: Based on ubuntu-pyside2-xvfb, contains AccountFree dependencies to build it's Linux packages.    
+- accountfree-build-img: Based on ubuntu-pyside2-xvfb-wine, contains AccountFree dependencies to build it's Windows installer.    
+
+NOTE: In Docker, use xvfb-runto run a program within a Xvfb server.
diff --git a/accountfree-build-img-wine/Dockerfile b/accountfree-build-img-wine/Dockerfile
index 43601b6..c83eb02 100644
--- a/accountfree-build-img-wine/Dockerfile
+++ b/accountfree-build-img-wine/Dockerfile
@@ -1,17 +1,15 @@
-FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.14.1
+FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.15.0
+
 RUN apt-get update
 RUN apt install unzip nsis -y
-# Installing tor to not get the popup
-RUN wget https://dist.torproject.org/torbrowser/9.0.5/tor-win64-0.4.2.6.zip
-RUN unzip tor-win64-0.4.2.6.zip -x Data/*
-RUN mv Tor /wine/drive_c/
+RUN apt clean
+# Installing tor
+RUN wget https://dist.torproject.org/torbrowser/9.5.4/tor-win64-0.4.3.6.zip \
+    && ls -la \
+    && unzip tor-win64-0.4.3.6.zip -x Data/* \
+    && rm tor-win64-0.4.3.6.zip \
+    && mv Tor /wine/drive_c/
+
 RUN wine reg ADD "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" /v PATH /f /t REG_EXPAND_SZ /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;C:\Tor"
-RUN rm tor-win64-0.4.2.6.zip
-
-# Installing pyinstaller
-RUN pip install pyinstaller
-RUN echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller
-RUN chmod +x /usr/bin/pyinstaller
-
 # Installing dependencies
 RUN pip install pyside2 packaging websocket-client pywin32 stem requests
diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile b/ubuntu-pyside2-xvfb-wine/Dockerfile
index f15f988..da08cf1 100644
--- a/ubuntu-pyside2-xvfb-wine/Dockerfile
+++ b/ubuntu-pyside2-xvfb-wine/Dockerfile
@@ -1,90 +1,9 @@
-FROM ubuntu:19.10
+FROM cdrx/pyinstaller-windows:python3
 
-# Some of the work here comes from cdrx/docker-pyinstaller adapted for drone and with modifications for Qt
-ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.6
-ARG PYINSTALLER_VERSION=3.6
-
-# Installing dependencies
-RUN set -x \
-    && dpkg --add-architecture i386 \
-    && apt-get update -qy \
-    && apt-get upgrade -qy \
-    && apt-get install --no-install-recommends -qfy rename gpg-agent apt-transport-https software-properties-common wget curl p7zip
-    #&& apt-get install --no-install-recommends -qfy gcc-multilib libasound2-dev:i386 libgsm1-dev:i386 libjpeg8-dev:i386 liblcms2-dev:i386 libldap2-dev:i386 libmpg123-dev:i386 libopenal-dev:i386 libv4l-dev:i386 libx11-dev:i386 libxinerama-dev:i386 libxml2-dev:i386 zlib1g-dev:i386 \
-    #&& apt-get install --no-install-recommends -qfy libcapi20-dev:i386 libcups2:i386 libdbus-1-3:i386 libfontconfig:i386 libfreetype6:i386 libglu1-mesa:i386 libgphoto2-6:i386 libncurses5:i386 libosmesa6:i386 libsane:i386 libxcomposite1:i386 libxcursor1:i386 libxi6:i386 libxrandr2:i386 libxslt1.1:i386 ocl-icd-libopencl1:i386 libgd3:i386
-# We need wine for this all to work, so we'll use the PPA
-RUN set -x \
-    && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
-    && apt-key add winehq.key \
-    && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
-    && apt-get update -qy \
-    && apt-get install --no-install-recommends -qfy wine-staging-amd64 wine-staging \
-    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
-    && apt-get clean \
-    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
-    && chmod +x winetricks \
-    && mv winetricks /usr/local/bin
-
-# wine settings
-ENV WINEARCH win64
-ENV WINEDEBUG fixme-all
-ENV WINEPREFIX /wine
-
-# PYPI repository location
-ENV PYPI_URL=https://pypi.python.org/
-# PYPI index location
-ENV PYPI_INDEX_URL=https://pypi.python.org/simple
-
-# install python in wine, using the msi packages to install, extracting
-# the files directly, since installing isn't running correctly.
-RUN set -x \
-    && winetricks win7 \
-    && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
-        wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
-        rm ${msifile}.msi; \
-    done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
-    && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
-    && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
-    && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyupdater \
-    && (pip install -U pip || true) \
-    && rm -rf /tmp/.wine-*
-
-ENV W_DRIVE_C=/wine/drive_c
-ENV W_WINDIR_UNIX="$W_DRIVE_C/windows"
-ENV W_SYSTEM64_DLLS="$W_WINDIR_UNIX/system32"
-ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
-
-# install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
-RUN set -x \
-    && rm -f "$W_TMP"/* \
-    && wget -P "$W_TMP" https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe \
-    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x64.exe \
-    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
-    && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
-    && cd "$W_TMP" \
-    && rename 's/_/\-/g' *.dll \
-&& cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/
-
-# Installing Xvfb to display
-RUN apt-get install xvfb git p7zip-full -y
-
-ARG QT_VERSION=5.14.1
-ARG QT_COMPONENTS="qtbase qtquickcontrols qtquickcontrols2 qtmultimedia qtimageformats qtgraphicaleffects qtdeclarative qtconnectivity qtcharts"
-
-# Installing Qt & PySide2
-# Gathering silent install script
-# RUN wget https://download.ad5001.eu/other/qt-noninteractive-install.qs
-# RUN mv qt-noninteractive-install.qs /wine/drive_c/
-RUN wget https://download.ad5001.eu/other/install-qt.sh \
-    && chmod +x install-qt.sh \
-    && ./install-qt.sh --host windows_x86 --version $QT_VERSION --directory /wine/drive_c/Qt --toolchain win64_msvc2017_64 $QT_COMPONENTS
-RUN rm install-qt.sh
-RUN pip install PySide2
+ARG PYSIDE2_VERSION=5.15.0
+ 
+RUN apt update -qy \
+    && apt upgrade -qy
+RUN apt install -y rename wget curl p7zip-full git xvfb
+RUN apt clean
+RUN pip install PySide2==$PYSIDE2_VERSION
diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile-old b/ubuntu-pyside2-xvfb-wine/Dockerfile-old
new file mode 100644
index 0000000..8c628c4
--- /dev/null
+++ b/ubuntu-pyside2-xvfb-wine/Dockerfile-old
@@ -0,0 +1,89 @@
+FROM ubuntu:20.04
+
+# Some of the work here comes from cdrx/docker-pyinstaller adapted for drone and with modifications for Qt
+ARG WINE_VERSION=winehq-staging
+ARG PYTHON_VERSION=3.7.5
+ENV DEBIAN_FRONTEND "noninteractive"
+
+# Installing dependencies
+RUN set -x \
+    && dpkg --add-architecture i386 \
+    && apt-get update -qy \
+    && apt-get upgrade -qy \
+    && apt-get install --no-install-recommends -qfy rename gpg-agent apt-transport-https software-properties-common wget curl p7zip-full git xvfb
+# We need wine for this all to work, so we'll use the PPA
+RUN set -x \
+    && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
+    && apt-key add winehq.key \
+    && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
+    && apt-get update -qy \
+    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
+    && apt-get clean \
+    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+    && chmod +x winetricks \
+    && mv winetricks /usr/local/bin
+
+RUN apt-get clean
+
+# wine settings
+ENV WINEARCH win64
+ENV WINEDEBUG fixme-all
+ENV WINEPREFIX /wine
+
+# PYPI repository location
+ENV PYPI_URL=https://pypi.python.org/
+# PYPI index location
+ENV PYPI_INDEX_URL=https://pypi.python.org/simple
+
+# install python in wine, using the msi packages to install, extracting
+# the files directly, since installing isn't running correctly.
+RUN set -x \
+    && winetricks win7 \
+    && for msifile in `echo core dev exe lib path pip tools`; do \
+        wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        echo "Installed ${msifile}"; \
+        rm ${msifile}.msi; \
+    done \
+    && cd /wine/drive_c/Python37 \
+    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && echo 'assoc .py=PythonScript' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
+    && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyupdater \
+    && (pip install -U pip || true) \
+    && rm -rf /tmp/.wine-*
+
+ENV W_DRIVE_C=/wine/drive_c
+ENV W_WINDIR_UNIX="$W_DRIVE_C/windows"
+ENV W_SYSTEM64_DLLS="$W_WINDIR_UNIX/system32"
+ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
+
+# install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
+RUN set -x \
+    && rm -f "$W_TMP"/* \
+    && wget -P "$W_TMP" https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
+    && cd "$W_TMP" \
+    && rename 's/_/\-/g' *.dll \
+    && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/
+
+
+ARG QT_VERSION=5.14.1
+ARG QT_COMPONENTS="qtbase qtquickcontrols qtquickcontrols2 qtmultimedia qtimageformats qtgraphicaleffects qtdeclarative qtconnectivity qtcharts"
+
+# Installing Qt & PySide2
+# Gathering silent install script
+# RUN wget https://download.ad5001.eu/other/qt-noninteractive-install.qs
+# RUN mv qt-noninteractive-install.qs /wine/drive_c/
+#RUN wget https://download.ad5001.eu/other/install-qt.sh \
+#    && chmod +x install-qt.sh \
+#    && ./install-qt.sh --host windows_x86 --version $QT_VERSION --directory /wine/drive_c/Qt --toolchain win64_msvc2017_64 $QT_COMPONENTS
+#RUN rm install-qt.sh
+RUN ls /wine/drive_c/Python37/Scripts
+RUN /usr/bin/pip install PySide2 pyinstaller