diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml
index 2abb616..ec237ed 100644
--- a/facts/workstation/package.yml
+++ b/facts/workstation/package.yml
@@ -18,6 +18,7 @@
     dconf_editor: dconf-editor
     appimagelauncher: htop #placeholder
     nfs: nfs-common
+    msgfmt: gettext
 
 
 - name: Workstation | Facts | Package | Pop_OS!
diff --git a/tasks/workstation/freebsd/software/gui.yml b/tasks/workstation/freebsd/software/gui.yml
index 356a43c..97bb5dd 100644
--- a/tasks/workstation/freebsd/software/gui.yml
+++ b/tasks/workstation/freebsd/software/gui.yml
@@ -7,7 +7,7 @@
     - xorg
     - gnome3-lite
     - "{{ firefox_esr }}"
-    - "{{ thunderbird }}"
+    - "{{ evolution }}"
     - vscode
     - gimp
     - telegram-desktop
@@ -17,7 +17,7 @@
   package: 
     name:
     - "{{ firefox }}"
-    - "{{ evolution }}"
+    - "{{ thunderbird }}"
     state: absent
 
 - name: Workstation | FreeBSD | GUI | Create rc.conf Entries
diff --git a/tasks/workstation/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml
index 252d77e..a8f36e9 100644
--- a/tasks/workstation/linux/software/flatpaks.yml
+++ b/tasks/workstation/linux/software/flatpaks.yml
@@ -117,6 +117,7 @@
     - com.visualstudio.code-oss
     - org.midori_browser.Midori
     - com.github.Eloston.UngoogledChromium
+    - org.gnome.Evolution # Doesn't pick up GNOME theme since contained.
   ignore_errors: yes
 
 
@@ -131,6 +132,13 @@
       - "{{ appimagelauncher }}"
     state: present
 
+- name: Workstation | Linux | Flatpak Distro | Package Manager | Update From Repo
+  package: 
+    name: 
+      - "{{ evolution }}"
+      - "{{ evolution }}*"
+    state: present
+
 - name: Workstation | Linux | Flatpak Distro | Package Manager | Remove Firefox Normal
   package: 
     name:
diff --git a/tasks/workstation/settings/gnome.yml b/tasks/workstation/settings/gnome.yml
index 4c23c30..6aae803 100644
--- a/tasks/workstation/settings/gnome.yml
+++ b/tasks/workstation/settings/gnome.yml
@@ -53,6 +53,7 @@
   package:
     name: 
       - make
+      - "{{ msgfmt }}"
     state: present
   when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed
 
@@ -152,7 +153,7 @@
   dconf: 
     key: /org/gnome/shell/favorite-apps
     value: "['org.gnome.Terminal.desktop', 'gnome-system-monitor.desktop', 'org.gnome.Nautilus.desktop', 
-             '{{ browser }}', 'org.mozilla.Thunderbird.desktop',
+             '{{ browser }}', 'org.gnome.Evolution.desktop', 'org.mozilla.Thunderbird.desktop',
              'com.vscodium.codium.desktop', 'org.shotcut.Shotcut.desktop', 
              'org.telegram.desktop.desktop', 'com.discordapp.Discord.desktop', 
              'rhythmbox.desktop', 'io.lbry.lbry-app.desktop',
@@ -165,7 +166,7 @@
   dconf: 
     key: /org/gnome/shell/favorite-apps
     value: "['org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 
-             'firefox.desktop', 'org.mozilla.Thunderbird.desktop', 
+             'firefox.desktop', 'org.gnome.Evolution.desktop', 'org.mozilla.Thunderbird.desktop', 
              'code-oss.desktop', 'org.telegram.desktop.desktop']"
     state: present
   become_user: ling
@@ -256,7 +257,7 @@
 
 # Schemas to try after looking at gsettings list-schemas | sort
 # org.gnome.ControlCenter -- not very interesting
-# org.gnome.desktop.default-applications -- nothing?? Where do we set Firefox and Evolution?
+# org.gnome.desktop.default-applications -- nothing?? Where do we set Brave and Evolution?
 # org.gnome.desktop.interface -- Good stuff in here.
 # org.gnome.desktop.peripherals -- Nothing :(
 # org.gnome.desktop.privacy -- Good stuff here too!! Cool!