diff --git a/firefox-syncstorage/.SRCINFO b/firefox-syncstorage/.SRCINFO
index a2814d4..aa7be2c 100644
--- a/firefox-syncstorage/.SRCINFO
+++ b/firefox-syncstorage/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-syncstorage
 	pkgdesc = Sync storage server with built-in token server for running a self-hosted firefox sync server
-	pkgver = 0.13.0
+	pkgver = 0.12.5
 	pkgrel = 1
 	url = https://github.com/mozilla-services/syncstorage-rs
 	install = firefox-syncstorage.install
@@ -20,9 +20,9 @@ pkgbase = firefox-syncstorage
 	depends = python-tokenlib
 	optdepends = mysql: for use with a local database server
 	backup = etc/firefox-syncstorage.toml
-	source = https://github.com/mozilla-services/syncstorage-rs/archive/0.13.0.tar.gz
+	source = https://github.com/mozilla-services/syncstorage-rs/archive/0.12.5.tar.gz
 	source = firefox-syncstorage.service
-	sha256sums = 62c9922f3fc8067da511780fbdd7e41a55d18ec0790827ec253a17fcc60022a7
+	sha256sums = e9904c3571789f5ba29645a69def5f7550ebd544d51c3af5a4b5a2c1b1b72135
 	sha256sums = 609e057cd835ea54b06b32b98e210cd946255f652e7754c9160fd7c94379a83d
 
 pkgname = firefox-syncstorage
diff --git a/firefox-syncstorage/PKGBUILD b/firefox-syncstorage/PKGBUILD
index d2d68c0..28f7d08 100644
--- a/firefox-syncstorage/PKGBUILD
+++ b/firefox-syncstorage/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-syncstorage
 _pkgname=syncstorage-rs
-pkgver=0.13.0
+pkgver=0.12.5
 pkgrel=1
 pkgdesc='Sync storage server with built-in token server for running a self-hosted firefox sync server'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -17,7 +17,7 @@ optdepends=('mysql: for use with a local database server')
 install="${pkgname}.install"
 source=("https://github.com/mozilla-services/${_pkgname}/archive/${pkgver}.tar.gz"
 	"${pkgname}.service")
-sha256sums=('62c9922f3fc8067da511780fbdd7e41a55d18ec0790827ec253a17fcc60022a7'
+sha256sums=('e9904c3571789f5ba29645a69def5f7550ebd544d51c3af5a4b5a2c1b1b72135'
             '609e057cd835ea54b06b32b98e210cd946255f652e7754c9160fd7c94379a83d')
 backup=("etc/${pkgname}.toml")
 
@@ -30,7 +30,7 @@ package() {
 	cd "${_pkgname}-${pkgver}"
 
 	# Installing manually
-	install -Dm 755 target/release/syncserver "${pkgdir}"/usr/bin/"${pkgname}"
+	install -Dm 755 target/release/syncstorage "${pkgdir}"/usr/bin/"${pkgname}"
 	install -Dm 644 config/local.example.toml "${pkgdir}"/etc/"${pkgname}".toml
 	install -Dm 644 "${srcdir}/${pkgname}".service "${pkgdir}"/usr/lib/systemd/system/"${pkgname}".service
 }
diff --git a/sublime-text-3/.SRCINFO b/sublime-text-3/.SRCINFO
deleted file mode 100644
index be124a1..0000000
--- a/sublime-text-3/.SRCINFO
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgbase = sublime-text-3
-	pkgdesc = Sophisticated text editor for code, html and prose - stable build
-	pkgver = 3.3211
-	pkgrel = 2
-	url = https://www.sublimetext.com/3
-	install = sublime-text-3.install
-	arch = x86_64
-	license = custom
-	depends = libpng
-	depends = gtk2
-	source = https://download.sublimetext.com/sublime_text_3_build_3211_x64.tar.bz2
-	sha256sums = 0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-
-pkgname = sublime-text-3
diff --git a/sublime-text-3/PKGBUILD b/sublime-text-3/PKGBUILD
deleted file mode 100644
index 28dad93..0000000
--- a/sublime-text-3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Manuel Hüsers <aur@huesers.de>
-# Contributor: marcospb19 <marcospb19@hotmail.com>
-
-pkgname=sublime-text-3
-pkgver=3.3211
-pkgrel=2
-pkgdesc="Sophisticated text editor for code, html and prose - stable build"
-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")
-sha256sums=('0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee')
-
-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"
-
-    # Install sublime text 3
-    install -dm755 "${pkgdir}/opt"
-    cp --preserve=mode -r "sublime_text_3" "${pkgdir}/opt/sublime_text_3"
-
-    # Install icons
-    for res in 128x128 16x16 256x256 32x32 48x48; do
-        install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
-        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
-    sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' "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"
-    ln -s "/opt/sublime_text_3/sublime_text" "${pkgdir}/usr/bin/subl3"
-}
diff --git a/sublime-text-3/sublime-text-3.install b/sublime-text-3/sublime-text-3.install
deleted file mode 100644
index 83f0138..0000000
--- a/sublime-text-3/sublime-text-3.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  cat << _EOF
-
-  ==> sublime-text-3 install note:
-  ------------------------------------------------------------------------------
-    Since this is the last version of Sublime Text 3, you might want to disable
-    in-application reminders about new Sublime Text versions (reportedly only
-    works as a licensed user).
-
-    Add the following setting to your User Preferences file:
-    "update_check": false
-
-_EOF
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/sublime-text-4/.SRCINFO b/sublime-text-4/.SRCINFO
index dad6b7d..1d04289 100644
--- a/sublime-text-4/.SRCINFO
+++ b/sublime-text-4/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = sublime-text-4
 	pkgdesc = Sophisticated text editor for code, html and prose - stable build
 	pkgver = 4.4143
