diff --git a/debian.sh b/debian.sh
index 5c3cd1b..15c8125 100755
--- a/debian.sh
+++ b/debian.sh
@@ -441,61 +441,19 @@ installCodium() {
 }
 
 installFirefoxNightly() {
-	cd /tmp
-	rm -rf /opt/firefox-nightly
-	apt remove firefox-esr -y
-	apt install libdbus-glib-1-2 -y
-
-	#Firefox Nightly
-	wget -O /tmp/firefox.tar.gz "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US"
-	tar xf /tmp/firefox.tar.gz -C /tmp/
-	mv /tmp/firefox /opt/firefox-nightly
-	rm -rf /tmp/firefox*
-
-	echo "[Desktop Entry]" >/usr/share/applications/firefox-nightly.desktop
-	echo "Name=Firefox Nightly" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Comment=Web Browser" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Exec=/opt/firefox-nightly/firefox %u" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Terminal=false" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Type=Application" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Icon=/opt/firefox-nightly/browser/chrome/icons/default/default128.png" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Categories=Network;WebBrowser;" >>/usr/share/applications/firefox-nightly.desktop
-	echo "MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;" >>/usr/share/applications/firefox.desktop
-	echo "StartupNotify=true" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Actions=Private;" >>/usr/share/applications/firefox-nightly.desktop
-	echo "[Desktop Action Private]" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Exec=/opt/firefox-nightly/firefox --private-window %u" >>/usr/share/applications/firefox-nightly.desktop
-	echo "Name=Open in private mode" >>/usr/share/applications/firefox-nightly.desktop
+	wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+	gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print "\n"$0"\n"}'
+	echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null
+	apt update
+	apt install firefox-nightly -y
 }
 
 installFirefox() {
-	cd /tmp
-	rm -rf /opt/firefox
-	apt remove firefox-esr -y
-	apt install libdbus-glib-1-2 -y
-
-	#Firefox Stable
-	wget -O /tmp/firefox.tar.gz "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US"
-	tar xf /tmp/firefox.tar.gz -C /opt/
-	unlink /usr/bin/firefox
-	ln -s /opt/firefox/firefox /usr/bin/firefox
-	rm -rf /tmp/firefox*
-
-	#Desktop/App Icon
-	echo "[Desktop Entry]" >/usr/share/applications/firefox.desktop
-	echo "Name=Firefox Stable" >>/usr/share/applications/firefox.desktop
-	echo "Comment=Web Browser" >>/usr/share/applications/firefox.desktop
-	echo "Exec=/opt/firefox/firefox %u" >>/usr/share/applications/firefox.desktop
-	echo "Terminal=false" >>/usr/share/applications/firefox.desktop
-	echo "Type=Application" >>/usr/share/applications/firefox.desktop
-	echo "Icon=/opt/firefox/browser/chrome/icons/default/default128.png" >>/usr/share/applications/firefox.desktop
-	echo "Categories=Network;WebBrowser;" >>/usr/share/applications/firefox.desktop
-	echo "MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;" >>/usr/share/applications/firefox.desktop
-	echo "StartupNotify=true" >>/usr/share/applications/firefox.desktop
-	echo "Actions=Private;" >>/usr/share/applications/firefox.desktop
-	echo "[Desktop Action Private]" >>/usr/share/applications/firefox.desktop
-	echo "Exec=/opt/firefox/firefox --private-window %u" >>/usr/share/applications/firefox.desktop
-	echo "Name=Open in private mode" >>/usr/share/applications/firefox.desktop
+	wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+	gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print "\n"$0"\n"}'
+	echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null
+	apt update
+	apt install firefox -y
 }
 
 installSteam() {
@@ -526,7 +484,7 @@ installChrome() {
 
 installVivaldi() {
 	curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/vivaldi.gpg >/dev/null
-	echo deb [arch=amd64,armhf signed-by=/usr/share/keyrings/vivaldi.gpg] https://repo.vivaldi.com/archive/deb/ stable main | sudo tee /etc/apt/sources.list.d/vivaldi.list
+	echo deb [arch=amd64,armhf signed-by=/usr/share/keyrings/vivaldi.gpg] https://repo.vivaldi.com/archive/deb/ stable main | tee /etc/apt/sources.list.d/vivaldi.list
 	apt update
 	apt install -y vivaldi-stable
 }