diff --git a/setup/fedora b/setup/fedora
index 3b5cc8b..5c0c15d 100755
--- a/setup/fedora
+++ b/setup/fedora
@@ -13,7 +13,7 @@ fi
 Arg1=$1
 
 wget scr.tyleo.dev/setup/fedora -O ./fedora &>/dev/null
-ver="3.2.2_fedoraws_gen4.1_git.tyleo.dev"
+ver="3.2.5_fedoraws_gen4.1_git.tyleo.dev"
 clear
 
 # Functions
@@ -243,6 +243,7 @@ io.github.revisto.drum-machine \
 io.github.jeffshee.Hidamari \
 io.github.dvlv.boxbuddyrs \
 io.github.flattool.Ignition \
+net.blix.BlueMail \
 org.kde.calligra \
 com.hunterwittenborn.Celeste \
 io.github.giantpinkrobots.varia \
@@ -393,21 +394,6 @@ gsettings set org.gnome.mutter check-alive-timeout 240000
 clear
 title="Theme Color and Mode Selection"
 header-show
-echo -n "> Theme Mode (default is Dark) :
-1. Dark Mode (default)
-2. Light Mode
-
-> Choice : "
-read thememode
-if [[ $thememode = $null ]]; then
-    ThemeModeSet="-Dark"
-fi
-if [[ $thememode = 1 ]]; then
-    ThemeModeSet="-Dark"
-fi
-if [[ $thememode = 2 ]]; then
-    ThemeModeSet="-Light"
-fi
 #echo -n "> Make color choice (default is Red) :
 # 1. Red
 # 2. Blue
@@ -457,8 +443,8 @@ fi
 mkdir $HOME/.themes
 mkdir -p $HOME/.local/icons
 
-wget "https://res.tyleo.dev/gtk/gz/Colloid-Grey.tar.xz"     -O /tmp/icontheme.tar.xz
-wget "https://res.tyleo.dev/gtk/gz/Mojave-Dark.tar.xz"    -O /tmp/gtktheme.tar.xz
+wget "https://res.tyleo.dev/gtk/mc3d/mc3d-icon.tar.xz"     -O /tmp/icontheme.tar.xz
+wget "https://res.tyleo.dev/gtk/mc3d/Gtk-Mojave-Dark.tar.xz"    -O /tmp/gsh-gtktheme-dark.tar.xz
 wget "https://res.tyleo.dev/gtk/cursor/McMojave-cursors.tar.xz" -O /tmp/cursors.tar.xz
 
 # Cursors and Icons are stored in the same directory (System)
@@ -470,21 +456,21 @@ sudo tar -xvf /tmp/cursors.tar.xz                           -C  $HOME/.local/sha
 sudo tar -xvf /tmp/icontheme.tar.xz                         -C  $HOME/.local/share/icons # Icons 
 
 # GTK Theme Extract (System)
-sudo tar -xvf /tmp/gtktheme.tar.xz                          -C  /usr/share/themes # Shell & GUI Themes
+sudo tar -xvf /tmp/gsh-gtktheme-dark.tar.xz                          -C  /usr/share/themes # Shell & GUI Themes
 
 # GTK Theme Extract (User)
-sudo tar -xvf /tmp/gtktheme.tar.xz                          -C  $HOME/.themes # Shell & GUI Themes
+sudo tar -xvf /tmp/gsh-gtktheme-dark.tar.xz                          -C  $HOME/.themes # Shell & GUI Themes
 
-sudo gsettings set org.gnome.desktop.interface gtk-theme Mojave$ThemeModeSet
-sudo gsettings set org.gnome.desktop.wm.preferences theme Mojave$ThemeModeSet
-sudo gsettings set org.gnome.desktop.interface icon-theme "Colloid-Grey$ThemeModeSet"
-gsettings set org.gnome.desktop.interface gtk-theme Mojave$ThemeModeSet
-gsettings set org.gnome.desktop.wm.preferences theme Mojave$ThemeModeSet
-gsettings set org.gnome.desktop.interface icon-theme "Colloid-Grey$ThemeModeSet"
+sudo gsettings set org.gnome.desktop.interface gtk-theme "Mojave-Dark"
+sudo gsettings set org.gnome.desktop.wm.preferences theme "Mojave-Dark"
+sudo gsettings set org.gnome.desktop.interface icon-theme "MacOS-3D-Icons"
+gsettings set org.gnome.desktop.interface gtk-theme "Mojave-Dark"
+gsettings set org.gnome.desktop.wm.preferences theme "Mojave-Dark"
+gsettings set org.gnome.desktop.interface icon-theme "MacOS-3D-Icons"
 gsettings set org.gnome.desktop.interface cursor-theme "McMojave-cursors"
-dconf write /org/gnome/shell/extensions/user-theme/name "'Mojave$ThemeModeSet'"
-flatpak override --user --env=GTK_THEME=Mojave$ThemeModeSet
-sudo flatpak override --env=GTK_THEME=Mojave$ThemeModeSet
+dconf write /org/gnome/shell/extensions/user-theme/name "'Mojave-Dark'"
+flatpak override --user --env=GTK_THEME=Mojave-Dark
+sudo flatpak override --env=GTK_THEME=Mojave-Dark
 
 
 flatpak override --user --filesystem=~/.themes
@@ -493,8 +479,8 @@ flatpak override --user --filesystem=~/.local/share/icons
 sudo flatpak override --filesystem=~/.local/share/icons
 
 sudo cp /etc/environment /etc/environment.bak
-echo "GTK_THEME='Mojave$ThemeModeSet'"       | sudo tee /etc/environment
-echo "export GTK_THEME='Mojave$ThemeModeSet'"| sudo tee -a /etc/environment
+echo "GTK_THEME='Mojave-Dark'"       | sudo tee /etc/environment
+echo "export GTK_THEME='Mojave-Dark'"| sudo tee -a /etc/environment
 }
 
 update-usermod() {