diff --git a/tasks/workstation/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml
index 60fc877..d804804 100644
--- a/tasks/workstation/linux/software/flatpaks.yml
+++ b/tasks/workstation/linux/software/flatpaks.yml
@@ -10,6 +10,10 @@
 # Then remove, autoremove, and purge flatpak executable with package manager.
 # Source: https://softhints.com/how-to-completely-remove-flatpak-linux-mint/
 
+- name: Workstation | Linux | Flatpak Distro | Flatpak | Facts
+  set_fact:
+    flatpak_extension: "-flatpak"
+
 ## Flatpak Pre-reqs ##
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Install
@@ -34,57 +38,57 @@
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Arrays
   set_fact:
     flatpaks_generic:
-      - { app: "org.mozilla.firefox", name: "firefox-flatpak", extra: "" }
-      - { app: "io.gitlab.librewolf-community", name: "librewolf-flatpak", extra: "" }
-      - { app: "org.signal.Signal", name: "signal-flatpak", extra: "" }
-      - { app: "im.riot.Riot", name: "element-flatpak", extra: "" }
-      - { app: "org.telegram.desktop", name: "telegram-flatpak", extra: "" }
-      - { app: "org.gimp.GIMP", name: "gimp-flatpak", extra: "" }
-      - { app: "org.libreoffice.LibreOffice", name: "office-flatpak", extra: "" }
-      - { app: "com.transmissionbt.Transmission", name: "transmission-flatpak", extra: "" }
-      - { app: "app.grayjay.Grayjay", name: "grayjay-flatpak", extra: "" }
-      - { app: "com.github.xournalpp.xournalpp", name: "xournal-flatpak", extra: "" }
-      - { app: "network.loki.Session", name: "session-flatpak", extra: "" }
-      - { app: "com.brave.Browser", name: "brave-flatpak", extra: "" }
-      - { app: "net.ankiweb.Anki", name: "anki-flatpak", extra: "" }
-      - { app: "app.organicmaps.desktop", name: "organic-maps-flatpak", extra: "" }
-      - { app: "im.dino.Dino", name: "dino-flatpak", extra: "" }
+      - { app: "org.mozilla.firefox", name: "firefox", extra: "" }
+      - { app: "io.gitlab.librewolf-community", name: "librewolf", extra: "" }
+      - { app: "org.signal.Signal", name: "signal", extra: "" }
+      - { app: "im.riot.Riot", name: "element", extra: "" }
+      - { app: "org.telegram.desktop", name: "telegram", extra: "" }
+      - { app: "org.gimp.GIMP", name: "gimp", extra: "" }
+      - { app: "org.libreoffice.LibreOffice", name: "office", extra: "" }
+      - { app: "com.transmissionbt.Transmission", name: "transmission", extra: "" }
+      - { app: "app.grayjay.Grayjay", name: "grayjay", extra: "" }
+      - { app: "com.github.xournalpp.xournalpp", name: "xournal", extra: "" }
+      - { app: "network.loki.Session", name: "session", extra: "" }
+      - { app: "com.brave.Browser", name: "brave", extra: "" }
+      - { app: "net.ankiweb.Anki", name: "anki", extra: "" }
+      - { app: "app.organicmaps.desktop", name: "organic-maps", extra: "" }
+      - { app: "im.dino.Dino", name: "dino", extra: "" }
     flatpaks_coding:
-      - { app: "com.vscodium.codium", name: "codium-flatpak", extra: "" }
-      - { app: "com.google.AndroidStudio", name: "android-studio-flatpak", extra: "" }
-      - { app: "io.dbeaver.DBeaverCommunity", name: "dbeaver-flatpak", extra: "" }
-      - { app: "com.visualstudio.code-oss", name: "code-flatpak", extra: "" }
-      - { app: "org.gnome.Boxes", name: "boxes-flatpak", extra: "" }
+      - { app: "com.vscodium.codium", name: "codium", extra: "" }
+      - { app: "com.google.AndroidStudio", name: "android-studio", extra: "" }
+      - { app: "io.dbeaver.DBeaverCommunity", name: "dbeaver", extra: "" }
+      - { app: "com.visualstudio.code-oss", name: "code", extra: "" }
+      - { app: "org.gnome.Boxes", name: "boxes", extra: "" }
     flatpaks_editing_video:
