Merge branch 'fifteen'

diff --cc applet/data/Makefile.am
index e7fd8a7,24a8b68..48cab8b
--- 1/applet/data/Makefile.am
--- 2/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@@ -78,10 -75,9 +81,11 @@@ EXTRA_DIST = $(berlintheme_DATA) 
             $(moderntheme_DATA) \
             $(matrixtheme_DATA) \
             $(acceltheme_DATA) \
+            $(fifteentheme_DATA) \
             $(videotheme_DATA) \
             $(xshowtheme_DATA) \
 +           $(conkytheme_DATA) \
 +           $(colorfloodtheme_DATA) \
             $(externaltheme_DATA) \
             $(dbus_service_DATA)