From 599497f7025a38c116e0a76dc463caa5f10a5dc1 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:23:04 -0500
Subject: [PATCH 01/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 5df2a5d1..b76bfdaa 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -12,7 +12,7 @@ setupDWM() {
             "$ESCALATION_TOOL" "$PACKAGER" install -y build-essential libx11-dev libxinerama-dev libxft-dev libimlib2-dev libx11-xcb-dev libfontconfig1 libx11-6 libxft2 libxinerama1 libxcb-res0-dev git unzip flameshot lxappearance feh mate-polkit
             ;;
         dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" groupinstall -y "Development Tools"
+            "$ESCALATION_TOOL" "$PACKAGER" install -y "@development-tools" || "$ESCALATION_TOOL" "$PACKAGER" group install -y "Development Tools"
             "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit # no need to include git here as it should be already installed via "Development Tools"
             ;;
         *)

From 7095a74b758bdef0e15c9a9aee9dd24607623947 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:29:46 -0500
Subject: [PATCH 02/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index b76bfdaa..3f991666 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -54,7 +54,7 @@ install_nerd_font() {
     fi
 
     # Check if the font zip file already exists
-    if [ ! -f "$FONT_ZIP" ]; then
+    if [ -n "$FONT_ZIP" ]; then
         # Download the font zip file
         curl -sSLo "$FONT_ZIP" "$FONT_URL" || {
             printf "%b\n" "${RED}Failed to download Meslo Nerd-fonts from $FONT_URL${RC}"

From 5084eec1dc4379461127e618e97f9ca00ed1a21a Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:43:57 -0500
Subject: [PATCH 03/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 3f991666..5114139d 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -36,7 +36,7 @@ install_nerd_font() {
     FONT_INSTALLED=$(fc-list | grep -i "Meslo")
 
     # Replace -n test with standard test
-    if [ ! -z "$FONT_INSTALLED" ]; then
+    if [ -n "$FONT_INSTALLED" ]; then
         printf "%b\n" "${GREEN}Meslo Nerd-fonts are already installed.${RC}"
         return 0
     fi

From bb11a12bad6e10c33c3ab9d818aed8f5cbf3c074 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Fri, 14 Feb 2025 23:47:06 -0500
Subject: [PATCH 04/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 5114139d..d6ceb8df 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -54,7 +54,7 @@ install_nerd_font() {
     fi
 
     # Check if the font zip file already exists
-    if [ -n "$FONT_ZIP" ]; then
+    if [ ! -f "$FONT_ZIP" ]; then
         # Download the font zip file
         curl -sSLo "$FONT_ZIP" "$FONT_URL" || {
             printf "%b\n" "${RED}Failed to download Meslo Nerd-fonts from $FONT_URL${RC}"

From edf5ccdd93e26e0e1f41840fe29785e7b5444d12 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:04:18 -0500
Subject: [PATCH 05/18] Update dwmtitus-setup.sh

---
 .../tabs/applications-setup/dwmtitus-setup.sh | 84 +++++++++++--------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index d6ceb8df..c2ffe7c2 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -13,7 +13,7 @@ setupDWM() {
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y "@development-tools" || "$ESCALATION_TOOL" "$PACKAGER" group install -y "Development Tools"
-            "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit # no need to include git here as it should be already installed via "Development Tools"
+            "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit meson # no need to include git here as it should be already installed via "Development Tools"
             ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
@@ -22,6 +22,31 @@ setupDWM() {
     esac
 }
 
+setupPicomDependencies() {
+    printf "%b\n" "${YELLOW}Installing Picom dependencies if not already installed${RC}"
+    
+    case "$PACKAGER" in
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libxcb meson libev uthash libconfig
+            ;;
+        apt-get|nala)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y libxcb1-dev libxcb-res0-dev libconfig-dev libdbus-1-dev libegl-dev libev-dev libgl-dev libepoxy-dev libpcre2-dev libpixman-1-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-damage0-dev libxcb-dpms0-dev libxcb-glx0-dev libxcb-image0-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-util-dev libxcb-xfixes0-dev libxext-dev meson ninja-build uthash-dev
+            ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y libxcb-devel dbus-devel gcc git libconfig-devel libdrm-devel libev-devel libX11-devel libX11-xcb libXext-devel libxcb-devel libGL-devel libEGL-devel libepoxy-devel meson pcre2-devel pixman-devel uthash-devel xcb-util-image-devel xcb-util-renderutil-devel xorg-x11-proto-devel xcb-util-devel
+            ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y libxcb-devel libxcb-devel dbus-1-devel gcc git libconfig-devel libdrm-devel libev-devel libX11-devel libX11-xcb1 libXext-devel libxcb-devel Mesa-libGL-devel Mesa-libEGL-devel libepoxy-devel meson pcre2-devel uthash-devel xcb-util-image-devel libpixman-1-0-devel xcb-util-renderutil-devel xcb-util-devel
+            ;;
+        *)
+            printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
+            exit 1
+            ;;
+    esac
+
+    printf "%b\n" "${GREEN}Picom dependencies installed successfully${RC}"
+}
+
 makeDWM() {
     cd "$HOME" && git clone https://github.com/ChrisTitusTech/dwm-titus.git # CD to Home directory to install dwm-titus
     # This path can be changed (e.g. to linux-toolbox directory)
@@ -35,7 +60,7 @@ install_nerd_font() {
     FONT_URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip"
     FONT_INSTALLED=$(fc-list | grep -i "Meslo")
 
-    # Replace -n test with standard test
+    # Check if Meslo Nerd-font is already installed
     if [ -n "$FONT_INSTALLED" ]; then
         printf "%b\n" "${GREEN}Meslo Nerd-fonts are already installed.${RC}"
         return 0
@@ -207,37 +232,29 @@ setupDisplayManager() {
     done
     printf "%b\n" "${GREEN}Current display manager: $currentdm${RC}"
     if [ "$currentdm" = "none" ]; then
-        while : ; do
-            printf "%b\n" "${YELLOW}--------------------------${RC}" 
-            printf "%b\n" "${YELLOW}Pick your Display Manager ${RC}" 
-            printf "%b\n" "${YELLOW}1. SDDM ${RC}" 
-            printf "%b\n" "${YELLOW}2. LightDM ${RC}" 
-            printf "%b\n" "${YELLOW}3. GDM ${RC}" 
-            printf "%b\n" "${YELLOW}4. None ${RC}" 
-            printf "%b" "${YELLOW}Please select one: ${RC}"
-            read -r choice
-            case "$choice" in
-                1)
-                    DM="sddm"
-                    break
-                    ;;
-                2)
-                    DM="lightdm"
-                    break
-                    ;;
-                3)
-                    DM="gdm"
-                    break
-                    ;;
-                4)
-                    printf "%b\n" "${GREEN}No display manager will be installed${RC}"
-                    return 0
-                    ;;
-                *)
-                    printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, 3, or 4.${RC}"
-                    ;;
-            esac
-        done
+        printf "%b\n" "${YELLOW}--------------------------${RC}" 
+        printf "%b\n" "${YELLOW}Pick your Display Manager ${RC}" 
+        printf "%b\n" "${YELLOW}1. SDDM ${RC}" 
+        printf "%b\n" "${YELLOW}2. LightDM ${RC}" 
+        printf "%b\n" "${YELLOW}3. GDM ${RC}" 
+        printf "%b\n" "${YELLOW} ${RC}" 
+        printf "%b" "${YELLOW}Please select one: ${RC}"
+        read -r choice
+        case "$choice" in
+        1)
+            DM="sddm"
+            ;;
+        2)
+            DM="lightdm"
+            ;;
+        3)
+            DM="gdm"
+            ;;
+        *)
+            printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, or 3.${RC}"
+            exit 1
+            ;;
+        esac
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$DM"
@@ -284,6 +301,7 @@ checkEnv
 checkEscalationTool
 setupDisplayManager
 setupDWM
+setupPicomDependencies
 makeDWM
 install_slstatus
 install_nerd_font

From 1f656cc6a80b403a1dbafe312d8f223797b76d20 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:27:32 -0500
Subject: [PATCH 06/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index c2ffe7c2..c7c799da 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -6,7 +6,7 @@ setupDWM() {
     printf "%b\n" "${YELLOW}Installing DWM-Titus...${RC}"
     case "$PACKAGER" in # Install pre-Requisites
         pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 libxcb git unzip flameshot lxappearance feh mate-polkit meson libev uthash libconfig
+            "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 git unzip flameshot lxappearance feh mate-polkit
             ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y build-essential libx11-dev libxinerama-dev libxft-dev libimlib2-dev libx11-xcb-dev libfontconfig1 libx11-6 libxft2 libxinerama1 libxcb-res0-dev git unzip flameshot lxappearance feh mate-polkit
@@ -15,6 +15,9 @@ setupDWM() {
             "$ESCALATION_TOOL" "$PACKAGER" install -y "@development-tools" || "$ESCALATION_TOOL" "$PACKAGER" group install -y "Development Tools"
             "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit meson # no need to include git here as it should be already installed via "Development Tools"
             ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER"  install -y make libX11-devel libXinerama-devel libXft-devel imlib2-devel gcc
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1
@@ -216,6 +219,9 @@ setupDisplayManager() {
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y xorg-x11-xinit xorg-x11-server-Xorg
             ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y xinit xorg-x11-server
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
             exit 1
@@ -225,7 +231,7 @@ setupDisplayManager() {
     printf "%b\n" "${YELLOW}Setting up Display Manager${RC}"
     currentdm="none"
     for dm in gdm sddm lightdm; do
-        if systemctl is-active --quiet "$dm.service"; then
+        if command -v "$dm" >/dev/null 2>&1 || systemctl list-unit-files | grep -q "$dm"; then
             currentdm="$dm"
             break
         fi
@@ -268,6 +274,9 @@ setupDisplayManager() {
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"
                 ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
                 exit 1

From 6be14c56be9e041c67d7478e9900c2476ea94031 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 15 Feb 2025 00:57:25 -0500
Subject: [PATCH 09/18] Update dwmtitus-setup.sh

---
 .../tabs/applications-setup/dwmtitus-setup.sh | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index c7c799da..6a5d534c 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -243,23 +243,27 @@ setupDisplayManager() {
         printf "%b\n" "${YELLOW}1. SDDM ${RC}" 
         printf "%b\n" "${YELLOW}2. LightDM ${RC}" 
         printf "%b\n" "${YELLOW}3. GDM ${RC}" 
-        printf "%b\n" "${YELLOW} ${RC}" 
+        printf "%b\n" "${YELLOW}4. None ${RC}" 
         printf "%b" "${YELLOW}Please select one: ${RC}"
         read -r choice
         case "$choice" in
-        1)
-            DM="sddm"
-            ;;
-        2)
-            DM="lightdm"
-            ;;
-        3)
-            DM="gdm"
-            ;;
-        *)
-            printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, or 3.${RC}"
-            exit 1
-            ;;
+            1)
+                DM="sddm"
+                ;;
+            2)
+                DM="lightdm"
+                ;;
+            3)
+                DM="gdm"
+                ;;
+            4)
+                printf "%b\n" "${GREEN}No display manager will be installed${RC}"
+                return 0
+                ;;
+            *)
+                printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, 3, or 4.${RC}"
+                exit 1
+                ;;
         esac
         case "$PACKAGER" in
             pacman)

