diff --git a/sift/python-packages/s2sphere.sls b/sift/python-packages/s2sphere.sls
new file mode 100644
index 0000000..b1f3ba7
--- /dev/null
+++ b/sift/python-packages/s2sphere.sls
@@ -0,0 +1,11 @@
+include:
+  - sift.packages.python3-pip
+  - sift.packages.python2-pip
+
+sift-python-packages-s2sphere:
+  pip.installed:
+    - name: s2sphere
+    - bin_env: /usr/bin/python2
+    - upgrade: True
+    - require:
+      - sls: sift.packages.python2-pip
diff --git a/sift/python3-packages/ijson.sls b/sift/python3-packages/ijson.sls
new file mode 100644
index 0000000..75ad193
--- /dev/null
+++ b/sift/python3-packages/ijson.sls
@@ -0,0 +1,9 @@
+include:
+  - sift.python3-packages.pip
+
+sift-python3-packages-ijson:
+  pip.installed:
+    - name: ijson
+    - bin_env: /usr/bin/python3
+    - require:
+      - sls: sift.python3-packages.pip
diff --git a/sift/scripts/4n6.sls b/sift/scripts/4n6.sls
index a6268b1..b635d38 100644
--- a/sift/scripts/4n6.sls
+++ b/sift/scripts/4n6.sls
@@ -1,7 +1,20 @@
-{%- set files = ['WP8_AppPerms.py','bing-bar-parser.pl','chunkymonkey.py','dextract.def','dextract.py','docx-font-extractor.pl','exif2map.pl','fbmsg-extractor.py','gis4cookie.pl','google-ei-time.py','imgcache-parse-mod.py','imgcache-parse.py','json-printer.pl','msoffice-pic-extractor.py','plist2db.py','print_apk_perms.py','s2-cellid2latlong.py','s2-latlong2cellid.py','sms-grep-sample-config.txt','sms-grep.pl','sqlite-base64-decode.py','sqlite-blob-dumper.py','sqlite-parser.pl','squirrelgripper-README.txt','squirrelgripper.pl','timediff32.pl','vmail-db-2-html.pl','wp8-1-callhistory.py','wp8-1-contacts.py','wp8-1-mms-filesort.py','wp8-1-mms.py','wp8-1-sms.py','wp8-callhistory.py','wp8-contacts.py','wp8-fb-msg.py','wp8-sha256-pin-finder.py','wp8-sms.py','wwf-chat-parser.py'] %}
-{%- set noshebang = ['sqlite-base64-decode.py','sqlite-blob-dumper.py','wp8-sha256-pin-finder.py'] %}
+{% set files = [('Android', ['fbmsg-extractor.py','imgcache-parse-mod.py','imgcache-parse.py','print_apk_perms.py','wwf-chat-parser.py']),
+                 ('Ford', ['sync3-unisearch.py','sync3-unisearch2kml.py']),
+                 ('Google_Takeout_Records', ['gRecordsActivity_ijson_date.py']),
+                 ('Samsung_Gallery3d_2022', ['java-hashcode.py','samsung_gallery3d_filesysmon_parser_v11.py','samsung_gallery3d_log_parser_v10.py','samsung_gallery3d_log_parser_v11.py','samsung_gallery3d_trash_parser_v10.py']),
+                 ('WindowsPhone8', ['WP8_AppPerms.py','wp8-1-callhistory.py','wp8-1-contacts.py','wp8-1-mms-filesort.py','wp8-1-mms.py','wp8-1-sms.py','wp8-callhistory.py','wp8-contacts.py','wp8-fb-msg.py','wp8-sha256-pin-finder.py','wp8-sms.py']),
+                 ('iOS', ['ios14_maps_history.py','vmail-db-2-html.pl']),
+                 ('perl', ['bing-bar-parser.pl','docx-font-extractor.pl','exif2map.pl','gis4cookie.pl','json-printer.pl','sms-grep-sample-config.txt','sms-grep.pl']),
+                 ('utilities', ['chunkymonkey.py','dextract.def','dextract.py','google-ei-time.py','msoffice-pic-extractor.py','parse_garmin56LM.py','plist2db.py','s2-cellid2latlong.py','s2-latlong2cellid.py','sqlite-base64-decode.py','sqlite-blob-dumper.py','sqlite-parser.pl','squirrelgripper-README.txt','squirrelgripper.pl','timediff32.pl'])
+                ] %}
+
+{% set noshebang = ['sqlite-base64-decode.py','sqlite-blob-dumper.py','wp8-sha256-pin-finder.py'] %}
+{% set fixshebangpy2 = ['fbmsg-extractor.py','imgcache-parse-mod.py','imgcache-parse.py','print_apk_perms.py','wwf-chat-parser.py','WP8_AppPerms.py','wp8-1-callhistory.py','wp8-1-contacts.py','wp8-1-mms-filesort.py','wp8-1-mms.py','wp8-1-sms.py','wp8-callhistory.py','wp8-contacts.py','wp8-fb-msg.py','wp8-sms.py','chunkymonkey.py','dextract.py','google-ei-time.py','msoffice-pic-extractor.py','s2-cellid2latlong.py','s2-latlong2cellid.py'] %}
+{% set fixshebangpy3 = ['sync3-unisearch.py','sync3-unisearch2kml.py','gLocationHistoryActivity.py','gRecordsActivity_ijson_date.py','java-hashcode.py','samsung_gallery3d_filesysmon_parser_v11.py','samsung_gallery3d_log_parser_v10.py','samsung_gallery3d_log_parser_v11.py','samsung_gallery3d_trash_parser_v10.py'] %}
 
 include:
