diff --git a/sublime-text-3/.SRCINFO b/sublime-text-3/.SRCINFO
index be124a1..9a47d7f 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 - stable build
+	pkgdesc = Sophisticated text editor for code, html and prose (legacy version)
 	pkgver = 3.3211
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.sublimetext.com/3
 	install = sublime-text-3.install
 	arch = x86_64
diff --git a/sublime-text-3/PKGBUILD b/sublime-text-3/PKGBUILD
index cede3fd..60c2fb7 100644
--- a/sublime-text-3/PKGBUILD
+++ b/sublime-text-3/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=sublime-text-3
 pkgver=3.3211
-pkgrel=2
-pkgdesc="Sophisticated text editor for code, html and prose - stable build"
+pkgrel=3
+pkgdesc='Sophisticated text editor for code, html and prose (legacy version)'
 arch=('x86_64')
 url='https://www.sublimetext.com/3'
 license=('custom')
@@ -17,13 +17,14 @@ package() {
 	cd "${srcdir}"
 
 	# Adjust naming
-	sed -i 's#/opt/sublime_text/sublime_text#/opt/sublime_text_3/sublime_text#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#sublime-text#sublime-text-3#g' "sublime_text_3/sublime_text.desktop"
+	sed -i 's#/opt/sublime_text/sublime_text#/opt/sublime_text_3/sublime_text#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#sublime-text#sublime-text-3#g' 'sublime_text_3/sublime_text.desktop'
 
 	# Install sublime text 3
 	install -dm755 "${pkgdir}/opt"
-	cp --preserve=mode -r "sublime_text_3" "${pkgdir}/opt/sublime_text_3"
+	cp --preserve=mode -r 'sublime_text_3' "${pkgdir}/opt/sublime_text_3"
+	rm -f "${pkgdir}/opt/sublime_text_3/sublime_text.desktop"
 
 	# Install icons
 	for res in 128x128 16x16 256x256 32x32 48x48; do
@@ -32,11 +33,12 @@ package() {
 	done
 
 	# Install desktop entry and executable
-	sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' "sublime_text_3/sublime_text.desktop"
+	sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' 'sublime_text_3/sublime_text.desktop'
+	sed -i '\#^Icon=sublime-text-3#a StartupWMClass=sublime-text-3' '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 -Dm644 'sublime_text_3/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text_3.desktop"
 
 	install -dm755 "${pkgdir}/usr/bin"
-	ln -s "/opt/sublime_text_3/sublime_text" "${pkgdir}/usr/bin/subl3"
+	ln -s '/opt/sublime_text_3/sublime_text' "${pkgdir}/usr/bin/subl3"
 }
diff --git a/sublime-text-4/.SRCINFO b/sublime-text-4/.SRCINFO
index dad6b7d..68eb70a 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.4143
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.sublimetext.com/download
 	arch = x86_64
 	arch = aarch64
diff --git a/sublime-text-4/PKGBUILD b/sublime-text-4/PKGBUILD
index 2533319..975bd66 100644
--- a/sublime-text-4/PKGBUILD
+++ b/sublime-text-4/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sublime-text-4
 pkgver=4.4143
-pkgrel=2
+pkgrel=3
 pkgdesc='Sophisticated text editor for code, html and prose - stable build'
 arch=('x86_64' 'aarch64')
 url='https://www.sublimetext.com/download'
@@ -22,6 +22,7 @@ package() {
 
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
+	rm -f "${pkgdir}/opt/sublime_text/sublime_text.desktop"
 
 	for res in 128x128 16x16 256x256 32x32 48x48; do
 		install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
@@ -29,6 +30,7 @@ package() {
 	done
 
 	sed -i 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
+	sed -i '\#^Icon=sublime-text#a StartupWMClass=sublime-text' '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"
diff --git a/sublime-text-dev/.SRCINFO b/sublime-text-dev/.SRCINFO
index 14ff8a3..e3a2d43 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.4141
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.sublimetext.com/dev
 	install = sublime-text-dev.install
 	arch = x86_64
diff --git a/sublime-text-dev/PKGBUILD b/sublime-text-dev/PKGBUILD
index a7bd0e2..9c59aa6 100644
--- a/sublime-text-dev/PKGBUILD
+++ b/sublime-text-dev/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=sublime-text-dev
 pkgver=4.4141
-pkgrel=2
+pkgrel=3
 pkgdesc='Sophisticated text editor for code, html and prose - dev build'
 arch=('x86_64' 'aarch64')
 url='https://www.sublimetext.com/dev'
@@ -25,6 +25,7 @@ package() {
 
 	install -dm755 "${pkgdir}/opt"
 	cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
+	rm -f "${pkgdir}/opt/sublime_text/sublime_text.desktop"
 
 	for res in 128x128 16x16 256x256 32x32 48x48; do
 		install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
@@ -32,6 +33,7 @@ package() {
 	done
 
 	sed -i 's#/opt/sublime_text/sublime_text#/usr/bin/subl#g' 'sublime_text/sublime_text.desktop'
+	sed -i '\#^Icon=sublime-text#a StartupWMClass=sublime-text' '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"