From 3d021d682fdeaa51df3814411f6a3181c7290e61 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 15 Feb 2025 09:54:40 -0500
Subject: [PATCH 11/18] Update core/tabs/applications-setup/dwmtitus-setup.sh

Co-authored-by: Adam Perkowski <adas1per@protonmail.com>
---
 core/tabs/applications-setup/dwmtitus-setup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 6a5d534c..5c575bf4 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -63,7 +63,6 @@ install_nerd_font() {
     FONT_URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip"
     FONT_INSTALLED=$(fc-list | grep -i "Meslo")
 
-    # Check if Meslo Nerd-font is already installed
     if [ -n "$FONT_INSTALLED" ]; then
         printf "%b\n" "${GREEN}Meslo Nerd-fonts are already installed.${RC}"
         return 0

From 44a443eacd2f06ea7a371873dffd870cd66f9d87 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 15 Feb 2025 09:56:51 -0500
Subject: [PATCH 12/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 5c575bf4..4d8bbbea 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -13,7 +13,7 @@ setupDWM() {
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y "@development-tools" || "$ESCALATION_TOOL" "$PACKAGER" group install -y "Development Tools"
-            "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit meson # no need to include git here as it should be already installed via "Development Tools"
+            "$ESCALATION_TOOL" "$PACKAGER" install -y libX11-devel libXinerama-devel libXft-devel imlib2-devel libxcb-devel unzip flameshot lxappearance feh mate-polkit # no need to include git here as it should be already installed via "Development Tools"
             ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER"  install -y make libX11-devel libXinerama-devel libXft-devel imlib2-devel gcc

From ed6db07ac56d960093f0cd8ce95d711264c8021b Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Mon, 17 Feb 2025 11:44:35 -0500
Subject: [PATCH 13/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 4d8bbbea..6081be50 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -230,7 +230,7 @@ setupDisplayManager() {
     printf "%b\n" "${YELLOW}Setting up Display Manager${RC}"
     currentdm="none"
     for dm in gdm sddm lightdm; do
-        if command -v "$dm" >/dev/null 2>&1 || systemctl list-unit-files | grep -q "$dm"; then
+        if command -v "$dm" >/dev/null 2>&1 || isServiceActive "$dm"; then
             currentdm="$dm"
             break
         fi
@@ -286,7 +286,7 @@ setupDisplayManager() {
                 ;;
         esac
         printf "%b\n" "${GREEN}$DM installed successfully${RC}"
-        systemctl enable "$DM"
+        enableService "$DM
         
     fi
 }

From c80fa120d3f0a93903ef5cfdd4dc02a1e4c0c362 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Mon, 17 Feb 2025 11:45:29 -0500
Subject: [PATCH 14/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 6081be50..b69c833e 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 . ../common-script.sh
+. ../common-service-script.sh
 
 setupDWM() {
     printf "%b\n" "${YELLOW}Installing DWM-Titus...${RC}"

From 5421fdc11950a8e75944335e34cb6e289b31c68b Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Mon, 17 Feb 2025 11:55:54 -0500
Subject: [PATCH 15/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index b69c833e..0219bf52 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 . ../common-script.sh
 . ../common-service-script.sh

From 71cdd3a4eca146146bc409cb35bb527a852c119d Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:11:54 -0500
Subject: [PATCH 16/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index 0219bf52..d87a4f82 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -249,12 +249,15 @@ setupDisplayManager() {
         case "$choice" in
             1)
                 DM="sddm"
+                break
                 ;;
             2)
                 DM="lightdm"
+                break
                 ;;
             3)
                 DM="gdm"
+                break
                 ;;
             4)
                 printf "%b\n" "${GREEN}No display manager will be installed${RC}"
@@ -262,7 +265,6 @@ setupDisplayManager() {
                 ;;
             *)
                 printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, 3, or 4.${RC}"
-                exit 1
                 ;;
         esac
         case "$PACKAGER" in

From f251243087d0d81221d2b75740e41ffe3361a03d Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:30:09 -0500
Subject: [PATCH 17/18] add apk

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index d87a4f82..e69fbdc3 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -9,6 +9,9 @@ setupDWM() {
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm base-devel libx11 libxinerama libxft imlib2 git unzip flameshot lxappearance feh mate-polkit
             ;;
+        apk)
+            "$ESCALATION_TOOL" "$PACKAGER" add build-base libxinerama-dev libxft-dev imlib2-dev font-dejavu dbus-x11 git unzip flameshot feh polkit
+            ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y build-essential libx11-dev libxinerama-dev libxft-dev libimlib2-dev libx11-xcb-dev libfontconfig1 libx11-6 libxft2 libxinerama1 libxcb-res0-dev git unzip flameshot lxappearance feh mate-polkit
             ;;
@@ -33,6 +36,9 @@ setupPicomDependencies() {
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm libxcb meson libev uthash libconfig
             ;;
+        apk)
+            "$ESCALATION_TOOL" "$PACKAGER" add libxcb-dev meson libev-dev uthash-dev libconfig-dev pixman-dev xcb-util-image-dev xcb-util-renderutil-dev pcre2-dev libepoxy-dev dbus-dev xcb-util-dev
+            ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y libxcb1-dev libxcb-res0-dev libconfig-dev libdbus-1-dev libegl-dev libev-dev libgl-dev libepoxy-dev libpcre2-dev libpixman-1-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-damage0-dev libxcb-dpms0-dev libxcb-glx0-dev libxcb-image0-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev libxcb-util-dev libxcb-xfixes0-dev libxext-dev meson ninja-build uthash-dev
             ;;
@@ -213,6 +219,9 @@ setupDisplayManager() {
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm xorg-xinit xorg-server
             ;;
+        apk)
+            "$ESCALATION_TOOL" setup-xorg-base
+            ;;
         apt-get|nala)
             "$ESCALATION_TOOL" "$PACKAGER" install -y xorg xinit
             ;;
@@ -274,6 +283,12 @@ setupDisplayManager() {
                     "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm lightdm-gtk-greeter
                 fi
                 ;;
+            apk)
+                "$ESCALATION_TOOL" "$PACKAGER" add "$DM"
+                if [ "$DM" = "lightdm" ]; then
+                    "$ESCALATION_TOOL" "$PACKAGER" add lightdm-gtk-greeter
+                fi
+                ;;    
             apt-get|nala)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y "$DM"
                 ;;

From 7ed5f63a939ed61ce9fb19a5aa368fe3daf7d5a9 Mon Sep 17 00:00:00 2001
From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com>
Date: Sat, 22 Feb 2025 07:59:25 -0500
Subject: [PATCH 18/18] Update dwmtitus-setup.sh

---
 core/tabs/applications-setup/dwmtitus-setup.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/tabs/applications-setup/dwmtitus-setup.sh b/core/tabs/applications-setup/dwmtitus-setup.sh
index e69fbdc3..e00931aa 100755
--- a/core/tabs/applications-setup/dwmtitus-setup.sh
+++ b/core/tabs/applications-setup/dwmtitus-setup.sh
@@ -258,15 +258,12 @@ setupDisplayManager() {
         case "$choice" in
             1)
                 DM="sddm"
-                break
                 ;;
             2)
                 DM="lightdm"
-                break
                 ;;
             3)
                 DM="gdm"
-                break
                 ;;
             4)
                 printf "%b\n" "${GREEN}No display manager will be installed${RC}"
@@ -274,6 +271,7 @@ setupDisplayManager() {
                 ;;
             *)
                 printf "%b\n" "${RED}Invalid selection! Please choose 1, 2, 3, or 4.${RC}"
+                return 1
                 ;;
         esac
         case "$PACKAGER" in
@@ -304,17 +302,20 @@ setupDisplayManager() {
                 ;;
         esac
         printf "%b\n" "${GREEN}$DM installed successfully${RC}"
-        enableService "$DM
+        enableService "$DM"
         
     fi
 }
 
 install_slstatus() {
-    printf "Do you want to install slstatus? (y/N): " # using printf instead of 'echo' to avoid newline, -n flag for 'echo' is not supported in POSIX
-    read -r response # -r flag to prevent backslashes from being interpreted
+    printf "Do you want to install slstatus? (y/N): "
+    read -r response
     if [ "$response" = "y" ] || [ "$response" = "Y" ]; then
         printf "%b\n" "${YELLOW}Installing slstatus${RC}"
-        cd "$HOME/dwm-titus/slstatus" || { printf "%b\n" "${RED}Failed to change directory to slstatus${RC}"; return 1; }
+        cd "$HOME/dwm-titus/slstatus" || { 
+            printf "%b\n" "${RED}Failed to change directory to slstatus${RC}"
+            return 1
+        }
         if "$ESCALATION_TOOL" make clean install; then
             printf "%b\n" "${GREEN}slstatus installed successfully${RC}"
         else