-	pkgrel = 2
+	pkgrel = 1
 	url = https://www.sublimetext.com/download
 	arch = x86_64
 	arch = aarch64
 	license = custom
 	depends = libpng
 	depends = gtk3
+	optdepends = gksu: sudo-save support
 	provides = sublime-text
 	conflicts = sublime-text
+	source = sublime_text.desktop
+	sha256sums = e991aac5207655dadf69c6f74c194c80009fb9767d7710337f586908969aa9cf
 	source_x86_64 = https://download.sublimetext.com/sublime_text_build_4143_x64.tar.xz
 	sha256sums_x86_64 = 7de862c38d19367414117110328dded754ac709fed54c8cc5cb0737c894c073c
 	source_aarch64 = https://download.sublimetext.com/sublime_text_build_4143_arm64.tar.xz
diff --git a/sublime-text-4/PKGBUILD b/sublime-text-4/PKGBUILD
index 1f76103..68df7ae 100644
--- a/sublime-text-4/PKGBUILD
+++ b/sublime-text-4/PKGBUILD
@@ -2,18 +2,21 @@
 
 pkgname=sublime-text-4
 pkgver=4.4143
-pkgrel=2
-pkgdesc='Sophisticated text editor for code, html and prose - stable build'
+pkgrel=1
+pkgdesc="Sophisticated text editor for code, html and prose - stable build"
 arch=('x86_64' 'aarch64')
-url='https://www.sublimetext.com/download'
+url="https://www.sublimetext.com/download"
 license=('custom')
 depends=('libpng' 'gtk3')
+optdepends=('gksu: sudo-save support')
 conflicts=('sublime-text')
 provides=('sublime-text')
 
+source=('sublime_text.desktop')
 source_x86_64=("https://download.sublimetext.com/sublime_text_build_${pkgver:2}_x64.tar.xz")
 source_aarch64=("https://download.sublimetext.com/sublime_text_build_${pkgver:2}_arm64.tar.xz")
 
+sha256sums=('e991aac5207655dadf69c6f74c194c80009fb9767d7710337f586908969aa9cf')
 sha256sums_x86_64=('7de862c38d19367414117110328dded754ac709fed54c8cc5cb0737c894c073c')
 sha256sums_aarch64=('e33a4d1d51073bdf2f1dc5936ea9b096b078f87230a10a23790beaee702a4a93')
 
@@ -21,18 +24,16 @@ package() {
   cd "${srcdir}"
 
   install -dm755 "${pkgdir}/opt"
-  cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
+  cp --preserve=mode -r "sublime_text" "${pkgdir}/opt/sublime_text"
 
   for res in 128x128 16x16 256x256 32x32 48x48; do
     install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
     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'
-
   install -dm755 "${pkgdir}/usr/share/applications"
-  install -Dm644 'sublime_text/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text.desktop"
+  install -Dm644 "sublime_text.desktop" "${pkgdir}/usr/share/applications/sublime_text.desktop"
 
   install -dm755 "${pkgdir}/usr/bin"
-  ln -s '/opt/sublime_text/sublime_text' "${pkgdir}/usr/bin/subl"
+  ln -s "/opt/sublime_text/sublime_text" "${pkgdir}/usr/bin/subl"
 }
