diff --git a/helpers/DATA/compiz/config.patch b/helpers/DATA/compiz/config.patch
new file mode 100644
index 0000000..bdfd621
--- /dev/null
+++ b/helpers/DATA/compiz/config.patch
@@ -0,0 +1,265 @@
+=== modified file 'metadata/core.xml.in'
+Index: compiz-0.9.7.4/metadata/core.xml.in
+===================================================================
+--- compiz-0.9.7.4.orig/metadata/core.xml.in 2012-03-30 11:57:16.000000000 +0200
++++ compiz-0.9.7.4/metadata/core.xml.in 2012-04-05 12:43:06.231451763 +0200
+@@ -138,7 +138,7 @@
+
+
+
+@@ -173,7 +173,7 @@
+
+
+
+
+
+
+
+Index: compiz-0.9.7.4/plugins/fade/fade.xml.in
+===================================================================
+--- compiz-0.9.7.4.orig/plugins/fade/fade.xml.in 2012-03-30 11:57:16.000000000 +0200
++++ compiz-0.9.7.4/plugins/fade/fade.xml.in 2012-04-05 12:43:06.247451838 +0200
+@@ -9,6 +9,7 @@
+
+
+ decor
++ staticswitcher
+
+
+ cube
+@@ -49,7 +50,7 @@
+
+
+
+Index: compiz-0.9.7.4/plugins/decor/decor.xml.in
+===================================================================
+--- compiz-0.9.7.4.orig/plugins/decor/decor.xml.in 2012-03-30 11:57:16.000000000 +0200
++++ compiz-0.9.7.4/plugins/decor/decor.xml.in 2012-04-05 12:43:06.247451838 +0200
+@@ -30,7 +30,7 @@
+
+
+
+
diff --git a/helpers/make-casper b/helpers/make-casper
new file mode 100644
index 0000000..8a1f3aa
--- /dev/null
+++ b/helpers/make-casper
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 Rubén Rodríguez
+#
+# 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 '/v3/ s/$/\npgrep orca || exit/' ubiquity-hooks/30accessibility -i
+
+changelog "Compiled for Trisquel"
+
+compile
+
diff --git a/helpers/make-compiz b/helpers/make-compiz
new file mode 100644
index 0000000..0171e22
--- /dev/null
+++ b/helpers/make-compiz
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 Rubén Rodríguez
+#
+# 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=2
+
+. ./config
+
+cp $DATA/config.patch debian/patches/config.patch
+sed 's/ubuntu-config/config/' -i debian/patches/series
+
+changelog "Removed Ubuntu customizations for Unity"
+
+compile
+
diff --git a/helpers/make-deja-dup b/helpers/make-deja-dup
index 64c1d2c..6c63b89 100644
--- a/helpers/make-deja-dup
+++ b/helpers/make-deja-dup
@@ -23,7 +23,7 @@ COMPONENT=main
. ./config
sed -i "s:'auto':'file':" data/org.gnome.DejaDup.gschema.xml.in
-sed -i 's/Categories.*/Categories=Application;System;Settings/g' data/deja-dup*desktop*
+sed -i 's/Categories.*/Categories=Application;System;Settings;/g' data/deja-dup*desktop*
changelog "Compiled for Trisquel"
diff --git a/helpers/make-firefox b/helpers/make-firefox
index b182dc8..68395d4 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -17,13 +17,14 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
-QUILT=skip
+VERSION=2
. ./config
+rm debian/control
+
# Make ubufox mandatory
-sed 's/Depends: lsb-release,/Depends: lsb-release, xul-ext-ubufox,/' -i debian/control debian/control.in
+sed 's/Depends: lsb-release,/Depends: lsb-release, xul-ext-ubufox,/' -i debian/control.in
sed 's/iceweasel,/iceweasel, firefox, icecat,/' -i debian/control*
# Remove extra firefox metapackages
@@ -59,7 +60,9 @@ sed "s/\(^MOZ_BUILD_UNOFFICIAL.*\)0/\1 1/; s/release$/$CODENAME/" -i debian/rule
#TARBALL=$(ls *.tar.bz2)
#tar -jxf $TARBALL
#rm $TARBALL
-sed "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= abrowser/; s/firefox/abrowser/" debian/rules -i
+#sed "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= abrowser/; s/firefox/abrowser/" debian/rules -i
+sed '1s/^/\nMOZ_APP_NAME\t\t:= abrowser/' -i debian/build/mozbuild.mk
+sed '1s/^/\nMOZ_PKG_NAME\t\t:= abrowser/' -i debian/build/mozbuild.mk
# Hack to avoid compilation to fail on 3.0x kernel
#cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
@@ -293,7 +296,6 @@ done
fi
exit 0 ' >> debian/abrowser.postinst.in
-rm debian/control
debian/rules debian/control
changelog "Rebranded for Trisquel"
diff --git a/helpers/make-gfxboot-theme-ubuntu b/helpers/make-gfxboot-theme-ubuntu
index 20405a0..f1ee3da 100644
--- a/helpers/make-gfxboot-theme-ubuntu
+++ b/helpers/make-gfxboot-theme-ubuntu
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
. ./config
@@ -55,7 +55,47 @@ replace "Enterprise Cloud" "Gamer" .
replace Ubuntu Trisquel .
sed /txt_option_free/d dia_fulloptions.inc -i
-sed 's:\(.*\)120\(.*\):\181\2\n/timeout.time.x timeout.x 550 add def:' timeout.inc -i
+
+#sed 's:\(.*\)120\(.*\):\181\2\n/timeout.time.x timeout.x 550 add def:' timeout.inc -i
+cat << EOF | patch -p1
+diff -ru gfxboot-theme-ubuntu-0.13.3.orig/common.inc gfxboot-theme-ubuntu-0.13.3/common.inc
+--- gfxboot-theme-ubuntu-0.13.3.orig/common.inc 2012-05-14 23:53:21.000000000 +0000
++++ gfxboot-theme-ubuntu-0.13.3/common.inc 2012-11-10 22:00:04.000000000 +0000
+@@ -431,6 +431,10 @@
+ "maybe-ubiquity " bc.cmd dup length add sprintf
+ } if
+
++ timeout.finished {
++ " access=v3 " bc.cmd dup length add sprintf
++ } if
++
+ bc.cmd dropspaces
+
+ debug 3 ge {
+diff -ru gfxboot-theme-ubuntu-0.13.3.orig/timeout.inc gfxboot-theme-ubuntu-0.13.3/timeout.inc
+--- gfxboot-theme-ubuntu-0.13.3.orig/timeout.inc 2012-05-14 23:53:21.000000000 +0000
++++ gfxboot-theme-ubuntu-0.13.3/timeout.inc 2012-11-10 23:17:37.000000000 +0000
+@@ -24,6 +24,10 @@
+
+ timeout.time.x timeout.time.y moveto timeout.buf showright
+ } if
++
++ timeout.buf "0 s" eq {
++ /timeout.finished true def
++ } if
+ } def
+
+
+@@ -38,6 +42,8 @@
+
+ /timeout.time.x timeout.x def
+ /timeout.time.y timeout.y 120 add def
++ /timeout.time.y timeout.y 81 add def
++ /timeout.time.x timeout.x 550 add def
+ } def
+
+
+EOF
sed 's/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/control -i
diff --git a/helpers/make-gnome-control-center b/helpers/make-gnome-control-center
index 243fb26..d09d061 100644
--- a/helpers/make-gnome-control-center
+++ b/helpers/make-gnome-control-center
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
COMPONENT=main
. ./config
@@ -35,7 +35,7 @@ rm ./debian/patches/53_use_ubuntu_help.patch
sed /use_ubuntu_help/d -i debian/patches/series
# Add Trisquel to the hardcoded list of gtk3 themes
-#sed 's/"Adwaita"/"Trisquel", "Adwaita"/' -i debian/patches/04_add_theme_selection.patch
+sed 's/"Adwaita"/"Trisquel", "Adwaita"/' -i debian/patches/04_new_appearance_settings.patch
# Edit menu selections
cp $DATA/gnomecc.menu.in shell/gnomecc.menu.in
diff --git a/helpers/make-gnome-menus b/helpers/make-gnome-menus
index cd69457..c86ffe4 100644
--- a/helpers/make-gnome-menus
+++ b/helpers/make-gnome-menus
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=3
COMPONENT=main
. ./config
@@ -26,13 +26,13 @@ COMPONENT=main
#echo 99_trisquel_defaults.patch >> debian/patches/series
#sed -i 's/ubuntu-software-center/gnome-app-install/' debian/patches/09_app_install_entry.patch
-for i in 03_kde-legacydirs.patch 05_debian_menu.patch 09_app_install_entry.patch 09_games-menu.patch 11_science-menu.patch
+for i in 03_kde-legacydirs.patch 05_debian_menu.patch 09_app_install_entry.patch 09_games-menu.patch 11_science-menu.patch 08_settings-menus.patch
do
rm debian/patches/$i
sed /$i/d -i debian/patches/series
done
-#cp $DATA/applications.menu layout/applications.menu
+cp $DATA/applications.menu layout/applications.menu
changelog "Default layout adapted for Trisquel"
diff --git a/helpers/make-gnome-panel b/helpers/make-gnome-panel
index 2baa9e8..82675c9 100644
--- a/helpers/make-gnome-panel
+++ b/helpers/make-gnome-panel
@@ -17,12 +17,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=5
. ./config
-sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.75)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-#sed "105s/'none'/'image'/; 115s_''_'file:///usr/share/themes/Trisquel/gtk-3.0/panel-bg.png'_; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
+#makes the panel translucid
+#sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.75)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
+#remove the arrot in the main menu button
sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-arrow", FALSE,/' -i gnome-panel/panel-menu-button.c
#sed '/gnome-session /d' debian/control*
@@ -63,11 +64,11 @@ pack-index=30
pack-type=start
toplevel-id=panel
-[Object notification-area]
-object-iid=NotificationAreaAppletFactory::NotificationArea
-pack-index=20
-pack-type=end
+[Object indicators]
+object-iid=IndicatorAppletFactory::IndicatorApplet
toplevel-id=panel
+pack-type=end
+pack-index=20
[Object clock]
object-iid=ClockAppletFactory::ClockApplet
diff --git a/helpers/make-gnome-session b/helpers/make-gnome-session
index 931d1b5..7b69036 100644
--- a/helpers/make-gnome-session
+++ b/helpers/make-gnome-session
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=8
COMPONENT=main
QUILT=skip
@@ -32,9 +32,47 @@ sed 's/unity.*/gnome-shell (>= 3.0),/' -i debian/control*
#% Replace gnome-classic session with gnome-fallback
cat << EOF > debian/gnome-session-fallback.install
debian/scripts/gnome-session-classic /usr/bin
+debian/scripts/trisquel-wm /usr/bin
+debian/scripts/trisquel-wm.desktop /usr/share/applications
debian/tmp/usr/share/xsessions/gnome-classic.desktop
debian/tmp/usr/share/gnome-session/sessions/gnome-classic.session
EOF
+
+#% Add a wrapper for compiz
+cat << EOF > debian/scripts/trisquel-wm
+#!/bin/sh
+
+WM=compiz
+FALLBACK=openbox
+which metacity && FALLBACK=metacity
+which compiz || WM=\$FALLBACK
+[ -f ~/.disable-compiz ] && WM=\$FALLBACK
+grep access=v3 /proc/cmdline -q && WM=\$FALLBACK
+[ \$(gsettings get org.gnome.desktop.a11y.applications screen-reader-enabled) = "true" ] && WM=\$FALLBACK
+
+# Ugly hack to fix a hard to catch race condition
+if gconftool --get /apps/metacity/general/titlebar_font |grep -q Cantarell
+then
+ if ! [ -f /usr/share/fonts/opentype/cantarell/Cantarell-Bold.otf ]
+ then
+ echo The gconf db seems corrupted, saving at ~/.gconf.broken and cleaning it up
+ cp -a ~/.gconf ~/.gconf.broken
+ gconftool --recursive-unset /
+ fi
+fi
+
+/usr/lib/gnome-session/gnome-session-check-accelerated && exec \$WM || exec \$FALLBACK
+EOF
+chmod 755 debian/scripts/trisquel-wm
+cat << EOF > debian/scripts/trisquel-wm.desktop
+[Desktop Entry]
+Type=Application
+Name=trisquel-wm
+Exec=trisquel-wm
+NoDisplay=true
+X-GNOME-Provides=windowmanager
+EOF
+
mv debian/scripts/gnome-session-fallback debian/scripts/gnome-session-classic
sed s/fallback/classic/g debian/scripts/gnome-session-classic -i
cat << EOF > data/gnome-classic.session.desktop.in.in
@@ -42,7 +80,7 @@ cat << EOF > data/gnome-classic.session.desktop.in.in
Name=Trisquel
RequiredComponents=gnome-panel;gnome-settings-daemon;
RequiredProviders=windowmanager;
-DefaultProvider-windowmanager=metacity
+DefaultProvider-windowmanager=trisquel-wm
DesktopName=GNOME
EOF
diff --git a/helpers/make-kdenetwork b/helpers/make-kdenetwork
index bd57a14..a97865c 100644
--- a/helpers/make-kdenetwork
+++ b/helpers/make-kdenetwork
@@ -26,8 +26,8 @@ sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.
sed -i '/skype/d; /callto/d; /tel.protocol/d' debian/kopete.install
rm -rf kopete/protocols/skype
sed 's/, Skype//' -i ./doc/kopete/index.docbook
-rm debian/patches/no_home_set.diff
-sed /no_home_set/d debian/patches/series -i
+#rm debian/patches/no_home_set.diff
+#sed /no_home_set/d debian/patches/series -i
changelog "Compiled for Trisquel"