-      - { app: "org.shotcut.Shotcut", name: "shotcut-flatpak", extra: "" }
-      - { app: "com.obsproject.Studio", name: "obs-flatpak", extra: "" }
-      - { app: "org.openshot.OpenShot", name: "openshot-flatpak", extra: "" }
+      - { app: "org.shotcut.Shotcut", name: "shotcut", extra: "" }
+      - { app: "com.obsproject.Studio", name: "obs", extra: "" }
+      - { app: "org.openshot.OpenShot", name: "openshot", extra: "" }
     flatpaks_editing_audio:
-      - { app: "org.tenacityaudio.Tenacity", name: "tenacity-flatpak", extra: "" }
-      - { app: "io.lmms.LMMS", name: "lmms-flatpak", extra: "" }
-      - { app: "net.sourceforge.VMPK", name: "vmpk-flatpak", extra: "" }
-      - { app: "org.musicbrainz.Picard", name: "picard-flatpak", extra: "" }
+      - { app: "org.tenacityaudio.Tenacity", name: "tenacity", extra: "" }
+      - { app: "io.lmms.LMMS", name: "lmms", extra: "" }
+      - { app: "net.sourceforge.VMPK", name: "vmpk", extra: "" }
+      - { app: "org.musicbrainz.Picard", name: "picard", extra: "" }
     flatpaks_gaming:
-      - { app: "com.valvesoftware.Steam", name: "steam-flatpak", extra: "" }
-      - { app: "com.play0ad.zeroad", name: "zeroad-flatpak", extra: "" }
-      - { app: "net.supertuxkart.SuperTuxKart", name: "tuxkart-flatpak", extra: "" }
+      - { app: "com.valvesoftware.Steam", name: "steam", extra: "" }
+      - { app: "com.play0ad.zeroad", name: "zeroad", extra: "" }
+      - { app: "net.supertuxkart.SuperTuxKart", name: "tuxkart", extra: "" }
     flatpaks_remove:
-      - { app: "com.visualstudio.code", name: "vscode-flatpak", extra: "" } # Why does this throw an error? It's the correct ID.
-      - { app: "org.midori_browser.Midori", name: "midori-flatpak", extra: "" }
-      - { app: "com.github.Eloston.UngoogledChromium", name: "unchrome-flatpak", extra: "" }
-      - { app: "org.gnome.Evolution", name: "evolution-flatpak", extra: "" } # Doesn't pick up GNOME theme since contained.
-      - { app: "org.mozilla.Thunderbird", name: "thunderbird-flatpak", extra: "" } # Doesn't integrate with Nextcloud as well as Evolution.
-      - { app: "org.audacityteam.Audacity", name: "audacity-flatpak", extra: "" } # Say "no thanks" to spyware.
-      - { app: "com.discordapp.Discord", name: "discord-flatpak", extra: "" } # Stopped working, just spins and says Starting.
+      - { app: "com.visualstudio.code", name: "vscode", extra: "" } # Why does this throw an error? It's the correct ID.
+      - { app: "org.midori_browser.Midori", name: "midori", extra: "" }
+      - { app: "com.github.Eloston.UngoogledChromium", name: "unchrome", extra: "" }
+      - { app: "org.gnome.Evolution", name: "evolution", extra: "" } # Doesn't pick up GNOME theme since contained.
+      - { app: "org.mozilla.Thunderbird", name: "thunderbird", extra: "" } # Doesn't integrate with Nextcloud as well as Evolution.
+      - { app: "org.audacityteam.Audacity", name: "audacity", extra: "" } # Say "no thanks" to spyware.
+      - { app: "com.discordapp.Discord", name: "discord", extra: "" } # Stopped working, just spins and says Starting.
       # 2022-11-20 No longer using any of these and they're taking up a lot of space. #
