diff --git a/helpers/make-indicator-datetime b/helpers/make-indicator-datetime
new file mode 100644
index 0000000000000000000000000000000000000000..67079fd1d7c9744855e47498ce5a8a1957f5b3d5
--- /dev/null
+++ b/helpers/make-indicator-datetime
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Copyright (C) 2019 Mason Hock <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
+
+cat << EOF > data/indicator-datetime.desktop.in
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@pkglibexecdir@/indicator-datetime-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Icon=@messaging_menu_icon@
+EOF
+
+cat << EOF >> data/CMakeLists.txt
+
+##
+## XDG Autostart File
+##
+
+# where to install
+set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
+message (STATUS "\${XDG_AUTOSTART_DIR} is the DBus Service File install dir")
+
+set (XDG_AUTOSTART_NAME "\${CMAKE_PROJECT_NAME}.desktop")
+set (XDG_AUTOSTART_FILE "\${CMAKE_CURRENT_BINARY_DIR}/\${XDG_AUTOSTART_NAME}")
+set (XDG_AUTOSTART_FILE_IN "\${CMAKE_CURRENT_SOURCE_DIR}/\${XDG_AUTOSTART_NAME}.in")
+
+# build it
+set (pkglibexecdir "\${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("\${XDG_AUTOSTART_FILE_IN}" "\${XDG_AUTOSTART_FILE}")
+
+# install XDG autostart
+install (FILES "\${XDG_AUTOSTART_FILE}"
+ DESTINATION "\${XDG_AUTOSTART_DIR}")
+EOF
+
+# this shouldn't be needed for Ubuntu 20.04
+sed '/UNITY8,/a\ MATE,' -i include/datetime/actions-live.h
+patch -p0 < $DATA/launch-time-admin-in-mate.patch
+
+changelog "Add MATE compatibility"
+
+compile
diff --git a/helpers/make-mate-panel b/helpers/make-mate-panel
index dcbf22a61f7b02c7c86a03fd888bb001384db4da..9f871dcfb3480f48367943617d24f19d03a83dce 100644
--- a/helpers/make-mate-panel
+++ b/helpers/make-mate-panel
@@ -1,6 +1,7 @@
#!/bin/sh
#
# Copyright (C) 2016-2017 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2017 Mason Hock <mason@masonhock.com>
#
# 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,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=5
+VERSION=6
. ./config
@@ -26,23 +27,24 @@ sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-ar
# Custom layout
cat << EOF > data/panel-default-layout.layout
-[Toplevel bottom]
-expand=true
+[Toplevel top]
orientation=bottom
-size=42
+expand=true
+size=44
-[Object mate-menu]
+[Object menu]
locked=true
position=0
-toplevel-id=bottom
+panel-right-stick=false
+toplevel-id=top
object-type=menu
-
[Object files]
locked=true
position=20
-launcher-location=/usr/share/applications/caja-home.desktop
-toplevel-id=bottom
+launcher-location=caja.desktop
+panel-right-stick=false
+toplevel-id=top
object-type=launcher
menu-path=applications:/
@@ -50,49 +52,34 @@ menu-path=applications:/
locked=true
position=30
launcher-location=/usr/share/applications/browser.desktop
-toplevel-id=bottom
+panel-right-stick=false
+toplevel-id=top
object-type=launcher
menu-path=applications:/
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=40
+[Object windowlistapplet]
locked=true
-
-[Object notification-area]
+position=40
+panel-right-stick=false
+toplevel-id=top
+applet-iid=WnckletFactory::WindowListApplet
object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=bottom
-position=30
-panel-right-stick=true
-locked=true
[Object indicatorappletcomplete]
-object-type=applet
-applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
-toplevel-id=bottom
+locked=true
position=20
panel-right-stick=true
-locked=true
-
-[Object clock]
+toplevel-id=top
+applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true
[Object showdesktopapplet]
locked=true
position=0
panel-right-stick=true
-toplevel-id=bottom
+toplevel-id=top
applet-iid=WnckletFactory::ShowDesktopApplet
object-type=applet
-
EOF
cp data/panel-default-layout.layout data/ubuntu.layout
diff --git a/helpers/make-mate-tweak b/helpers/make-mate-tweak
new file mode 100644
index 0000000000000000000000000000000000000000..828de02ad958a51ca69e3ad575e9bb41957c4d89
--- /dev/null
+++ b/helpers/make-mate-tweak
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
+#
+# 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 -i 's/manjaro/trisquel/g' mate-tweak
+sed -i 's/Manjaro/Trisquel/g' mate-tweak
+
+changelog "Add Trisquel as panel layout option"
+
+compile
+
diff --git a/helpers/make-xul-ext-eds-calendar b/helpers/make-xul-ext-eds-calendar
new file mode 100644
index 0000000000000000000000000000000000000000..95a01d8e3ec06a5e875520afa17daf643f7355d8
--- /dev/null
+++ b/helpers/make-xul-ext-eds-calendar
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
+#
+# 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://ppa.launchpad.net/mate-ob/eds-calendar/ubuntu bionic main '
+REPOKEY=E99FABBCCA21C62C
+
+. ./config
+
+changelog "Imported from PPA"
+
+compile