diff --git a/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml b/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml
index 7f49524f857c3ea8070f62724fe5a9283b1a00f1..3d0183058e2d9f86a3736ecfa467d17015c187bd 100644
--- a/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml
+++ b/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml
@@ -2,7 +2,7 @@
 <schemalist gettext-domain="unity-greeter">
   <schema id="com.canonical.unity-greeter" path="/com/canonical/unity-greeter/">
     <key name="background" type="s">
-      <default>'/usr/share/backgrounds/toutatis.jpg'</default>
+      <default>'/usr/share/backgrounds/belenos.png'</default>
       <summary>Background file to use, either an image path or a color (e.g. #772953)</summary>
     </key>
     <key name="background-color" type="s">
@@ -34,7 +34,7 @@
       <summary>GTK+ theme to use</summary>
     </key>
     <key name="icon-theme-name" type="s">
-      <default>'ubuntu-mono-dark'</default>
+      <default>'trisquel'</default>
       <summary>Icon theme to use</summary>
     </key>
     <key name="font-name" type="s">
diff --git a/helpers/DATA/unity-greeter/logo.png b/helpers/DATA/unity-greeter/logo.png
index 34dc1cc360b408420c9b74fb5b51b56d782b16c1..e7a3a2d98f31bf67eb50b9a3e5b3a8ecc590834b 100644
Binary files a/helpers/DATA/unity-greeter/logo.png and b/helpers/DATA/unity-greeter/logo.png differ
diff --git a/helpers/make-unity-greeter b/helpers/make-unity-greeter
index 92ec8b98ae710bf4767a460d5a4ffb54fa3a4101..60d9daa257ae8c4381b81745d8c3eeaf48a97e8e 100644
--- a/helpers/make-unity-greeter
+++ b/helpers/make-unity-greeter
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=7
+VERSION=11
 
 . ./config
 
@@ -39,6 +39,21 @@ cp $DATA/badge.png data/trisquel_badge.png
 cp $DATA/badge.png data/unknown_badge.png
 replace ubuntu_badge trisquel_badge .
 
+sed '/paint_with_alpha/s/0.4/0.7/' -i src/menubar.vala
+sed '/set_source_rgb/s/(0.1, 0.1, 0.1)/(0.0, 0.0, 0.0)/' -i src/menubar.vala
+sed '/set_source_rgba/s/(0.1, 0.1, 0.1, 0.4)/(0.0, 0.0, 0.0, 0.7)/' -i src/dash-box.vala
+
+sed '/ttf-ubuntu-font-family/d' -i debian/control
+
+sed '/default_session/ s/ubuntu/trisquel/' -i ./src/user-list.vala
+sed '/session_name/ s/ubuntu/trisquel/' -i ./src/settings-daemon.vala
+
+# Custom fonts
+replace "Ubuntu 1" "Sans 1" .
+replace "Ubuntu Light 1" "Sans 1" .
+sed '/set_family/ s/Ubuntu/Sans/' -i src/logo-generator.vala
+
+
 changelog "Adapted for Trisquel"
 
 compile