+  - sift.python3-packages.ijson
+  - sift.python-packages.s2sphere
   - sift.packages.git
   - sift.packages.python2
   - sift.packages.python3
@@ -18,7 +31,7 @@ sift-scripts-4n6-git:
     - name: https://github.com/cheeky4n6monkey/4n6-scripts.git
     - target: /usr/local/src/4n6-scripts
     - user: root
-    - rev: d1f629ecd1f5d0578d91a5c4a89fe2b10801dc43
+    - rev: f57a5301b317a9842c0d43853595161843086923
     - force_clone: True
     - force_reset: True
     - require:
@@ -26,34 +39,60 @@ sift-scripts-4n6-git:
       - sls: sift.packages.python2
       - sls: sift.packages.python3
 
-{%- for file in files %}
+{% for folder, file_list in files %}
+{%  for file in file_list %}
 sift-scripts-4n6-{{ file }}:
   file.copy:
     - name: /usr/local/bin/{{ file }}
-    - source: /usr/local/src/4n6-scripts/{{ file }}
+    - source: /usr/local/src/4n6-scripts/{{ folder }}/{{ file }}
+    - force: True
+    - mode: 755
+    - watch:
+      - git: sift-scripts-4n6-git
+{% endfor %}
+{% endfor %}
+
+sift-scripts-4n6-gLocationHistoryActivity:
+  file.copy:
+    - name: /usr/local/bin/gLocationHistoryActivity.py
+    - source: '/usr/local/src/4n6-scripts/Google_Takeout_Location_History/# gLocationHistoryActivity.py'
     - force: True
     - mode: 755
     - watch:
       - git: sift-scripts-4n6-git
-{%- endfor %}
 
-{%- for file in files %}
-sift-scripts-4n6-python-{{ file }}:
+{% for file in fixshebangpy2 %}
+sift-scripts-4n6-python2-{{ file }}:
   file.replace:
     - name: /usr/local/bin/{{ file }}
     - pattern: '#! /usr/bin/env python\n'
-    - repl: '#!/usr/bin/env python2\n'
+    - repl: '#! /usr/bin/env python2\n'
     - count: 1
     - watch:
       - git: sift-scripts-4n6-git
-{%- endfor %}
+{% endfor %}
 
-sift-scripts-4n6-plistdb2py-shebang:
-  file.prepend:
-    - name: /usr/local/bin/plist2db.py
-    - text: '#!/usr/bin/env python3'
+{% for file in fixshebangpy3 %}
+sift-scripts-4n6-python3-{{ file }}:
+  file.replace:
+    - name: /usr/local/bin/{{ file }}
+    - pattern: '#! /usr/bin/env python\n'
+    - repl: '#! /usr/bin/env python3\n'
+    - count: 1
+    - watch:
+      - git: sift-scripts-4n6-git
+{% endfor %}
+
+{% for file in fixshebangpy3 %}
+sift-scripts-4n6-python3-CRLF{{ file }}:
+  file.replace:
+    - name: /usr/local/bin/{{ file }}
+    - pattern: '#! /usr/bin/env python\r'
+    - repl: '#! /usr/bin/env python3\n'
+    - count: 1
     - watch:
       - git: sift-scripts-4n6-git
+{% endfor %}
 
 {%- for file in noshebang %}
 sift-scripts-4n6-add-shebang-{{ file }}:
@@ -62,5 +101,12 @@ sift-scripts-4n6-add-shebang-{{ file }}:
     - text: '#!/usr/bin/env python2'
     - watch:
       - git: sift-scripts-4n6-git
-{%- endfor %}
+{% endfor %}
+
+sift-scripts-4n6-plistdb2py-shebang:
+  file.prepend:
+    - name: /usr/local/bin/plist2db.py
+    - text: '#!/usr/bin/env python3'
+    - watch:
+      - git: sift-scripts-4n6-git