diff --git a/cinnamon/cinnamon.SlackBuild b/cinnamon/cinnamon.SlackBuild
index dcdff05..187ac7f 100644
--- a/cinnamon/cinnamon.SlackBuild
+++ b/cinnamon/cinnamon.SlackBuild
@@ -71,6 +71,39 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Use cinnamon theme by default
+patch -p1 < $CWD/default-theme.patch
+
+# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
+    files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+
+# Fix selected background color in Cinnamon Settings for Adwaita theme
+sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
+    files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+
+# Fix missing icons with the Adwaita theme
+sed -i 's/"gtk-file"/"text-x-preview"/' docs/applets-examples/finder@cinnamon.org/applet.js  src/cinnamon-util.c
+sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
+          s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
+sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+sed -i 's/"gtk-dialog-question"/"dialog-question"/
+          s/"gtk-directory"/"folder"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
+sed -i 's/"display"/"video-display"/
+          s/"access"/"preferences-desktop-accessibility"/
+          s/"gnome-panel-launcher"/"system-run"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
+sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calendar@cinnamon.org/metadata.json
+sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keyboard@cinnamon.org/metadata.json
+sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desktop@cinnamon.org/metadata.json
+sed -i 's/"stock_volume"/"audio-volume-high"/' files/usr/share/cinnamon/applets/sound@cinnamon.org/metadata.json
+sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/clock@cinnamon.org/metadata.json
+
+# Remove broken symlink
+rm files/etc/xdg/menus/cinnamon-applications-merged
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./autogen.sh \
diff --git a/cinnamon/default-theme.patch b/cinnamon/default-theme.patch
new file mode 100644
index 0000000..418e515
--- /dev/null
+++ b/cinnamon/default-theme.patch
@@ -0,0 +1,26 @@
+From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Sat, 22 Nov 2014 22:39:39 +0100
+Subject: [PATCH] Set default theme to 'cinnamon'
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 91fa171..9f56e4c 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -581,7 +581,7 @@
+   <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
+         gettext-domain="@GETTEXT_PACKAGE@">
+     <key name="name" type="s">
+-      <default>""</default>
++      <default>"cinnamon"</default>
+       <_summary>Theme name</_summary>
+       <_description>
+        The name of the theme
+-- 
+2.1.3
+
+