diff --git a/sublime-text-3/.SRCINFO b/sublime-text-3/.SRCINFO
index 4f75fb2..1b75679 100644
--- a/sublime-text-3/.SRCINFO
+++ b/sublime-text-3/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sublime-text-3
 	pkgdesc = Sophisticated text editor for code, html and prose (legacy version)
 	pkgver = 3.3211
-	pkgrel = 5
+	pkgrel = 4
 	url = https://www.sublimetext.com/3
 	install = sublime-text-3.install
 	arch = x86_64
@@ -9,8 +9,6 @@ pkgbase = sublime-text-3
 	depends = libpng
 	depends = gtk2
 	source = https://download.sublimetext.com/sublime_text_3_build_3211_x64.tar.bz2
-	source = sublime-text-3.sh
-	sha512sums = a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
-	sha512sums = ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9
+	sha256sums = 0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
 
 pkgname = sublime-text-3
diff --git a/sublime-text-3/PKGBUILD b/sublime-text-3/PKGBUILD
index b607d65..2172438 100644
--- a/sublime-text-3/PKGBUILD
+++ b/sublime-text-3/PKGBUILD
@@ -3,29 +3,19 @@
 
 pkgname=sublime-text-3
 pkgver=3.3211
-pkgrel=5
+pkgrel=4
 pkgdesc='Sophisticated text editor for code, html and prose (legacy version)'
 arch=('x86_64')
 url='https://www.sublimetext.com/3'
 license=('custom')
 depends=('libpng' 'gtk2')
 install="${pkgname}.install"
