diff --git a/Makefile b/Makefile
index 01fa1ee..df725e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
-GRUB_THEMES=futureprototype-theme/grub softwaves-theme/grub lines-theme/grub joy-theme/grub spacefun-theme/grub
+GRUB_THEMES=futureprototype-theme\
+ moonlight-theme/grub\
+ softwaves-theme/grub\
+ lines-theme/grub\
+ joy-theme/grub\
+ spacefun-theme/grub
DEFAULT_BACKGROUND=desktop-background
PIXMAPS=$(wildcard pixmaps/*.png)
@@ -214,4 +219,32 @@ install-local:
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/futureprototype-theme/lockscreen FuturePrototypeLockScreen
+ # Moonlight theme
+ ### Plymouth theme
+ #install -d $(DESTDIR)/usr/share/plymouth/themes/moonlight
+ #$(INSTALL_DATA) $(wildcard moonlight-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/moonlight
+ #install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme
+ #cd $(DESTDIR)/usr/share/desktop-base/moonlight-theme && ln -s /usr/share/plymouth/themes/moonlight plymouth
+ ### Login background
+ install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/login
+ $(INSTALL_DATA) $(wildcard moonlight-theme/login/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/login
+ ### Wallpapers
+ install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper/contents/images
+ $(INSTALL_DATA) moonlight-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper
+ $(INSTALL_DATA) moonlight-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper
+ $(INSTALL_DATA) $(wildcard moonlight-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/wallpaper/contents/images/
+ $(INSTALL_DATA) moonlight-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-moonlight.xml
+ # Wallpaper symlink for KDE
+ install -d $(DESTDIR)/usr/share/wallpapers
+ cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/moonlight-theme/wallpaper moonlight
+
+ ### Lockscreen
+ install -d $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen/contents/images
+ $(INSTALL_DATA) moonlight-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen
+ $(INSTALL_DATA) moonlight-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen
+ $(INSTALL_DATA) $(wildcard moonlight-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/moonlight-theme/lockscreen/contents/images/
+ # Lock screen symlink for KDE
+ install -d $(DESTDIR)/usr/share/wallpapers
+ cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/moonlight-theme/lockscreen MoonlightLockScreen
+
include Makefile.inc
diff --git a/debian/postinst b/debian/postinst
index 1341cd2..4be0ed8 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,6 +25,7 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov
/usr/share/desktop-base/$theme-theme $priority
done << EOF
futureprototype 50
+moonlight 40
softwaves 40
lines 40
joy 40
@@ -52,6 +53,7 @@ futureprototype 1920x1080.svg 65
futureprototype 1920x1200.svg 65
futureprototype 2560x1080.svg 65
futureprototype 4096x2160.svg 65
+moonlight 1920x1080.svg 65
softwaves 1024x768.svg 50
softwaves 1280x720.svg 50
softwaves 1280x800.svg 50
diff --git a/debian/prerm b/debian/prerm
index 2488e92..e61ca36 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -169,6 +169,7 @@ EOF
/usr/share/desktop-base/$theme-theme
done << EOF
softwaves
+moonlight
lines
joy
joy-inksplat
diff --git a/moonlight-theme/gnome-wp-list.xml b/moonlight-theme/gnome-wp-list.xml
new file mode 100644
index 0000000..ae69a84
--- /dev/null
+++ b/moonlight-theme/gnome-wp-list.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Soft Waves
+ /usr/share/desktop-base/moonlight-theme/wallpaper/gnome-background.xml
+ zoom
+ #ffffff
+ #000000
+
+
+
+ Soft Waves Lock Screen
+ /usr/share/desktop-base/moonlight-theme/lockscreen/gnome-background.xml
+ zoom
+ #ffffff
+ #000000
+
+
diff --git a/moonlight-theme/grub/Makefile b/moonlight-theme/grub/Makefile
new file mode 100644
index 0000000..1145489
--- /dev/null
+++ b/moonlight-theme/grub/Makefile
@@ -0,0 +1,24 @@
+dir = usr/share/desktop-base/moonlight-theme/grub
+
+.PHONY: build clean install
+
+files = \
+ grub-4x3.png \
+ grub-16x9.png
+
+build: $(files)
+
+clean:
+ rm -f grub-4x3.png grub-16x9.png
+
+install:
+ install -d $(DESTDIR)/$(dir)
+ $(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
+
+grub-4x3.png: grub-4x3.svg
+ rsvg-convert $< > $@
+
+grub-16x9.png: grub-16x9.svg
+ rsvg-convert $< > $@
+
+include ../../Makefile.inc
diff --git a/moonlight-theme/grub/grub-16x9.svg b/moonlight-theme/grub/grub-16x9.svg
new file mode 100644
index 0000000..f897baa
--- /dev/null
+++ b/moonlight-theme/grub/grub-16x9.svg
@@ -0,0 +1,6483 @@
+
+
+
+
\ No newline at end of file
diff --git a/moonlight-theme/grub/grub_background.sh b/moonlight-theme/grub/grub_background.sh
new file mode 100644
index 0000000..c7ba469
--- /dev/null
+++ b/moonlight-theme/grub/grub_background.sh
@@ -0,0 +1,3 @@
+WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
+COLOR_NORMAL=white/black
+COLOR_HIGHLIGHT=black/white
diff --git a/moonlight-theme/lockscreen/content/images/1920X1080.svg b/moonlight-theme/lockscreen/contents/images/1920x1080.svg
similarity index 100%
rename from moonlight-theme/lockscreen/content/images/1920X1080.svg
rename to moonlight-theme/lockscreen/contents/images/1920x1080.svg
diff --git a/moonlight-theme/lockscreen/gnome-background.xml b/moonlight-theme/lockscreen/gnome-background.xml
new file mode 100644
index 0000000..8d91d88
--- /dev/null
+++ b/moonlight-theme/lockscreen/gnome-background.xml
@@ -0,0 +1,9 @@
+
+
+ 8640000.0
+
+ /usr/share/desktop-base/moonlight-theme/lockscreen/contents/images/1920x1080.svg
+
+
+
+
diff --git a/moonlight-theme/lockscreen/metadata.desktop b/moonlight-theme/lockscreen/metadata.desktop
new file mode 100644
index 0000000..d2a1ef1
--- /dev/null
+++ b/moonlight-theme/lockscreen/metadata.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Moonlight Lock Screen
+X-KDE-PluginInfo-Name=MoonlightLockScreen
+X-KDE-PluginInfo-Author=Juliette Taka Belin
+X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com
+X-KDE-PluginInfo-License=GPLv2+
diff --git a/moonlight-theme/wallpaper/content/images/1920x1080.svg b/moonlight-theme/wallpaper/contents/images/1920x1080.svg
similarity index 100%
rename from moonlight-theme/wallpaper/content/images/1920x1080.svg
rename to moonlight-theme/wallpaper/contents/images/1920x1080.svg
diff --git a/moonlight-theme/wallpaper/gnome-background.xml b/moonlight-theme/wallpaper/gnome-background.xml
new file mode 100644
index 0000000..6f93f7e
--- /dev/null
+++ b/moonlight-theme/wallpaper/gnome-background.xml
@@ -0,0 +1,9 @@
+
+
+ 8640000.0
+
+ /usr/share/desktop-base/moonlight-theme/wallpaper/contents/images/1920x1080.svg
+
+
+
+
diff --git a/moonlight-theme/wallpaper/metadata.desktop b/moonlight-theme/wallpaper/metadata.desktop
new file mode 100644
index 0000000..2a99c90
--- /dev/null
+++ b/moonlight-theme/wallpaper/metadata.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Moonlight
+X-KDE-PluginInfo-Name=Moonlight
+X-KDE-PluginInfo-Author=Juliette Taka Belin
+X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com
+X-KDE-PluginInfo-License=GPLv2+