diff --git a/Dockerfile b/Dockerfile
old mode 100755
new mode 100644
index 37574d4..0412728
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM vital987/supervisor:ubuntu20.04
+FROM vital987/vubuntu:latest
 
 LABEL AboutImage "Ubuntu20.04_Fluxbox_PureVNC"
 
@@ -6,9 +6,8 @@ LABEL Maintainer "Apoorv Vyavahare <apoorvvyavahare@pm.me>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV DEBIAN_FRONTEND=noninteractive \
 #VNC Server Password
-	VNC_PASS="samplepass" \
+ENV	VNC_PASS="samplepass" \
 #VNC Server Title(w/o spaces)
 	VNC_TITLE="Vubuntu_Desktop" \
 #VNC Resolution(720p is preferable)
@@ -25,98 +24,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
 	NGROK_METHOD=tcp \
 	NGROK_PORT=5900
 
-COPY . /app
-COPY conf.d/*.conf /config/supervisor/
-COPY conf.d/*.py /config/
-RUN rm -rf /etc/apt/sources.list && \
-#All Official Focal Repos
-	bash -c 'echo -e "deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse\ndeb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse\ndeb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb http://archive.canonical.com/ubuntu focal partner\ndeb-src http://archive.canonical.com/ubuntu focal partner" >/etc/apt/sources.list' && \
-	rm /bin/sh && ln -s /bin/bash /bin/sh && \
-	apt-get update && \
-	apt-get install -y \
-#Packages Installation
-	tzdata \
-	software-properties-common \
-	apt-transport-https \
-	wget \
-	git \
-	curl \
-	vim \
-	zip \
-	socat \
-	sudo \
-	net-tools \
-	iputils-ping \
-	build-essential \
-	python3 \
-	python3-pip \
-	python-is-python3 \
-	#perl \
-	#ruby \
-	#golang \
-	#lua5.3 \
-	#scala \
-	#mono-complete \
-	#r-base \
-	#default-jre \
-	#default-jdk \
-	#clojure \
-	#php \
-	nodejs \
-	npm \
-	firefox \
-	gnome-terminal \
-	gnome-calculator \
-	gnome-system-monitor \
-	gedit \
-	vim-gtk3 \
-	mousepad \
-	libreoffice \
-	pcmanfm \
-	terminator \
-	x11vnc \
-	xvfb \
-	gnupg \
-	dirmngr \
-	gdebi-core \
-	nginx \
-	ffmpeg \
-	pluma \
-#Fluxbox
-	/app/fluxbox-mod.deb && \
-#PyNgrok
-	pip3 install pyngrok && \
-#TimeZone
-	ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
-	echo $TZ > /etc/timezone && \
-#VS Code
-	wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg && \
-	install -o root -g root -m 644 packages.microsoft.gpg /etc/apt/trusted.gpg.d/ && \
-	sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list' && \
-	rm -f packages.microsoft.gpg && \
-	apt install apt-transport-https && \
-	apt update && \
-	apt install code -y && \
-	cd /usr/bin && \
-#Brave
-	curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg && \
-	echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main"|tee /etc/apt/sources.list.d/brave-browser-release.list && \
-	apt update && \
-	apt install brave-browser -y && \
-#PeaZip
-	wget https://github.com/peazip/PeaZip/releases/download/7.9.0/peazip_7.9.0.LINUX.x86_64.GTK2.deb && \
-	dpkg -i peazip_7.9.0.LINUX.x86_64.GTK2.deb && \
-	rm -rf peazip_7.9.0.LINUX.x86_64.GTK2.deb && \
-#Sublime
-	curl -fsSL https://download.sublimetext.com/sublimehq-pub.gpg | apt-key add - && \
-	add-apt-repository "deb https://download.sublimetext.com/ apt/stable/" && \
-	apt install -y sublime-text && \
-#Telegram
-	wget https://updates.tdesktop.com/tlinux/tsetup.2.7.4.tar.xz -P /tmp && \
-	tar -xvf /tmp/tsetup.2.7.4.tar.xz -C /tmp && \
-	mv /tmp/Telegram/Telegram /usr/bin/telegram && \
-#PowerShell
-	wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -P /tmp && \
-	apt install -y /tmp/packages-microsoft-prod.deb && \
-	apt update && \
-	apt-get install -y powershell
+SHELL ["/bin/bash", "-c"]
+
+RUN	apt update && \
+	apt install --no-install-recommends -y socat && \
+	apt purge -y novnc && \
+	npm uninstall --global websockify && \
+	pip install pyngrok && \
+	rm -rf /app/.vubuntu/assets/configs/*
+
+COPY assets/configs/ /app/.vubuntu/assets/configs/
+
diff --git a/conf.d/1-xvfb.conf b/assets/configs/1-xvfb.conf
similarity index 100%
rename from conf.d/1-xvfb.conf
rename to assets/configs/1-xvfb.conf
diff --git a/conf.d/2-fluxbox.conf b/assets/configs/2-fluxbox.conf
similarity index 100%
rename from conf.d/2-fluxbox.conf
rename to assets/configs/2-fluxbox.conf
diff --git a/conf.d/3-vnc.conf b/assets/configs/3-vnc.conf
similarity index 100%
rename from conf.d/3-vnc.conf
rename to assets/configs/3-vnc.conf
diff --git a/conf.d/4-ngrok_tunnel.conf b/assets/configs/4-ngrok_tunnel.conf
similarity index 77%
rename from conf.d/4-ngrok_tunnel.conf
rename to assets/configs/4-ngrok_tunnel.conf
index 4f4698a..a6704cf 100755
--- a/conf.d/4-ngrok_tunnel.conf
+++ b/assets/configs/4-ngrok_tunnel.conf
@@ -1,5 +1,5 @@
 [program:NGROK_TUNNEL]
-command=python3 /config/ngrok_tunnel.py
+command=python3 /app/.vubuntu/assets/configs/ngrok_tunnel.py
 autostart=true
 autorestart=false
 priority=4
diff --git a/conf.d/5-port-forward.conf b/assets/configs/5-port-forward.conf
similarity index 100%
rename from conf.d/5-port-forward.conf
rename to assets/configs/5-port-forward.conf
diff --git a/conf.d/ngrok_tunnel.py b/assets/configs/ngrok_tunnel.py
similarity index 100%
rename from conf.d/ngrok_tunnel.py
rename to assets/configs/ngrok_tunnel.py
diff --git a/assets/configs/supervisordconf b/assets/configs/supervisordconf
new file mode 100644
index 0000000..7a308d1
--- /dev/null
+++ b/assets/configs/supervisordconf
@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+
+[include]
+files = /app/.vubuntu/assets/configs/*.conf
diff --git a/assets/desktop_ss1.png b/assets/desktop_ss1.png
deleted file mode 100644
index 4653a79..0000000
Binary files a/assets/desktop_ss1.png and /dev/null differ
diff --git a/assets/desktop_ss2.png b/assets/desktop_ss2.png
deleted file mode 100644
index 96df420..0000000
Binary files a/assets/desktop_ss2.png and /dev/null differ
diff --git a/assets/icon.png b/assets/icon.png
deleted file mode 100644
index afaa01b..0000000
Binary files a/assets/icon.png and /dev/null differ
diff --git a/assets/phone_ss2.png b/assets/phone_ss2.png
deleted file mode 100644
index 7c65ab7..0000000
Binary files a/assets/phone_ss2.png and /dev/null differ
diff --git a/assets/phone_ss3.png b/assets/phone_ss3.png
deleted file mode 100644
index 0235d78..0000000
Binary files a/assets/phone_ss3.png and /dev/null differ
diff --git a/fluxbox-mod.deb b/fluxbox-mod.deb
deleted file mode 100755
index 2a89f2c..0000000
Binary files a/fluxbox-mod.deb and /dev/null differ