diff --git a/helpers/make-base-files b/helpers/make-base-files
index b9e66339651314de691969ca8c0163adf4b8b8e3..69eb70df78ee68828e6efcf75efcb442976c6eb7 100644
--- a/helpers/make-base-files
+++ b/helpers/make-base-files
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2008-2016 Rubén RodrÃguez <ruben@trisquel.info>
+# Copyright (C) 2008-2020 Rubén RodrÃguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,12 +17,16 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
. ./config
CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g")
+# Disable dynamic motd
+find -name *motd-news* -delete
+sed '/motd-news/d' -i debian/rules
+
cat << EOF > update-motd.d/01-banner
#!/bin/sh
echo "\
diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer
index e14709eb652c764d693cf17c55d1df32b7d95ab5..336b79061a2b06b769be497812bcb80de4c01512 100644
--- a/helpers/make-debian-installer
+++ b/helpers/make-debian-installer
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=6
+VERSION=7
NETINST=true
. ./config
diff --git a/helpers/make-handbrake b/helpers/make-handbrake
index 04762c732e86177e7a0670074061e281e147e5ea..0a82d47ef103d6391d9fa18ba41db7a181a2d745 100644
--- a/helpers/make-handbrake
+++ b/helpers/make-handbrake
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu bionic main"
REPOKEY="8771ADB0816950D8"
BACKPORT=true
diff --git a/helpers/make-khronos-api b/helpers/make-khronos-api
new file mode 100644
index 0000000000000000000000000000000000000000..bbfa2338f7a5041ce559299094cb4df3a30301b2
--- /dev/null
+++ b/helpers/make-khronos-api
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Luis Guzman <ark@switnet.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
+REPOKEY=04EE7237B7D453EC
+BACKPORT=true
+
+. ./config
+
+changelog "Backported from debian old stable backports"
+
+compile
diff --git a/helpers/make-kubuntu-settings b/helpers/make-kubuntu-settings
index ade24cea08937c6643f54b04ac9deb3eb1e108c1..86c86724c321d8d6dac1cf19526fd8cf08f2ab16 100644
--- a/helpers/make-kubuntu-settings
+++ b/helpers/make-kubuntu-settings
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=4
COMPONENT=main
. ./config
@@ -96,6 +96,59 @@ Engine=none
Theme=none
EOF
+cat << EOF1 > debian/triskel-settings-desktop.preinst
+#!/bin/sh
+
+[ -d /etc/gtk-3.0 ] || mkdir /etc/gtk-3.0 && chmod 755 /etc/gtk-3.0
+[ -d /etc/gtk-2.0 ] || mkdir /etc/gtk-2.0 && chmod 755 /etc/gtk-2.0
+
+item="/etc/gtk-3.0/settings.ini"
+
+grep -qi Breeze \$item && exit 0 || true
+[ -f "\$item"".ubuntu" ] && exit 0 || true
+
+dpkg-divert --package trisquel-desktop-common-data --add --rename --divert "\$item"".ubuntu" "\$item"
+
+cat << EOF > \$item
+[Settings]
+gtk-theme-name = Breeze
+gtk-icon-theme-name = Breeze
+gtk-fallback-icon-theme = Trisquel
+gtk-sound-theme-name = Trisquel
+gtk-font-name=Sans Serif Regular 10
+gtk-menu-images=1
+gtk-button-images=1
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-icon-sizes = panel-menu-bar=24,24
+EOF
+
+item="/etc/gtk-2.0/gtkrc"
+
+grep -qi Breeze \$item && exit 0 || true
+
+dpkg-divert --package trisquel-desktop-common-data --add --rename --divert "\$item"".ubuntu" "\$item"
+
+cat << EOF > \$item
+include "/usr/share/themes/Breeze/gtk-2.0/gtkrc"
+style "user-font"
+{
+ font_name="Sans Serif Regular"
+}
+widget_class "*" style "user-font"
+gtk-font-name="Sans Serif Regular 10"
+gtk-theme-name="Breeze"
+gtk-icon-theme-name="breeze"
+gtk-fallback-icon-theme="trisquel"
+gtk-cursor-theme-name="Breeze_Snow"
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-menu-images=1
+gtk-button-images=1
+gtk-primary-button-warps-slider=0
+EOF
+
+EOF1
+chmod 755 debian/triskel-settings-desktop.preinst
+
sed '1s/triskel/kubuntu/' -i debian/control
cp $DATA/start.svgz desktop/theme/desktoptheme/triskel/icons/start.svgz
diff --git a/helpers/make-libva b/helpers/make-libva
new file mode 100644
index 0000000000000000000000000000000000000000..2b3b34f9a79148f5d214231648632d6b027c63d5
--- /dev/null
+++ b/helpers/make-libva
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed '/nouveau/d' -i va/drm/va_drm_utils.c
+
+changelog "Disabled nouveau support"
+
+compile
diff --git a/helpers/make-linux-meta-hwe b/helpers/make-linux-meta-hwe
new file mode 100644
index 0000000000000000000000000000000000000000..ecabcc9b1954c0740702a67c1ac1f8e93e738cbd
--- /dev/null
+++ b/helpers/make-linux-meta-hwe
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright (C) 2017-2018 Ruben Rodriguez <ruben@trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=5
+. ./config
+
+rm ./debian/control.d/signed-generic
+
+sed 's/18.04/9.0/g; s/16.04 to 16.10/8.0/; s/16.04/8.0/; s/Xenial/Flidas/; s/Bionic/Etiona/' -i debian/control
+sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d/generic debian/control.d/lowlatency
+sed 's/Ubuntu/upstream/' -i debian/control
+sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic debian/control.d/lowlatency
+sed '/signed/,/^$/ d' -i debian/control
+sed 's/, intel-microcode \[amd64 i386\]//; s/, amd64-microcode \[amd64 i386\]//;' debian/control debian/control.d/generic debian/control.d/lowlatency -i
+find debian/control.d/ -type f | grep -v -e '/generic$' -e '/lowlatency$' -e '/virtual$' |xargs rm
+
+
+changelog "Removed linux-firmware dependency, renamed release for Trisquel"
+
+compile
diff --git a/helpers/make-lmms b/helpers/make-lmms
index de0dd7f13512855fc778945ee9f5d7e2a3e5df33..72f9cb36d5c98a43276aef620920d545da55cc3c 100644
--- a/helpers/make-lmms
+++ b/helpers/make-lmms
@@ -21,6 +21,7 @@ VERSION=1
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe'
REPOKEY="3B4FE6ACC0B21F32"
BACKPORTS=true
+DEPENDS=wine
. ./config
diff --git a/helpers/make-unicode-data b/helpers/make-unicode-data
new file mode 100644
index 0000000000000000000000000000000000000000..bbfa2338f7a5041ce559299094cb4df3a30301b2
--- /dev/null
+++ b/helpers/make-unicode-data
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Luis Guzman <ark@switnet.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
+REPOKEY=04EE7237B7D453EC
+BACKPORT=true
+
+. ./config
+
+changelog "Backported from debian old stable backports"
+
+compile
diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index 5141c7ff558dd040d6509c6759b73a742d39efba..4798e31c8a43691c22738bc09c910571eba405ae 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
#
# This program is free software; you can redistribute it and/or modify
@@ -18,13 +18,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=9
+VERSION=10
. ./config
rm UpdateManager/Core/LivePatchSocket.py
rm tests/test_livepatch_socket.py
-patch -p1 < $DATA/remove-livepatch.patch
+patch --no-backup-if-mismatch -p1 < $DATA/remove-livepatch.patch
sed -i '/import LivePatchSocket/d' UpdateManager/Dialogs.py
sed -i '/self.check_livepatch_status/d' UpdateManager/Dialogs.py
@@ -49,10 +49,10 @@ EOF
replace internet Internet .
replace Ubuntu Trisquel .
+replace TrisquelDistroInfo UbuntuDistroInfo .
replace "Trisquel-Gettext" "Ubuntu-Gettext" .
sed -i 's/Trisquel 16.04 LTS to Trisquel 18.04 LTS/Trisquel 8.0 LTS to Trisquel 9.0 LTS/' HweSupportStatus/consts.py
-sed -i 's/TrisquelDistroInfo/UbuntuDistroInfo/' UpdateManager/UpdateManager.py
replace ubuntu-desktop trisquel .
replace kubuntu-desktop triskel .
diff --git a/helpers/make-wine b/helpers/make-wine
new file mode 100644
index 0000000000000000000000000000000000000000..33971c38b4e39ff9aaf2f6589250d0c49c8e6ba6
--- /dev/null
+++ b/helpers/make-wine
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Luis Guzman <ark@switnet.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
+REPOKEY=04EE7237B7D453EC
+BACKPORT=true
+DEPENDS=khronos-api,unicode-data
+
+. ./config
+
+changelog "Backported from debian old stable backports"
+
+compile
diff --git a/helpers/make-x11-utils b/helpers/make-x11-utils
new file mode 100644
index 0000000000000000000000000000000000000000..7f17a62b07204c2f1f8c1b8c8dcb2e4ce002e44f
--- /dev/null
+++ b/helpers/make-x11-utils
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe'
+REPOKEY="3B4FE6ACC0B21F32"
+
+. ./config
+
+changelog "Backported from focal, fixes broken xdriinfo in bionic"
+
+compile
+