diff --git a/NOTES b/NOTES
index e15fb7b..29b4685 100644
--- a/NOTES
+++ b/NOTES
@@ -6,11 +6,15 @@
 -rename all non-obvious GNU tools to gnu-$package
 -rename all libraries to lib$package, adjust depends
 -remove superfluous packages
--fix sup package
--remove coreutils from browser deps?
+-remove coreutils from browser deps - build as part of browser???
 
 -look into packaging ftpfs, encfs, x11fs, and ucspi, as well as stunnel, sent, 
 -removed bkeymaps, brotli, jq.
 -fix iptables package to not require GNU install
 -add iptables to mbase?
 -began adding 'about' files to each directory
+-remove need for autoconf in core/core-mod/
+-remove need for git in core/core-mod/
+-attempt to make packages m4-agnostic
+-make rc the default user shell
+-gradually rewrite shell scripts in rc - maybe port kiss?
diff --git a/community-mod/stable/scrot/checksums b/community-mod/stable/scrot/checksums
index ab3ef23..2c92b7e 100644
--- a/community-mod/stable/scrot/checksums
+++ b/community-mod/stable/scrot/checksums
@@ -1 +1 @@
-ca9156a06b468334e18220040b2984da60136f6a2e0e979f668eda6e3f1e1c05
+129274bf0f0a1bbde8de5ab5db5c72556e1fc5b2a477de01c3dff74fc544f66a
diff --git a/community-mod/stable/scrot/sources b/community-mod/stable/scrot/sources
index 5f3150b..6b36ea2 100644
--- a/community-mod/stable/scrot/sources
+++ b/community-mod/stable/scrot/sources
@@ -1 +1 @@
-https://github.com/dreamer/scrot/archive/scrot-0.8.tar.gz
+https://github.com/resurrecting-open-source-projects/scrot/releases/download/1.7/scrot-1.7.tar.bz2
diff --git a/community-mod/stable/scrot/version b/community-mod/stable/scrot/version
index 330ad2d..46b73ae 100644
--- a/community-mod/stable/scrot/version
+++ b/community-mod/stable/scrot/version
@@ -1 +1 @@
-0.8 1
+1.7 1
diff --git a/emacs-beta/build b/emacs-beta/build
deleted file mode 100755
index 02271fa..0000000
--- a/emacs-beta/build
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-modules \
-    --without-dbus \
-    --without-gconf \
-    --without-gsettings \
-    --with-gnutls=no \
-    --with-json=no \
-    --with-native-compilation
-
-mkdir -p "$1/usr/share/emacs/site-lisp"
-cat << EOF > "$1/usr/share/emacs/site-lisp/site-start.el"
-;; Better security defaults
-(with-eval-after-load 'gnutls
-  (setq
-   gnutls-verify-error t
-   gnutls-min-prime-bits 2048
-   gnutls-trustfiles '("/etc/ssl/cert.pem")))
-
-;; Needed unless KISS Linux gains librsvg support
-(setq-default shr-blocked-images ".*\.svg$")
-EOF
-
-make NATIVE_FULL_AOT=1
-make DESTDIR="$1" install
-
-rm -rf "$1/usr/lib/systemd"
diff --git a/emacs-beta/checksums b/emacs-beta/checksums
deleted file mode 100644
index b50f68e..0000000
--- a/emacs-beta/checksums
+++ /dev/null
@@ -1 +0,0 @@
-6f10c72f9358fe1e39c761faf84bc1e5d81fb848f282c95bec34a9a77bc16288
diff --git a/emacs-beta/depends b/emacs-beta/depends
deleted file mode 100644
index 64e76e7..0000000
--- a/emacs-beta/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-libxml2
-ncurses
-
diff --git a/emacs-beta/sources b/emacs-beta/sources
deleted file mode 100644
index 37a3dda..0000000
--- a/emacs-beta/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.0.90.tar.xz
diff --git a/emacs-beta/version b/emacs-beta/version
deleted file mode 100644
index 9d9ecd1..0000000
--- a/emacs-beta/version
+++ /dev/null
@@ -1 +0,0 @@
-27.2 1
diff --git a/ports/scrot/build b/ports/scrot/build
deleted file mode 100755
index 8b14622..0000000
--- a/ports/scrot/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-meson build                     \
-   -Dprefix="$1/usr"            \
-   -Dmandir="$1/usr/share/man/"
-
-cd build
-ninja
-ninja install
diff --git a/ports/scrot/checksums b/ports/scrot/checksums
deleted file mode 100644
index 6467a78..0000000
--- a/ports/scrot/checksums
+++ /dev/null
@@ -1 +0,0 @@
-c5f6b1adcd235c5e4368658593eef310385b95fc1a76b68ef6d633ad24800135
diff --git a/ports/scrot/depends b/ports/scrot/depends
deleted file mode 100644
index 13ad0cf..0000000
--- a/ports/scrot/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-giblib
-meson make
diff --git a/ports/scrot/sources b/ports/scrot/sources
deleted file mode 100644
index 9a8d683..0000000
--- a/ports/scrot/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/dreamer/scrot/archive/refs/tags/v0.10.0.tar.gz
diff --git a/ports/scrot/version b/ports/scrot/version
deleted file mode 100644
index 330ad2d..0000000
--- a/ports/scrot/version
+++ /dev/null
@@ -1 +0,0 @@
-0.8 1