From fc67777cd7b271b09204a2c3765afd750d20af8f Mon Sep 17 00:00:00 2001
From: Nyx <144965845+nnyyxxxx@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:13:03 -0400
Subject: [PATCH] Separate browser scripts (#648)

* Separate browser scripts

* sort entries alphabetically

* fix formatting issues

* add --needed

---------

Co-authored-by: nnyyxxxx <nnyyxxxx@users.noreply.github.com>
---
 core/tabs/applications-setup/browser-setup.sh | 246 ------------------
 .../tabs/applications-setup/browsers/brave.sh |  45 ++++
 .../applications-setup/browsers/chromium.sh   |  23 ++
 .../applications-setup/browsers/firefox.sh    |  33 +++
 .../browsers/google-chrome.sh                 |  39 +++
 .../applications-setup/browsers/librewolf.sh  |  48 ++++
 core/tabs/applications-setup/browsers/lynx.sh |  23 ++
 .../applications-setup/browsers/thorium.sh    |  35 +++
 .../applications-setup/browsers/vivaldi.sh    |  23 ++
 core/tabs/applications-setup/tab_data.toml    |  57 +++-
 10 files changed, 320 insertions(+), 252 deletions(-)
 delete mode 100755 core/tabs/applications-setup/browser-setup.sh
 create mode 100644 core/tabs/applications-setup/browsers/brave.sh
 create mode 100644 core/tabs/applications-setup/browsers/chromium.sh
 create mode 100644 core/tabs/applications-setup/browsers/firefox.sh
 create mode 100644 core/tabs/applications-setup/browsers/google-chrome.sh
 create mode 100644 core/tabs/applications-setup/browsers/librewolf.sh
 create mode 100644 core/tabs/applications-setup/browsers/lynx.sh
 create mode 100644 core/tabs/applications-setup/browsers/thorium.sh
 create mode 100644 core/tabs/applications-setup/browsers/vivaldi.sh

diff --git a/core/tabs/applications-setup/browser-setup.sh b/core/tabs/applications-setup/browser-setup.sh
deleted file mode 100755
index dcd58c0a..00000000
--- a/core/tabs/applications-setup/browser-setup.sh
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/sh -e
-
-. ../common-script.sh
-
-install_chrome() {
-    if ! command_exists google-chrome; then
-    printf "%b\n" "${YELLOW}Installing Google Chrome..${RC}."
-        case "$PACKAGER" in
-            apt-get|nala)
-                curl -O https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-                "$ESCALATION_TOOL" "$PACKAGER" install -y ./google-chrome-stable_current_amd64.deb
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" addrepo http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome
-                "$ESCALATION_TOOL" "$PACKAGER" refresh
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install google-chrome-stable
-                ;;
-            pacman)
-                "$AUR_HELPER" -S --noconfirm google-chrome
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y fedora-workstation-repositories
-                "$ESCALATION_TOOL" "$PACKAGER" config-manager --set-enabled google-chrome
-                "$ESCALATION_TOOL" "$PACKAGER" install -y google-chrome-stable
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Google Chrome Browser is already installed.${RC}"
-    fi
-}
-
-install_thorium() {
-    if ! command_exists thorium-browser; then
-    printf "%b\n" "${YELLOW}Installing Thorium Browser...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" rm -fv /etc/apt/sources.list.d/thorium.list
-                "$ESCALATION_TOOL" curl http://dl.thorium.rocks/debian/dists/stable/thorium.list -o /etc/apt/sources.list.d/thorium.list
-                "$ESCALATION_TOOL" "$PACKAGER" update
-                "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-browser
-                ;;
-            zypper|dnf)
-                url=$(curl -s https://api.github.com/repos/Alex313031/Thorium/releases/latest | grep -oP '(?<=browser_download_url": ")[^"]*\.rpm')
-                    echo "$url" && curl -L "$url" -o thorium-latest.rpm
-                    "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-latest.rpm && rm thorium-latest.rpm
-                ;;
-            pacman)
-                "$AUR_HELPER" -S --needed --noconfirm thorium-browser-bin
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-            ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Thorium Browser is already installed.${RC}"
-    fi
-}
-
-install_firefox() {
-    if ! command_exists firefox; then
-    printf "%b\n" "${YELLOW}Installing Mozilla Firefox...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox-esr
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install MozillaFirefox
-                ;;
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm firefox
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Firefox Browser is already installed.${RC}"
-    fi
-}
-
-install_librewolf() {
-    if ! command_exists librewolf; then
-    printf "%b\n" "${YELLOW}Installing Librewolf...${RC}"
-	case "$PACKAGER" in
-		apt-get|nala)
-			"$ESCALATION_TOOL" "$PACKAGER" install -y gnupg lsb-release apt-transport-https ca-certificates
-			distro=`if echo " una bookworm vanessa focal jammy bullseye vera uma " | grep -q " $(lsb_release -sc) "; then lsb_release -sc; else echo focal; fi`
-			curl -fsSL https://deb.librewolf.net/keyring.gpg | "$ESCALATION_TOOL" gpg --dearmor -o /usr/share/keyrings/librewolf.gpg
-			echo "Types: deb
-URIs: https://deb.librewolf.net
-Suites: $distro
-Components: main
-Architectures: amd64
-Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/librewolf.sources > /dev/null
-            "$ESCALATION_TOOL" "$PACKAGER" update
-			"$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
-			;;
-		dnf)
-			curl -fsSL https://rpm.librewolf.net/librewolf-repo.repo | pkexec tee /etc/yum.repos.d/librewolf.repo > /dev/null
-			"$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
-			;;
-		zypper)
-			"$ESCALATION_TOOL" rpm --import https://rpm.librewolf.net/pubkey.gpg
-			"$ESCALATION_TOOL" zypper ar -ef https://rpm.librewolf.net librewolf
-			"$ESCALATION_TOOL" zypper refresh
-			"$ESCALATION_TOOL" zypper --non-interactive install librewolf
-			;;
-		pacman)
-			"$AUR_HELPER" -S --needed --noconfirm librewolf-bin
-			;;
-		*)
-			printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-			exit 1
-			;;
-	esac
-    else
-        printf "%b\n" "${GREEN}LibreWolf Browser is already installed.${RC}"
-    fi
-}
-
-install_brave() {
-    if ! command_exists brave; then
-    printf "%b\n" "${YELLOW}Installing Brave...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y curl
-                "$ESCALATION_TOOL" 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] https://brave-browser-apt-release.s3.brave.com/ stable main"| "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/brave-browser-release.list
-                "$ESCALATION_TOOL" "$PACKAGER" update
-                "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y curl
-                "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
-                "$ESCALATION_TOOL" "$PACKAGER" addrepo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-                "$ESCALATION_TOOL" "$PACKAGER" refresh
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install brave-browser
-                ;;
-            pacman)
-                "$AUR_HELPER" -S --noconfirm brave-bin
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
-                "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-                "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
-                "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Brave Browser is already installed.${RC}"
-    fi
-}
-
-install_vivaldi() {
-    if ! command_exists vivaldi; then
-        printf "%b\n" "${YELLOW}Installing Vivaldi...${RC}"
-        curl -fsSL https://downloads.vivaldi.com/snapshot/install-vivaldi.sh | sh
-        if [ $? -eq 0 ]; then
-                printf "%b\n" "${GREEN}Vivaldi installed successfully!${RC}"
-        else
-                printf "%b\n" "${RED}Vivaldi installation failed!${RC}"
-        fi
-    else
-        printf "%b\n" "${GREEN}Vivaldi Browser is already installed.${RC}"
-    fi
-}
-
-install_chromium() {
-    if ! command_exists chromium; then
-    printf "%b\n" "${YELLOW}Installing Chromium...${RC}"
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm chromium
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Chromium Browser is already installed.${RC}"
-    fi
-}
-
-install_lynx() {
-    if ! command_exists lynx; then
-    printf "%b\n" "${YELLOW}Installing Lynx...${RC}"
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm lynx
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
-                ;;
-        esac
-    else
-        printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}"
-    fi
-}
-
-browserSetup() {
-    clear
-    printf "%b\n" "Browser Installation Script"
-    printf "%b\n" "----------------------------"
-    printf "%b\n" "Select the browsers you want to install:"
-    printf "%b\n" "1. Google Chrome"
-    printf "%b\n" "2. Mozilla Firefox"
-    printf "%b\n" "3. Librewolf"
-    printf "%b\n" "4. Brave"
-    printf "%b\n" "5. Vivaldi"
-    printf "%b\n" "6. Chromium"
-    printf "%b\n" "7. Thorium"
-    printf "%b\n" "8. Lynx"
-    printf "%b\n" "----------------------------"
-    printf "%b"  "Enter your choices (e.g. 1 3 5): "
-    read -r choice
-    for ch in $choice; do
-        case $ch in
-                1) install_chrome ;;
-                2) install_firefox ;;
-                3) install_librewolf ;;
-                4) install_brave ;;
-                5) install_vivaldi ;;
-                6) install_chromium ;;
-                7) install_thorium ;;
-                8) install_lynx;;
-                *) printf "%b\n" "${RED}Invalid option: $ch ${RC}" ;;
-            esac
-        done
-    printf "%b\n" "${GREEN}Installation complete!${RC}"
-}
-
-checkEnv
-checkEscalationTool
-checkAURHelper
-browserSetup
diff --git a/core/tabs/applications-setup/browsers/brave.sh b/core/tabs/applications-setup/browsers/brave.sh
new file mode 100644
index 00000000..8a7eab40
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/brave.sh
@@ -0,0 +1,45 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installBrave() {
+    if ! command_exists brave; then
+        printf "%b\n" "${YELLOW}Installing Brave...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y curl
+                "$ESCALATION_TOOL" 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] https://brave-browser-apt-release.s3.brave.com/ stable main" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/brave-browser-release.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y curl
+                "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
+                "$ESCALATION_TOOL" "$PACKAGER" addrepo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install brave-browser
+                ;;
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm brave-bin
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
+                "$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+                "$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
+                "$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Brave Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installBrave
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/chromium.sh b/core/tabs/applications-setup/browsers/chromium.sh
new file mode 100644
index 00000000..e929dbc9
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/chromium.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installChromium() {
+if ! command_exists chromium; then
+    printf "%b\n" "${YELLOW}Installing Chromium...${RC}"
+    case "$PACKAGER" in
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm chromium
+            ;;
+        *)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
+            ;;
+    esac
+else
+    printf "%b\n" "${GREEN}Chromium Browser is already installed.${RC}"
+fi
+}
+
+checkEnv
+checkEscalationTool
+installChromium
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/firefox.sh b/core/tabs/applications-setup/browsers/firefox.sh
new file mode 100644
index 00000000..67980858
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/firefox.sh
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installFirefox() {
+    if ! command_exists firefox; then
+        printf "%b\n" "${YELLOW}Installing Mozilla Firefox...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox-esr
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install MozillaFirefox
+                ;;
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm firefox
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Firefox Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+installFirefox
diff --git a/core/tabs/applications-setup/browsers/google-chrome.sh b/core/tabs/applications-setup/browsers/google-chrome.sh
new file mode 100644
index 00000000..d66ec9a5
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/google-chrome.sh
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installChrome() {
+    if ! command_exists google-chrome; then
+        printf "%b\n" "${YELLOW}Installing Google Chrome...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                curl -O https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+                "$ESCALATION_TOOL" "$PACKAGER" install -y ./google-chrome-stable_current_amd64.deb
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" addrepo http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome
+                "$ESCALATION_TOOL" "$PACKAGER" refresh
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install google-chrome-stable
+                ;;
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm google-chrome
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y fedora-workstation-repositories
+                "$ESCALATION_TOOL" "$PACKAGER" config-manager --set-enabled google-chrome
+                "$ESCALATION_TOOL" "$PACKAGER" install -y google-chrome-stable
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Google Chrome Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installChrome
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/librewolf.sh b/core/tabs/applications-setup/browsers/librewolf.sh
new file mode 100644
index 00000000..a630b9c7
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/librewolf.sh
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installLibreWolf() {
+    if ! command_exists librewolf; then
+        printf "%b\n" "${YELLOW}Installing Librewolf...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y gnupg lsb-release apt-transport-https ca-certificates
+                distro=`if echo " una bookworm vanessa focal jammy bullseye vera uma " | grep -q " $(lsb_release -sc) "; then lsb_release -sc; else echo focal; fi`
+                curl -fsSL https://deb.librewolf.net/keyring.gpg | "$ESCALATION_TOOL" gpg --dearmor -o /usr/share/keyrings/librewolf.gpg
+                echo "Types: deb
+URIs: https://deb.librewolf.net
+Suites: $distro
+Components: main
+Architectures: amd64
+Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/sources.list.d/librewolf.sources > /dev/null
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
+                ;;
+            dnf)
+                curl -fsSL https://rpm.librewolf.net/librewolf-repo.repo | pkexec tee /etc/yum.repos.d/librewolf.repo > /dev/null
+                "$ESCALATION_TOOL" "$PACKAGER" install -y librewolf
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" rpm --import https://rpm.librewolf.net/pubkey.gpg
+                "$ESCALATION_TOOL" zypper ar -ef https://rpm.librewolf.net librewolf
+                "$ESCALATION_TOOL" zypper refresh
+                "$ESCALATION_TOOL" zypper --non-interactive install librewolf
+                ;;
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm librewolf-bin
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}LibreWolf Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installLibreWolf
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/lynx.sh b/core/tabs/applications-setup/browsers/lynx.sh
new file mode 100644
index 00000000..002ff7e3
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/lynx.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installLynx() {
+    if ! command_exists lynx; then
+        printf "%b\n" "${YELLOW}Installing Lynx...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+installLynx
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/thorium.sh b/core/tabs/applications-setup/browsers/thorium.sh
new file mode 100644
index 00000000..c45ebc80
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/thorium.sh
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installThrorium() {
+    if ! command_exists thorium-browser; then
+        printf "%b\n" "${YELLOW}Installing Thorium Browser...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" rm -fv /etc/apt/sources.list.d/thorium.list
+                "$ESCALATION_TOOL" curl http://dl.thorium.rocks/debian/dists/stable/thorium.list -o /etc/apt/sources.list.d/thorium.list
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-browser
+                ;;
+            zypper|dnf)
+                url=$(curl -s https://api.github.com/repos/Alex313031/Thorium/releases/latest | grep -oP '(?<=browser_download_url": ")[^"]*\.rpm')
+                echo "$url" && curl -L "$url" -o thorium-latest.rpm
+                "$ESCALATION_TOOL" "$PACKAGER" install -y thorium-latest.rpm && rm thorium-latest.rpm
+                ;;
+            pacman)
+                "$AUR_HELPER" -S --needed --noconfirm thorium-browser-bin
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Thorium Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+checkAURHelper
+installThrorium
\ No newline at end of file
diff --git a/core/tabs/applications-setup/browsers/vivaldi.sh b/core/tabs/applications-setup/browsers/vivaldi.sh
new file mode 100644
index 00000000..002ff7e3
--- /dev/null
+++ b/core/tabs/applications-setup/browsers/vivaldi.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+. ../../common-script.sh
+
+installLynx() {
+    if ! command_exists lynx; then
+        printf "%b\n" "${YELLOW}Installing Lynx...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lynx
+                ;;
+            *)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Lynx TUI Browser is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+installLynx
\ No newline at end of file
diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
index 9af2ee4f..141772bf 100644
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@@ -90,6 +90,57 @@ description = "Thunderbird is a free, open-source email client that offers power
 script = "communication-apps/thunderbird-setup.sh"
 task_list = "I"
 
+[[data]]
+name = "Web Browsers"
+
+[[data.entries]]
+name = "Brave"
+description = "Brave is a free and open-source web browser developed by Brave Software, Inc. based on the Chromium web browser."
+script = "browsers/brave.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Chromium"
+description = "Chromium is an open-source web browser project started by Google, to provide the source code for the proprietary Google Chrome browser."
+script = "browsers/chromium.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Google Chrome"
+description = "Google Chrome is a fast, secure, and free web browser, built for the modern web."
+script = "browsers/google-chrome.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "LibreWolf"
+description = "LibreWolf is a fork of Firefox, focused on privacy, security, and freedom."
+script = "browsers/librewolf.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Lynx"
+description = "Lynx is a highly configurable text-based web browser for use on cursor-addressable character cell terminals."
+script = "browsers/lynx.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Mozilla Firefox"
+description = "Mozilla Firefox is a free and open-source web browser developed by the Mozilla Foundation."
+script = "browsers/firefox.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Thorium"
+description = "Thorium is a Chromium-based browser focused on privacy and performance."
+script = "browsers/thorium.sh"
+task_list = "I"
+
+[[data.entries]]
+name = "Vivaldi"
+description = "Vivaldi is a freeware, cross-platform web browser developed by Vivaldi Technologies."
+script = "browsers/vivaldi.sh"
+task_list = "I"
+
 [[data]]
 name = "Alacritty"
 description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.\nThis command installs and condifures alacritty terminal emulator."
@@ -114,12 +165,6 @@ description = "Bottles allows Windows software, like applications and games, to
 script = "bottles-setup.sh"
 task_list = "FI"
 
-[[data]]
-name = "Web Browsers"
-description = "An interactive script to install popular browsers."
-script = "browser-setup.sh"
-task_list = "I"
-
 [[data]]
 name = "DWM-Titus"
 description = "DWM is a dynamic window manager for X.\nIt manages windows in tiled, monocle and floating layouts.\nAll of the layouts can be applied dynamically, optimising the environment for the application in use and the task performed.\nThis command installs and configures DWM and a desktop manager.\nThe list of patches applied can be found in CTT's DWM repository\nhttps://github.com/ChrisTitusTech/dwm-titus"