-source=("https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2"
-	"${pkgname}.sh")
-sha512sums=('a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1'
-            'ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9')
-
-prepare() {
-	sed -i -e "s|@ST_PATH@|/opt/sublime_text_3|g" "${pkgname}.sh"
-
-	# Adjust naming in desktop entry
-	sed -i -e 's#Sublime Text#Sublime Text 3#g' 'sublime_text_3/sublime_text.desktop'
-	sed -i -e 's#sublime-text#sublime-text-3#g' 'sublime_text_3/sublime_text.desktop'
-	sed -i -e 's#/opt/sublime_text/sublime_text#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
-	sed -i -e '\#^StartupNotify=#a StartupWMClass=subl3' 'sublime_text_3/sublime_text.desktop'
-}
+source=("https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2")
+sha256sums=('0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee')
 
 package() {
+	cd "${srcdir}"
+
 	# Install sublime text 3
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text_3' "${pkgdir}/opt/sublime_text_3"
@@ -37,10 +27,15 @@ package() {
 		ln -s "/opt/sublime_text_3/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text-3.png"
 	done
 
-	# Install desktop entry and executable
+	# Adjust naming and install desktop entry and executable
+	sed -i 's#Sublime Text#Sublime Text 3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i 's#sublime-text#sublime-text-3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i 's#/opt/sublime_text/sublime_text#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i '\#^StartupNotify=#a StartupWMClass=subl3' 'sublime_text_3/sublime_text.desktop'
+
 	install -dm755 "${pkgdir}/usr/share/applications"
 	install -Dm644 'sublime_text_3/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text_3.desktop"
 
 	install -dm755 "${pkgdir}/usr/bin"
-	install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/subl3"
+	ln -s '/opt/sublime_text_3/sublime_text' "${pkgdir}/usr/bin/subl3"
 }
diff --git a/sublime-text-3/sublime-text-3.sh b/sublime-text-3/sublime-text-3.sh
deleted file mode 100644
index 5d228a4..0000000
--- a/sublime-text-3/sublime-text-3.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @ST_PATH@/sublime_text "$@"
diff --git a/sublime-text-4/.SRCINFO b/sublime-text-4/.SRCINFO
index 1fd492b..ee46166 100644
--- a/sublime-text-4/.SRCINFO
+++ b/sublime-text-4/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sublime-text-4
 	pkgdesc = Sophisticated text editor for code, html and prose - stable build
 	pkgver = 4.4169
-	pkgrel = 2
+	pkgrel = 1
 	url = https://www.sublimetext.com/download
 	arch = x86_64
 	arch = aarch64
@@ -10,11 +10,9 @@ pkgbase = sublime-text-4
 	depends = gtk3
 	provides = sublime-text
 	conflicts = sublime-text
-	source = sublime-text-4.sh
-	sha512sums = ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9
-	source_x86_64 = sublime_text_4_4_4169_2_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_4169_x64.tar.xz
+	source_x86_64 = sublime_text_4_4_4169_1_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_4169_x64.tar.xz
 	sha512sums_x86_64 = 6764363f8f92f65532d64ba014023e28b18f40dc62a1b114239b59360257d445494f9a2f57580174b5f4994c8fa06cd8f562c9419cfda92324c9ebf25d15e576
-	source_aarch64 = sublime_text_4_4_4169_2_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_4169_arm64.tar.xz
+	source_aarch64 = sublime_text_4_4_4169_1_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_4169_arm64.tar.xz
 	sha512sums_aarch64 = e9964f55a5bff89fc0ad13266cc7695c8e0cc41d86caed212836fd737c3b52d84400c683b3f9699b554e71fa2d3ed3cc4351cfebcf9f182512211227465db3d6
 
 pkgname = sublime-text-4
diff --git a/sublime-text-4/PKGBUILD b/sublime-text-4/PKGBUILD
index fe0dc34..4102e4a 100644
--- a/sublime-text-4/PKGBUILD
+++ b/sublime-text-4/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sublime-text-4
 pkgver=4.4169
-pkgrel=2
+pkgrel=1
 pkgdesc='Sophisticated text editor for code, html and prose - stable build'
 arch=('x86_64' 'aarch64')
 url='https://www.sublimetext.com/download'
@@ -11,21 +11,15 @@ depends=('libpng' 'gtk3')
 conflicts=('sublime-text')
 provides=('sublime-text')
 
-source=("${pkgname}.sh")
 source_x86_64=("${pkgname//-/_}_${pkgver/./_}_${pkgrel}_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_${pkgver:2}_x64.tar.xz")
 source_aarch64=("${pkgname//-/_}_${pkgver/./_}_${pkgrel}_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_${pkgver:2}_arm64.tar.xz")
 
-sha512sums=('ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9')
 sha512sums_x86_64=('6764363f8f92f65532d64ba014023e28b18f40dc62a1b114239b59360257d445494f9a2f57580174b5f4994c8fa06cd8f562c9419cfda92324c9ebf25d15e576')
 sha512sums_aarch64=('e9964f55a5bff89fc0ad13266cc7695c8e0cc41d86caed212836fd737c3b52d84400c683b3f9699b554e71fa2d3ed3cc4351cfebcf9f182512211227465db3d6')
 
-prepare() {
-	sed -i -e "s|@ST_PATH@|/opt/sublime_text|g" "${pkgname}.sh"
-	sed -i -e 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
-	sed -i -e '\#^StartupNotify=#a StartupWMClass=subl' 'sublime_text/sublime_text.desktop'
-}
-
 package() {
+	cd "${srcdir}"
+
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
 	rm -f "${pkgdir}/opt/sublime_text/sublime_text.desktop"
@@ -35,9 +29,12 @@ package() {
 		ln -s "/opt/sublime_text/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text.png"
 	done
 
+	sed -i 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
+	sed -i '\#^StartupNotify=#a StartupWMClass=subl' 'sublime_text/sublime_text.desktop'
+
 	install -dm755 "${pkgdir}/usr/share/applications"
 	install -Dm644 'sublime_text/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text.desktop"
 
 	install -dm755 "${pkgdir}/usr/bin"
-	install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/subl"
+	ln -s '/opt/sublime_text/sublime_text' "${pkgdir}/usr/bin/subl"
 }
diff --git a/sublime-text-4/sublime-text-4.sh b/sublime-text-4/sublime-text-4.sh
deleted file mode 100644
index 5d228a4..0000000
--- a/sublime-text-4/sublime-text-4.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @ST_PATH@/sublime_text "$@"
diff --git a/sublime-text-dev/.SRCINFO b/sublime-text-dev/.SRCINFO
index 503b8d6..2d48626 100644
--- a/sublime-text-dev/.SRCINFO
+++ b/sublime-text-dev/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sublime-text-dev
 	pkgdesc = Sophisticated text editor for code, html and prose - dev build
 	pkgver = 4.4173
-	pkgrel = 2
+	pkgrel = 1
 	url = https://www.sublimetext.com/dev
 	install = sublime-text-dev.install
 	arch = x86_64
@@ -11,11 +11,9 @@ pkgbase = sublime-text-dev
 	depends = gtk3
 	provides = sublime-text
 	conflicts = sublime-text
-	source = sublime-text-dev.sh
-	sha512sums = ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9
-	source_x86_64 = sublime_text_dev_4_4173_2_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_4173_x64.tar.xz
+	source_x86_64 = sublime_text_dev_4_4173_1_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_4173_x64.tar.xz
 	sha512sums_x86_64 = 91c1359be4789caf5bfa206ae48736a2dd777559a84f8b282f7a7101a9b8b50fe5e073bdb1496475cdcfe1b9c14707ed9d0fedaa7ef37802085d2e2197c18317
-	source_aarch64 = sublime_text_dev_4_4173_2_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_4173_arm64.tar.xz
+	source_aarch64 = sublime_text_dev_4_4173_1_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_4173_arm64.tar.xz
 	sha512sums_aarch64 = 2d49124aa8493e0e6460e8ea42f89774dde791952f17ada942e99d45703bddd09cfc98d0918a9df411712afe6b957f60d0c879def7eb5fd8f7a860f02388ebda
 
 pkgname = sublime-text-dev
diff --git a/sublime-text-dev/PKGBUILD b/sublime-text-dev/PKGBUILD
index be25333..68d95ef 100644
--- a/sublime-text-dev/PKGBUILD
+++ b/sublime-text-dev/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=sublime-text-dev
 pkgver=4.4173
-pkgrel=2
+pkgrel=1
 pkgdesc='Sophisticated text editor for code, html and prose - dev build'
 arch=('x86_64' 'aarch64')
 url='https://www.sublimetext.com/dev'
@@ -14,21 +14,15 @@ conflicts=('sublime-text')
 provides=('sublime-text')
 install=${pkgname}.install
 
-source=("${pkgname}.sh")
 source_x86_64=("${pkgname//-/_}_${pkgver/./_}_${pkgrel}_x64.tar.xz::https://download.sublimetext.com/sublime_text_build_${pkgver:2}_x64.tar.xz")
 source_aarch64=("${pkgname//-/_}_${pkgver/./_}_${pkgrel}_arm64.tar.xz::https://download.sublimetext.com/sublime_text_build_${pkgver:2}_arm64.tar.xz")
 
-sha512sums=('ac56e9b7dddaebb3d222795cfc644109c93cc3f79695b8f9ee56022c74fe04a1134dd54cab07c74ff1f96b783cb3dbc026c16095552f1d2dd83115ea274dc2e9')
 sha512sums_x86_64=('91c1359be4789caf5bfa206ae48736a2dd777559a84f8b282f7a7101a9b8b50fe5e073bdb1496475cdcfe1b9c14707ed9d0fedaa7ef37802085d2e2197c18317')
 sha512sums_aarch64=('2d49124aa8493e0e6460e8ea42f89774dde791952f17ada942e99d45703bddd09cfc98d0918a9df411712afe6b957f60d0c879def7eb5fd8f7a860f02388ebda')
 
-prepare() {
-	sed -i -e "s|@ST_PATH@|/opt/sublime_text|g" "${pkgname}.sh"
-	sed -i -e 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
-	sed -i -e '\#^StartupNotify=#a StartupWMClass=subl' 'sublime_text/sublime_text.desktop'
-}
-
 package() {
+	cd "${srcdir}"
+
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
 	rm -f "${pkgdir}/opt/sublime_text/sublime_text.desktop"
@@ -38,9 +32,12 @@ package() {
 		ln -s "/opt/sublime_text/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text.png"
 	done
 
+	sed -i 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
+	sed -i '\#^StartupNotify=#a StartupWMClass=subl' 'sublime_text/sublime_text.desktop'
+
 	install -dm755 "${pkgdir}/usr/share/applications"
 	install -Dm644 'sublime_text/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text.desktop"
 
 	install -dm755 "${pkgdir}/usr/bin"
-	install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/subl"
+	ln -s '/opt/sublime_text/sublime_text' "${pkgdir}/usr/bin/subl"
 }
diff --git a/sublime-text-dev/sublime-text-dev.sh b/sublime-text-dev/sublime-text-dev.sh
deleted file mode 100644
index 5d228a4..0000000
--- a/sublime-text-dev/sublime-text-dev.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @ST_PATH@/sublime_text "$@"