diff --git a/sublime-text-4/sublime_text.desktop b/sublime-text-4/sublime_text.desktop
new file mode 100644
index 0000000..f678850
--- /dev/null
+++ b/sublime-text-4/sublime_text.desktop
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Sublime Text
+GenericName=Text Editor
+Comment=Sophisticated text editor for code, markup and prose
+Exec=subl %F
+Terminal=false
+MimeType=text/plain;
+Icon=sublime-text
+Categories=TextEditor;Development;
+StartupNotify=true
+StartupWMClass=subl
+Actions=Window;Document;
+
+[Desktop Action Window]
+Name=New Window
+Exec=subl -n
+OnlyShowIn=Unity;
+
+[Desktop Action Document]
+Name=New File
+Exec=subl --command new_file
+OnlyShowIn=Unity;
diff --git a/sublime-text-dev/.SRCINFO b/sublime-text-dev/.SRCINFO
index 14ff8a3..9c11952 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 = 1
 	url = https://www.sublimetext.com/dev
 	install = sublime-text-dev.install
 	arch = x86_64
@@ -9,8 +9,11 @@ pkgbase = sublime-text-dev
 	license = custom
 	depends = libpng
 	depends = gtk3
+	optdepends = gksu: sudo-save support
 	provides = sublime-text
 	conflicts = sublime-text
+	source = sublime_text.desktop
+	sha256sums = e991aac5207655dadf69c6f74c194c80009fb9767d7710337f586908969aa9cf
 	source_x86_64 = https://download.sublimetext.com/sublime_text_build_4141_x64.tar.xz
 	sha256sums_x86_64 = 785a3dbf8852ae9d60579e9a755c8507db0e02939794a36f5415b4c1b1581b88
 	source_aarch64 = https://download.sublimetext.com/sublime_text_build_4141_arm64.tar.xz
diff --git a/sublime-text-dev/PKGBUILD b/sublime-text-dev/PKGBUILD
index 7e38d31..8c645a7 100644
--- a/sublime-text-dev/PKGBUILD
+++ b/sublime-text-dev/PKGBUILD
@@ -4,19 +4,22 @@
 
 pkgname=sublime-text-dev
 pkgver=4.4141
-pkgrel=2
-pkgdesc='Sophisticated text editor for code, html and prose - dev build'
+pkgrel=1
+pkgdesc="Sophisticated text editor for code, html and prose - dev build"
 arch=('x86_64' 'aarch64')
-url='https://www.sublimetext.com/dev'
+url="https://www.sublimetext.com/dev"
 license=('custom')
 depends=('libpng' 'gtk3')
+optdepends=('gksu: sudo-save support')
 conflicts=('sublime-text')
 provides=('sublime-text')
 install=${pkgname}.install
 
+source=('sublime_text.desktop')
 source_x86_64=("https://download.sublimetext.com/sublime_text_build_${pkgver:2}_x64.tar.xz")
 source_aarch64=("https://download.sublimetext.com/sublime_text_build_${pkgver:2}_arm64.tar.xz")
 
+sha256sums=('e991aac5207655dadf69c6f74c194c80009fb9767d7710337f586908969aa9cf')
 sha256sums_x86_64=('785a3dbf8852ae9d60579e9a755c8507db0e02939794a36f5415b4c1b1581b88')
 sha256sums_aarch64=('326c12a6dbd21f9d3bf97f464fc182e2dcd917311f4f6a4a73efd0bb949b3243')
 
@@ -24,18 +27,16 @@ package() {
   cd "${srcdir}"
 
   install -dm755 "${pkgdir}/opt"
-  cp --preserve=mode -r 'sublime_text' "${pkgdir}/opt/sublime_text"
+  cp --preserve=mode -r "sublime_text" "${pkgdir}/opt/sublime_text"
 
   for res in 128x128 16x16 256x256 32x32 48x48; do
     install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
     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'
-
   install -dm755 "${pkgdir}/usr/share/applications"
-  install -Dm644 'sublime_text/sublime_text.desktop' "${pkgdir}/usr/share/applications/sublime_text.desktop"
+  install -Dm644 "sublime_text.desktop" "${pkgdir}/usr/share/applications/sublime_text.desktop"
 
   install -dm755 "${pkgdir}/usr/bin"
-  ln -s '/opt/sublime_text/sublime_text' "${pkgdir}/usr/bin/subl"
+  ln -s "/opt/sublime_text/sublime_text" "${pkgdir}/usr/bin/subl"
 }
diff --git a/sublime-text-dev/sublime_text.desktop b/sublime-text-dev/sublime_text.desktop
new file mode 100644
index 0000000..f678850
--- /dev/null
+++ b/sublime-text-dev/sublime_text.desktop
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Sublime Text
+GenericName=Text Editor
+Comment=Sophisticated text editor for code, markup and prose
+Exec=subl %F
+Terminal=false
+MimeType=text/plain;
+Icon=sublime-text
+Categories=TextEditor;Development;
+StartupNotify=true
+StartupWMClass=subl
+Actions=Window;Document;
+
+[Desktop Action Window]
+Name=New Window
+Exec=subl -n
+OnlyShowIn=Unity;
+
+[Desktop Action Document]
+Name=New File
+Exec=subl --command new_file
+OnlyShowIn=Unity;