diff --git a/Makefile b/Makefile
index ba0781a..7c6a09b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ install:
 	$(INSTALL) $(wildcard kdm-theme/debian-moreblue/*) $(DESTDIR)/usr/share/apps/kdm/themes/debian-moreblue
 	mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/moreblue-orbit
 	$(INSTALL) $(wildcard kdm-theme/moreblue-orbit/*) $(DESTDIR)/usr/share/apps/kdm/themes/moreblue-orbit
+	mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/nightly
+	$(INSTALL) $(wildcard kdm-theme/nightly/*) $(DESTDIR)/usr/share/apps/kdm/themes/nightly
 	# KSPLASH theme
 	mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
 	$(INSTALL) $(wildcard ksplash-theme/debian-moreblue-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
@@ -41,6 +43,8 @@ install:
 	$(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-default
 	mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
 	$(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
+	mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nighly-moodin
+	$(INSTALL) $(wildcard ksplash-theme/nightly-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
 	# KDE setup
 	mkdir -p $(DESTDIR)/etc/kde3
 	$(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/etc/kde3
diff --git a/backgrounds/nightly-wallpaper.png b/backgrounds/nightly-wallpaper.png
new file mode 100644
index 0000000..9ce61a7
Binary files /dev/null and b/backgrounds/nightly-wallpaper.png differ
diff --git a/debian/changelog b/debian/changelog
index 165f044..985dcd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ desktop-base (5.0.0) unstable; urgency=low
   * Bump Standards-Version to 3.8.0 (no changes needed).
   * Add Lenny artwork: MoreBlue Orbit.
     Thanks to Andre L. R. Ferreira and Valessio S. Brito.
+  * Add Nightly artwork. Thanks to Robert Jahene.
   * Use alternative to provide desktop-grub.
 
  -- Fathi Boudra <fabo@debian.org>  Thu, 14 Aug 2008 09:41:06 +0200
diff --git a/debian/postinst b/debian/postinst
index f49f248..ce3e723 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,7 +15,12 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
     update-alternatives --install \
         /usr/share/images/desktop-base/desktop-background \
         desktop-background \
-        /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg 50
+        /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg 60
+
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+        desktop-background \
+        /usr/share/images/desktop-base/nightly-wallpaper.png 50
 
     update-alternatives --install \
         /usr/share/images/desktop-base/desktop-background \
diff --git a/debian/prerm b/debian/prerm
index 57e65df..d42c618 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -7,6 +7,9 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove desktop-background \
         /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg
 
+    update-alternatives --remove desktop-background \
+        /usr/share/images/desktop-base/nightly-wallpaper.png
+
     update-alternatives --remove desktop-background \
         /usr/share/images/desktop-base/debian-blueish-wallpaper.svg
 
diff --git a/kdm-theme/nightly/GdmGreeterTheme.desktop b/kdm-theme/nightly/GdmGreeterTheme.desktop
new file mode 100644
index 0000000..7e64bfc
--- /dev/null
+++ b/kdm-theme/nightly/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne <robert@jaehne.bz>
+Screenshot=screenshot.png
diff --git a/kdm-theme/nightly/KdmGreeterTheme.desktop b/kdm-theme/nightly/KdmGreeterTheme.desktop
new file mode 100644
index 0000000..2eae790
--- /dev/null
+++ b/kdm-theme/nightly/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne <robert@jaehne.bz>
+Screenshot=screenshot.png
diff --git a/kdm-theme/nightly/Sessions.png b/kdm-theme/nightly/Sessions.png
new file mode 100644
index 0000000..41aba5d
Binary files /dev/null and b/kdm-theme/nightly/Sessions.png differ
diff --git a/kdm-theme/nightly/Sessions_inactive.png b/kdm-theme/nightly/Sessions_inactive.png
new file mode 100644
index 0000000..a1f0345
Binary files /dev/null and b/kdm-theme/nightly/Sessions_inactive.png differ
diff --git a/kdm-theme/nightly/System.png b/kdm-theme/nightly/System.png
new file mode 100644
index 0000000..240c2d9
Binary files /dev/null and b/kdm-theme/nightly/System.png differ
diff --git a/kdm-theme/nightly/System_inactive.png b/kdm-theme/nightly/System_inactive.png
new file mode 100644
index 0000000..4bea4e7
Binary files /dev/null and b/kdm-theme/nightly/System_inactive.png differ
diff --git a/kdm-theme/nightly/background.png b/kdm-theme/nightly/background.png
new file mode 100644
index 0000000..e7a091e
Binary files /dev/null and b/kdm-theme/nightly/background.png differ
diff --git a/kdm-theme/nightly/boundingbox.png b/kdm-theme/nightly/boundingbox.png
new file mode 100644
index 0000000..223b747
Binary files /dev/null and b/kdm-theme/nightly/boundingbox.png differ
diff --git a/kdm-theme/nightly/nightly.xml b/kdm-theme/nightly/nightly.xml
new file mode 100644
index 0000000..22c6c1b
--- /dev/null
+++ b/kdm-theme/nightly/nightly.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+
+<!-- main pic, login pic -->
+<item type="pixmap">
+	<normal file="background.png"/>
+	<pos x="0" y="0" width="100%" height="100%"/>
+
+	<item type="pixmap">
+		<normal file="boundingbox.png"/>
+		<pos x="50%" y="80%" width="501" height="101" anchor="c"/>
+
+		<item type="rect">
+			<normal color="#ffff00" alpha="0.0"/>
+			<pos anchor="e" x="45%" y="50%" width="190" height="180"/>
+			
+			<!-- username-label -->
+			<item type="label">
+				<pos anchor="ne" x="90%" y="35%"/>
+				<normal color="#ffffff" font="Sans 10"/>
+				<stock type="username-label"/>
+			</item>
+			
+			<!-- password-label -->
+			<item type="label">
+				<pos anchor="ne" x="90%" y="55%"/>
+				<normal color="#ffffff" font="Sans 10"/>
+				<stock type="password-label"/>
+			</item>
+		</item>		
+
+		<item type="rect">
+			<normal color="#00ffff" alpha="0.0"/>
+			<pos anchor="w" x="50%" y="50%" width="190" height="180"/>
+			
+			<!-- username-entry -->
+			<item type="entry" id="user-entry">
+				<pos anchor="n" x="45%" y="35%" height="24" width="150"/>
+			</item>
+			
+			<!-- password-entry -->
+			<item type="entry" id="pw-entry">
+				<pos anchor="n" x="45%" y="55%" height="24" width="150"/>
+			</item>
+		</item>		
+	</item>
+
+	<!-- capslock-warning -->
+	<item type="pixmap" id="caps-lock-warning">
+		<normal file="error.png"/>
+		<pos anchor="s" x="50%" y="75%" width="400" height="70"/>
+		<item type="rect" id="caps-lock-warning">
+			<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+			<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+				<item type="label">
+					<normal color="#FFFFFF" font="Sans 12"/>
+					<pos x="50%" anchor="n"/>
+					<stock type="caps-lock-warning"/>
+				</item>
+			</box>
+		</item>
+	</item>	
+
+	<!-- Login-Error -->
+	<item type="pixmap" id="pam-error">
+		<normal file="error.png"/>
+		<pos anchor="s" x="50%" y="73%" width="400" height="70"/>
+		<item type="rect">
+			<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+			<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+				<item type="label">
+					<normal color="#FFFFFF" font="Sans 12"/>
+					<pos anchor="n" x="50%"/>
+					<text>Login failed.</text>
+				</item>
+			</box>
+		</item>
+	</item>
+</item>
+
+<!-- Bottom bar -->
+<item type="pixmap">
+	<pos x="5%" y="5%" width="60%" height="60"/>
+</item>
+
+<!-- icons and text in bottom bar -->
+<item type="rect">
+	<pos x="0%" y="0%" width="100%" height="60" anchor="nw"/>
+
+	<!-- clock -->
+	<item type="label" id="clock">
+		<normal color="#ffffff" font="Sans 12"/>
+		<pos x="85%" y="5"/>
+		<text>%c</text>
+	</item>
+
+	<!-- session-button -->
+	<item type="rect" id="session_button" button="true">
+		<pos x="0" y="0" width="150" height="100%"/>
+		<item type="pixmap" id="session_button" button="true">
+			<normal file="Sessions_inactive.png"/>
+			<prelight file="Sessions.png"/>
+			<pos x="6%" y="8" width="48" height="48"/>
+		</item>
+		<item type="label">
+			<normal color="#999999" font="Sans 12"/>
+			<prelight color="#ffffff" font="Sans 12"/>
+			<active color="#ff0000" font="Sans 12"/>
+			<pos x="70" y="19"/>
+			<text>Sessions</text>
+			<text xml:lang="ca">Sessi&#xF3;</text>
+			<text xml:lang="es">Sesi&#xF3;n</text>
+			<text xml:lang="en">Session</text>
+		</item>
+	</item>
+
+	<!-- menu-button -->
+	<item type="rect" id="system_button" button="true">
+		<show modes="console" type="system"/>
+		<pos x="10%" y="0" width="180" height="100%"/>
+		<item type="pixmap" id="system_button" button="true">
+			<normal file="System_inactive.png"/>
+			<prelight file="System.png"/>
+			<pos x="6%" y="8" width="48" height="48"/>
+		</item>
+		<item type="label">
+			<normal color="#999999" font="Sans 12"/>
+			<prelight color="#ffffff" font="Sans 12"/>
+			<active color="#ff0000" font="Sans 12"/>
+			<pos x="70" y="19"/>
+			<text>System Menu</text>
+			<text xml:lang="ca">Men&#xFA;</text>
+			<text xml:lang="es">Men&#xFA;</text>
+			<text xml:lang="en">Menu</text>
+		</item>
+	</item>
+</item>
+</greeter>
diff --git a/kdm-theme/nightly/screenshot.png b/kdm-theme/nightly/screenshot.png
new file mode 100644
index 0000000..cf52368
Binary files /dev/null and b/kdm-theme/nightly/screenshot.png differ
diff --git a/ksplash-theme/nightly-moodin/1.png b/ksplash-theme/nightly-moodin/1.png
new file mode 100644
index 0000000..a2f883e
Binary files /dev/null and b/ksplash-theme/nightly-moodin/1.png differ
diff --git a/ksplash-theme/nightly-moodin/2.png b/ksplash-theme/nightly-moodin/2.png
new file mode 100644
index 0000000..4ce019d
Binary files /dev/null and b/ksplash-theme/nightly-moodin/2.png differ
diff --git a/ksplash-theme/nightly-moodin/3.png b/ksplash-theme/nightly-moodin/3.png
new file mode 100644
index 0000000..26811fc
Binary files /dev/null and b/ksplash-theme/nightly-moodin/3.png differ
diff --git a/ksplash-theme/nightly-moodin/4.png b/ksplash-theme/nightly-moodin/4.png
new file mode 100644
index 0000000..ed5b343
Binary files /dev/null and b/ksplash-theme/nightly-moodin/4.png differ
diff --git a/ksplash-theme/nightly-moodin/5.png b/ksplash-theme/nightly-moodin/5.png
new file mode 100644
index 0000000..dd4220d
Binary files /dev/null and b/ksplash-theme/nightly-moodin/5.png differ
diff --git a/ksplash-theme/nightly-moodin/6.png b/ksplash-theme/nightly-moodin/6.png
new file mode 100644
index 0000000..40f348c
Binary files /dev/null and b/ksplash-theme/nightly-moodin/6.png differ
diff --git a/ksplash-theme/nightly-moodin/7.png b/ksplash-theme/nightly-moodin/7.png
new file mode 100644
index 0000000..f76c71b
Binary files /dev/null and b/ksplash-theme/nightly-moodin/7.png differ
diff --git a/ksplash-theme/nightly-moodin/8.png b/ksplash-theme/nightly-moodin/8.png
new file mode 100644
index 0000000..800e1d2
Binary files /dev/null and b/ksplash-theme/nightly-moodin/8.png differ
diff --git a/ksplash-theme/nightly-moodin/Preview.png b/ksplash-theme/nightly-moodin/Preview.png
new file mode 100644
index 0000000..4b318ce
Binary files /dev/null and b/ksplash-theme/nightly-moodin/Preview.png differ
diff --git a/ksplash-theme/nightly-moodin/Theme.rc b/ksplash-theme/nightly-moodin/Theme.rc
new file mode 100644
index 0000000..377c910
--- /dev/null
+++ b/ksplash-theme/nightly-moodin/Theme.rc
@@ -0,0 +1,25 @@
+[KSplash Theme: nightly-moodin]
+Name = Nightly (Moodin)
+Description = Nightly KSplash Theme using Moodin engine, based on Nightly wallpaper and Vallerie theme, with icons from Nuvola iconset.
+Version = 1.0
+Author = Robert Jaehne
+Engine = Moodin
+
+BeginOpacity = 0.1
+Background = background.png
+BaseResolution = 1600,1200
+
+UseIconSet = false
+
+ShowStatusText = true
+StatusFont = Arial Black L,14,-1,5,50,1
+StatusCoords = -1,350
+
+ImageCoords1 = 50,450
+ImageCoords2 = 250,320
+ImageCoords3 = 450,200
+ImageCoords4 = 650,140
+ImageCoords5 = 850,140
+ImageCoords6 = 1050,200
+ImageCoords7 = 1250,320
+ImageCoords8 = 1450,450
diff --git a/ksplash-theme/nightly-moodin/background.png b/ksplash-theme/nightly-moodin/background.png
new file mode 100644
index 0000000..9ce61a7
Binary files /dev/null and b/ksplash-theme/nightly-moodin/background.png differ