diff --git a/packages/tableplus.sh b/packages/developer.sh
similarity index 80%
rename from packages/tableplus.sh
rename to packages/developer.sh
index 03943032..564d9a14 100644
--- a/packages/tableplus.sh
+++ b/packages/developer.sh
@@ -11,7 +11,6 @@ then
   exit 1
 fi
 
-has_app 'TablePlus'
+has_app 'Developer'
 
-optional
-use_brew cask 'tableplus'
+use_mas 'Apple Developer' 640199958
diff --git a/packages/draw-things.sh b/packages/draw-things.sh
deleted file mode 100644
index 61655f74..00000000
--- a/packages/draw-things.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_app 'Draw Things'
-
-profile -work
-use_mas 'draw-things' 6444050820
diff --git a/packages/gomplate.sh b/packages/gomplate.sh
deleted file mode 100644
index 63ec5909..00000000
--- a/packages/gomplate.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_executable 'gomplate'
-
-sys_type="$(uname -s)"
-case "$sys_type" in
-  Linux*)
-    sys_type="linux"
-    ;;
-  Darwin*)
-    sys_type="darwin"
-    ;;
-  *)
-    ;;
-esac
-cpu_type="$(uname -m)"
-case "$cpu_type" in
-  x86_64)
-    cpu_type="amd64"
-    ;;
-  i686)
-    cpu_type="386"
-    ;;
-  aarch64)
-    cpu_type="arm64"
-    ;;
-  armv6l)
-    cpu_type="armv6"
-    ;;
-  armv7l)
-    cpu_type="armv7"
-    ;;
-  *)
-    ;;
-esac
-
-# use_yay 'gomplate'
-use_brew formula 'gomplate'
-use_bin 'gomplate' "https://github.com/hairyhenderson/gomplate" "%url/releases/download/v%version/gomplate_$sys_type-$cpu_type" "3.10.0"
diff --git a/packages/mycli.sh b/packages/mycli.sh
deleted file mode 100644
index f4ff4c1b..00000000
--- a/packages/mycli.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_executable 'mycli'
-
-use_apt 'mycli'
-use_brew formula 'mycli'
diff --git a/packages/ncmpcpp.sh b/packages/ncmpcpp.sh
deleted file mode 100644
index 9902fbc2..00000000
--- a/packages/ncmpcpp.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_executable 'ncmpcpp'
-
-use_apt 'ncmpcpp'
-use_brew formula 'ncmpcpp'
diff --git a/packages/ps-remote-play.sh b/packages/ps-remote-play.sh
deleted file mode 100644
index c2881c10..00000000
--- a/packages/ps-remote-play.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_app 'PS Remote Play'
-
-profile -work
-use_brew cask 'sony-ps-remote-play'
diff --git a/packages/dropbox.sh b/packages/sf-symbols.sh
similarity index 82%
rename from packages/dropbox.sh
rename to packages/sf-symbols.sh
index da9ea491..46d7c73a 100644
--- a/packages/dropbox.sh
+++ b/packages/sf-symbols.sh
@@ -11,7 +11,6 @@ then
   exit 1
 fi
 
-has_app 'Dropbox'
+has_app 'SF Symbols'
 
-optional
-use_brew cask 'dropbox'
+use_brew cask 'sf-symbols'
diff --git a/packages/trex.sh b/packages/shottr.sh
similarity index 84%
rename from packages/trex.sh
rename to packages/shottr.sh
index c38bbc91..4ff404cc 100644
--- a/packages/trex.sh
+++ b/packages/shottr.sh
@@ -11,7 +11,6 @@ then
   exit 1
 fi
 
-has_app 'TRex'
+has_app 'Shottr'
 
-optional
-use_brew cask 'trex'
+use_brew cask 'shottr'
diff --git a/packages/squirrel.sh b/packages/squirrel.sh
index 92365e80..116ae039 100644
--- a/packages/squirrel.sh
+++ b/packages/squirrel.sh
@@ -13,5 +13,4 @@ fi
 
 has_app 'Squirrel'
 
-profile work
 use_mas 'squirrel' 1669664068
diff --git a/packages/tig.sh b/packages/tig.sh
deleted file mode 100644
index 89d3dbd6..00000000
--- a/packages/tig.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_executable 'tig'
-
-use_apt 'tig'
-use_brew formula 'tig'
diff --git a/packages/unsplash.sh b/packages/unsplash.sh
deleted file mode 100644
index 6db213c6..00000000
--- a/packages/unsplash.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if
-  ! (command -v force_print >/dev/null 2>&1) ||
-  ! (force_print 3 a b >/dev/null 2>&1) ||
-  test "$(force_print 3 a b)" != "a  b";
-then
-  printf "Please run this script through \"install.sh\" instead"
-  exit 1
-fi
-
-has_app 'Unsplash'
-
-profile -work
-
-SUPPORT_DIR="$HOME/$DOTFILES/supports/unsplash"
-
-use_nativefier 'Unsplash' 'https://unsplash.com' --conceal --background-color '#000000' --icon "$SUPPORT_DIR/icon.icns" --inject "$SUPPORT_DIR/inject.css" --inject "$SUPPORT_DIR/inject.js" --disable-context-menu --darwin-dark-mode-support
diff --git a/packages/line.sh b/packages/wakatime.sh
similarity index 82%
rename from packages/line.sh
rename to packages/wakatime.sh
index f6abe586..59623f23 100644
--- a/packages/line.sh
+++ b/packages/wakatime.sh
@@ -11,7 +11,6 @@ then
   exit 1
 fi
 
-has_app 'LINE'
+has_app 'WakaTime'
 
-optional
-use_mas 'line' '539883307'
+use_brew cask 'wakatime'