-      - { app: "com.jetbrains.PyCharm-Community", name: "pycharm-flatpak", extra: "" }
+      - { app: "com.jetbrains.PyCharm-Community", name: "pycharm", extra: "" }
       # End 2022-11-20 #
-      - { app: "io.lbry.lbry-app", name: "lbry-flatpak", extra: "dbus-launch" } # 2023-09-01, Noticed it is no longer supported.
-      - { app: "chat.delta.desktop", name: "deltachat-flatpak", extra: "" } # 2023-12-18, No longer used.
-      - { app: "org.gnome.Geary", name: "geary-flatpak", extra: "" } # 2024-12-15, No longer used.
-      - { app: "org.rncbc.qsynth", name: "qsynth-flatpak", extra: "" } # 2024-12-15, Not worth the setup, use LMMS or VMPK.
-      - { app: "org.godotengine.Godot", name: "godot-flatpak", extra: "" } # 2025-08-31, Stopped playing with this months / years ago. Seemed cool but Flutter is working well for this purpose.
-      - { app: "chat.simplex.simplex", name: "simplex-flatpak", extra: "" } # 2025-11-22, Takes a ton of space and does not work without interacting with phone.
+      - { app: "io.lbry.lbry-app", name: "lbry", extra: "dbus-launch" } # 2023-09-01, Noticed it is no longer supported.
+      - { app: "chat.delta.desktop", name: "deltachat", extra: "" } # 2023-12-18, No longer used.
+      - { app: "org.gnome.Geary", name: "geary", extra: "" } # 2024-12-15, No longer used.
+      - { app: "org.rncbc.qsynth", name: "qsynth", extra: "" } # 2024-12-15, Not worth the setup, use LMMS or VMPK.
+      - { app: "org.godotengine.Godot", name: "godot", extra: "" } # 2025-08-31, Stopped playing with this months / years ago. Seemed cool but Flutter is working well for this purpose.
+      - { app: "chat.simplex.simplex", name: "simplex", extra: "" } # 2025-11-22, Takes a ton of space and does not work without interacting with phone.
 
 # Generic #
 
@@ -98,7 +102,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Generic | Executables
   blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     block: |
       {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
     marker: '{mark}'
@@ -111,7 +115,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Generic | Executable Permissions
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: file
     mode: '0755'
   loop: "{{ flatpaks_generic }}"
@@ -129,7 +133,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Coding | Executables
   blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     block: |
       {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
     marker: '{mark}'
@@ -143,7 +147,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Coding | Executable Permissions
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: file
     mode: '0755'
   loop: "{{ flatpaks_coding }}"
@@ -160,7 +164,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Coding | Remove Executables
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: absent
   loop: "{{ flatpaks_coding }}"
   ignore_errors: yes
@@ -179,7 +183,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Executables
   blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     block: |
       {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
     marker: '{mark}'
@@ -193,7 +197,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Executable Permissions
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: file
     mode: '0755'
   loop: "{{ flatpaks_editing_video }}"
@@ -210,7 +214,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Remove Executables
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: absent
   loop: "{{ flatpaks_editing_video }}"
   ignore_errors: yes
@@ -227,7 +231,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Executables
   blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     block: |
       {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
     marker: '{mark}'
@@ -241,7 +245,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Executable Permissions
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: file
     mode: '0755'
   loop: "{{ flatpaks_editing_audio }}"
@@ -258,7 +262,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Remove Executables
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: absent
   loop: "{{ flatpaks_editing_audio }}"
   ignore_errors: yes
@@ -277,7 +281,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Gaming | Executables
   blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     block: |
       {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
     marker: '{mark}'
@@ -291,7 +295,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Gaming | Executable Permissions
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: file
     mode: '0755'
   loop: "{{ flatpaks_gaming }}"
@@ -308,7 +312,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Gaming | Remove Executables
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: absent
   loop: "{{ flatpaks_gaming }}"
   ignore_errors: yes
@@ -326,7 +330,7 @@
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Uninstalls | Remove Executables
   file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
+    path: "{{ flatpak_exec_dir }}/{{ item.name }}{{ flatpak_extension }}"
     state: absent
   loop: "{{ flatpaks_remove }}"
   ignore_errors: yes