diff --git a/sift/desktop.sls b/sift/desktop.sls
index b99c3bc..4d61718 100644
--- a/sift/desktop.sls
+++ b/sift/desktop.sls
@@ -6,12 +6,3 @@ sift-desktop-version-file:
     - name: install-complete
     - require:
       - sls: sift.include-server
-  #file.managed:
-  #  - name: /etc/sift-version
-  #  - source:
-  #    - salt://sift/VERSION # note: this is here for when sift is a submoduled to salt://sift/
-  #    - salt://VERSION
-  #  - user: root
-  #  - group: root
-  #  - require:
-  #    - sls: sift.include-desktop
diff --git a/sift/packages/exfat-extras.sls b/sift/packages/exfat-extras.sls
new file mode 100644
index 0000000..a5b2722
--- /dev/null
+++ b/sift/packages/exfat-extras.sls
@@ -0,0 +1,8 @@
+include:
+  - sift.packages.exfat-extras_{{ grains['oscodename'] }}
+
+sift-package-exfat-extras-distro:
+  test.nop:
+    - name: sift-package-exfat-extras-distro
+    - require:
+      - sls: sift.packages.exfat-extras_{{ grains['oscodename'] }}
\ No newline at end of file
diff --git a/sift/packages/exfat-utils.sls b/sift/packages/exfat-extras_focal.sls
similarity index 100%
rename from sift/packages/exfat-utils.sls
rename to sift/packages/exfat-extras_focal.sls
diff --git a/sift/packages/exfat-extras_jammy.sls b/sift/packages/exfat-extras_jammy.sls
new file mode 100644
index 0000000..dfb798c
--- /dev/null
+++ b/sift/packages/exfat-extras_jammy.sls
@@ -0,0 +1,10 @@
+# Name: exfat-utils
+# Website: https://github.com/relan/exfat
+# Description: Free exFAT File System Implementation
+# Category:
+# Author: Relan
+# License: GNU General Public License v2 (https://github.com/relan/exfat/blob/master/COPYING)
+# Notes:
+
+exfatprogs:
+  pkg.installed
diff --git a/sift/packages/init.sls b/sift/packages/init.sls
index e227ee3..b0b635d 100644
--- a/sift/packages/init.sls
+++ b/sift/packages/init.sls
@@ -32,8 +32,8 @@ include:
   - sift.packages.epic5
   - sift.packages.etherape
   - sift.packages.ettercap-graphical
+  - sift.packages.exfat-extras
   - sift.packages.exfat-fuse
-###  - sift.packages.exfat-utils
   - sift.packages.exif
   - sift.packages.extundelete
   - sift.packages.fdupes
@@ -78,7 +78,7 @@ include:
   - sift.packages.libevtx-tools
   - sift.packages.libewf
   - sift.packages.libewf-dev
-###  - sift.packages.libewf-python
+  - sift.packages.libewf-python3
   - sift.packages.libewf-tools
   - sift.packages.libext2fs2
   - sift.packages.libffi-dev
@@ -197,7 +197,7 @@ include:
   - sift.packages.wireshark
   - sift.packages.xdot
   - sift.packages.xfsprogs
-###  - sift.packages.xmount
+  - sift.packages.xmount
   - sift.packages.zenity
   - sift.packages.python3-debian
 
@@ -238,8 +238,8 @@ sift-packages:
       - sls: sift.packages.epic5
       - sls: sift.packages.etherape
       - sls: sift.packages.ettercap-graphical
+      - sls: sift.packages.exfat-extras
       - sls: sift.packages.exfat-fuse
-###      - sls: sift.packages.exfat-utils
       - sls: sift.packages.exif
       - sls: sift.packages.extundelete
       - sls: sift.packages.fdupes
@@ -284,7 +284,7 @@ sift-packages:
       - sls: sift.packages.libevtx-tools
       - sls: sift.packages.libewf
       - sls: sift.packages.libewf-dev
-###      - sls: sift.packages.libewf-python
+      - sls: sift.packages.libewf-python3
       - sls: sift.packages.libewf-tools
       - sls: sift.packages.libext2fs2
       - sls: sift.packages.libffi-dev
@@ -403,6 +403,6 @@ sift-packages:
       - sls: sift.packages.wireshark
       - sls: sift.packages.xdot
       - sls: sift.packages.xfsprogs
-###      - sls: sift.packages.xmount
+      - sls: sift.packages.xmount
       - sls: sift.packages.zenity
       - sls: sift.packages.python3-debian
diff --git a/sift/packages/libewf-python.sls b/sift/packages/libewf-python3.sls
similarity index 79%
rename from sift/packages/libewf-python.sls
rename to sift/packages/libewf-python3.sls
index 575d1c8..106e6a2 100644
--- a/sift/packages/libewf-python.sls
+++ b/sift/packages/libewf-python3.sls
@@ -3,6 +3,6 @@ include:
 
 libewf-python:
   pkg.installed:
-    - name: libewf-python
+    - name: libewf-python3
     - require:
       - sls: sift.repos.gift
diff --git a/sift/server.sls b/sift/server.sls
index 4e690de..6ad8aac 100644
--- a/sift/server.sls
+++ b/sift/server.sls
@@ -6,12 +6,3 @@ sift-server-version-file:
     - name: install-complete
     - require:
       - sls: sift.include-server
-  #file.managed:
-  #  - name: /etc/sift-version
-  #  - source: 
-  #    - salt://sift/VERSION # note: this is here for when sift is a submoduled to salt://sift/
-  #    - salt://VERSION
-  #  - user: root
-  #  - group: root
-  #  - require:
-  #    - sls: sift.include-server