diff --git a/facts/general/service.yml b/facts/general/service.yml
index 6db4786..34bb7dd 100644
--- a/facts/general/service.yml
+++ b/facts/general/service.yml
@@ -16,5 +16,5 @@
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
-    sshfs_leet_cmd: "sshfs ling@leet: /mnt/leet -o defaults.allow_othher,_netdev"
+    sshfs_leet_cmd: "sshfs ling@leet: /mnt/leet -o defaults,allow_other,_netdev"
   when: ansible_system == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/general/acct_mgmt/gnome.yml b/tasks/general/acct_mgmt/gnome.yml
new file mode 100644
index 0000000..022aa44
--- /dev/null
+++ b/tasks/general/acct_mgmt/gnome.yml
@@ -0,0 +1,18 @@
+---
+# GNOME settings, extensions, and setup.
+
+# Setup Favorites (Terminal, Files, Firefox, Thunderbird, LBRY, Discord, VS Code, Android Studio, Lutris, Steam)
+
+# Make sure Gnome-Tweaks is installed
+
+# Dash to Dock Extension
+
+# Top Bar Settings (Battery Percentage, Clock Weekday+Seconds, Calendar Week Numbers)
+
+# Never Prompt for Removal Media
+
+# Dark theme?
+#Pop-dark on Pop
+#Adwaita-dark on everything else
+
+# Window Titlebars (Titlebar Buttons Minimize)
diff --git a/tasks/general/acct_mgmt/mounts.yml b/tasks/general/acct_mgmt/mounts.yml
index b67f259..7a8a328 100644
--- a/tasks/general/acct_mgmt/mounts.yml
+++ b/tasks/general/acct_mgmt/mounts.yml
@@ -32,7 +32,7 @@
     warn: false
   when: ansible_system == "Linux"
 
-# FreeBSD also has root cron job for this @reboot
+# FreeBSD has to do this via root cron job, fstab is unhappy
 - name: General | Cron | Root | Create SSHFS Job
   cron:
     user: root
diff --git a/tasks/linux/software/flatpaks.yml b/tasks/linux/software/flatpaks.yml
index ab17d31..e240b97 100644
--- a/tasks/linux/software/flatpaks.yml
+++ b/tasks/linux/software/flatpaks.yml
@@ -1,6 +1,6 @@
 ---
 
-# Pre-reqs
+# Flatpak Pre-reqs
 - name: Workstation | Linux | Flatpak | Install Flatpak
   package:
     name: flatpak
@@ -13,7 +13,7 @@
     method: system
     flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
 
-# Hop into installs
+# Flatpak Installs
 - name: Workstation | Linux | Flatpak | Install Discord
   flatpak:
     name: com.discordapp.Discord
@@ -22,20 +22,26 @@
   flatpak:
     name: org.shotcut.Shotcut
 
-- name: Workstation | Linux | Flatpak | Install Firefox
+- name: Workstation | Linux | Flatpak | Do Not Use Firefox Flatpak
   flatpak:
     name: org.mozilla.firefox
+    state: absent
 
 - name: Workstation | Linux | Flatpak | Install Thunderbird
   flatpak:
     name: org.mozilla.Thunderbird
 
-# Remove any applicable repo software
-- name: Workstation | Linux | Flatpak | Remove Packages
+# Repo Software
+- name: Workstation | Linux | Flatpak | Install Firefox From Package Manager
+  package: 
+    name:
+    - "{{ firefox_esr }}"
+    state: present
+
+- name: Workstation | Linux | Flatpak | Remove Software From Package Manager
   package: 
     name:
     - "{{ firefox }}"
-    - "{{ firefox_esr }}"
     - "{{ thunderbird }}"
     - "{{ evolution }}"
     state: absent
\ No newline at end of file