diff --git a/debian/changelog b/debian/changelog
index a51c709..582d1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+desktop-base (7.0.0~exp3) UNRELEASED; urgency=low
+
+  [ Eshat Cakar ]
+  * Updated the KDM theme.
+
+ -- Eshat Cakar <info@eshat.de>  Sat, 24 Jun 2012 11:02:56 +0200
+
 desktop-base (7.0.0~exp2) experimental; urgency=low
 
   * Remove GConf defaults, they are not used anymore.
-  * Remove the GDM3 settings, since the configuration format for GDM 
+  * Remove the GDM3 settings, since the configuration format for GDM
     change again, yay.
   * Add a dconf file for the new-style GDM3 configuration.
-  * Add a XML file describing the available resolutions for the 
+  * Add a XML file describing the available resolutions for the
     background (for use with GNOME).
   * postinst: use a higher priority for the 1920x1080 background.
   * Cleanup postinst/prerm/postrm.
diff --git a/kdm-theme/joy/KdmGreeterTheme.desktop b/kdm-theme/joy/KdmGreeterTheme.desktop
index f344d5e..bb586dd 100644
--- a/kdm-theme/joy/KdmGreeterTheme.desktop
+++ b/kdm-theme/joy/KdmGreeterTheme.desktop
@@ -3,6 +3,6 @@ Encoding=UTF-8
 Greeter=joy.xml
 Name=Joy
 Description=Joy KDM Theme
-Author=Adrien Aubourg, Yves-Alexis Perez, Paul Tagliamonte, based on GDM theme
-Copyright=(c) 2012 Paul Tagliamonte <paultag@ubuntu.com>
+Author=Eshat Cakar, Adrien Aubourg
+Copyright=(c) 2012 Eshat Cakar <info@eshat.de>, (c) 2010 Roman Shtylman <shtylman@gmail.com>, Adrien Aubourg
 Screenshot=screenshot.png
diff --git a/kdm-theme/joy/background.svg b/kdm-theme/joy/background.svg
new file mode 100644
index 0000000..f93e8f5
--- /dev/null
+++ b/kdm-theme/joy/background.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1200"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   inkscape:export-filename="/Users/adrienaubourg/Dropbox/wheezy_artwork/exports/proposals/wallpaper_1.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="joy-wallpaper_1920x1200.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3755">
+      <stop
+         style="stop-color:#8f9db3;stop-opacity:1;"
+         offset="0"
+         id="stop3757" />
+      <stop
+         style="stop-color:#161b2b;stop-opacity:1;"
+         offset="1"
+         id="stop3759" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3755"
+       id="radialGradient3765"
+       cx="943.93427"
+       cy="580.80634"
+       fx="943.93427"
+       fy="580.80634"
+       r="960"
+       gradientTransform="matrix(1.2448906,0,0,0.8766271,-235.09492,-56.788391)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="470.61143"
+     inkscape:cy="554.90871"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="-191.42857,600"
+       id="guide3022" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="940,772.85714"
+       id="guide3024" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Fond"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,147.63782)">
+    <rect
+       style="fill:url(#radialGradient3765);fill-opacity:1;stroke:none"
+       id="rect2985"
+       width="1920"
+       height="1200"
+       x="0"
+       y="-147.63782" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Logo"
+     transform="translate(0,120)" />
+</svg>
diff --git a/kdm-theme/joy/joy.xml b/kdm-theme/joy/joy.xml
index 2d1234b..19b2428 100644
--- a/kdm-theme/joy/joy.xml
+++ b/kdm-theme/joy/joy.xml
@@ -1,162 +1,143 @@
 <?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%"/>
-
-	<fixed>
-	<item type="pixmap">
-		<normal file="boundingbox.png"/>
-		<pos anchor="c" x="50%" y="50%" width="400" height="282"/>
-
-		<!-- Welcome -->
-		<fixed>
-		<item type="label">
-			<pos anchor="nc" x="50%" y="18%"/>
-			<normal color="#000000" font="Sans Bold 18"/>
-			<stock type="welcome-label"/>
-		</item>
-		</fixed>
-
-		<fixed>
-		<item type="rect">
-			<normal color="#ffff00" alpha="0.0"/>
-			<pos anchor="e" x="50%" y="50%" width="190" height="180"/>
-
-			<!-- username-label -->
-			<fixed>
-			<item type="label">
-				<pos anchor="ne" x="90%" y="40%"/>
-				<normal color="#000000" font="Sans Bold 10"/>
-				<stock type="username-label"/>
-			</item>
-			</fixed>
-
-			<!-- password-label -->
-			<fixed>
-			<item type="label">
-				<pos anchor="ne" x="90%" y="60%"/>
-				<normal color="#000000" font="Sans Bold 10"/>
-				<stock type="password-label"/>
-			</item>
-			</fixed>
-		</item>
-		</fixed>
-
-		<fixed>
-		<item type="rect">
-			<normal color="#00ffff" alpha="0.0"/>
-			<pos anchor="w" x="50%" y="50%" width="190" height="180"/>
-
-			<!-- username-entry -->
-			<fixed>
-			<item type="entry" id="user-entry">
-				<pos anchor="n" x="30%" y="35%" height="25" width="150"/>
-			</item>
-			</fixed>
-
-			<!-- password-entry -->
-			<fixed>
-			<item type="entry" id="pw-entry">
-				<pos anchor="n" x="30%" y="55%" height="25" width="150"/>
-			</item>
-			</fixed>
-		</item>
-		</fixed>
+<greeter id="theme">
+	<style font="Sans 12" window-text-color="#bfd9ff"
+	       base-color="#bfd9ff" alternate-base-color="#666666"
+	       text-color="#555555" disabled-text-color="#999999"
+	       base-alpha="0" 
+	       disabled-base-color="#ff0000"
+	       disabled-base-alpha="0.25" 
+	       disabled-highlight-alpha="0"
+	       frame="false" />
+	       
+	<item type="pixmap" id="background" background="true">
+		<normal file="background.svg" scalemode="crop"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+	</item>
+<!--		
+	<item type="pixmap" id="system-session">
+		<normal file="rectangle.png"/>
+		<pos anchor="c" x="50%" y="50%" width="416" height="262"/>
 	</item>
-	</fixed>
 
-	<!-- capslock-warning -->
-	<fixed>
+	<item type="pixmap" id="branding-logo" background="true">
+		<normal file="branding.png" alpha=".4" />
+		<pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+	</item>
+-->
+	<item type="pixmap" id="system-session">
+	  <normal file="rectangle.png"/>
+	  <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        
+	  <fixed>
+            <item type="label" id="welcome">
+	      <pos anchor="nw" x="20" y="20"/>
+	      <normal alpha="0.75" font="Sans Bold 14" color="#444444"/>
+	      <text>%h</text>
+            </item>
+	  </fixed>
+	</item>
+    
+	
+	<item type="rect">
+        <pos anchor="c" x="50%" y="50%" width="200" height="100"/>
+		<box orientation="vertical" spacing="10" homogeneous="true">
+            
+			<item type="rect" id="user-field">
+				<pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+				<fixed>
+                    <item type="pixmap">
+                        <pos anchor="w" x="0" y="50%"/>
+                        <normal file="user_icon.png"/>
+                    </item>
+                
+                    <item type="pixmap">
+                        <pos anchor="w" x="42" y="50%"/>
+                        <normal file="lineedit_normal.png"/>
+                        <prelight file="lineedit_active.png"/>
+                        <active file="lineedit_active.png"/>
+                    </item>
+                    
+                    <item type="entry" id="user-entry">
+                        <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+                    </item>
+                </fixed>
+            </item>
+            
+            <item type="rect" id="user-field2">
+                <pos anchor="c" x="50%" y="50%" width="200" height="box"/>
+                <fixed>
+                    <item type="pixmap" button="true">
+                        <pos anchor="w" x="0%" y="50%"/>
+                        <normal file="lock.png"/>
+                    </item>
+                
+                    <item type="pixmap">
+                        <pos anchor="w" x="42" y="50%"/>
+                        <normal file="lineedit_normal.png"/>
+                        <prelight file="lineedit_active.png"/>
+                        <active file="lineedit_active.png"/>
+                    </item>
+                    
+                    <item type="entry" id="pw-entry">
+                        <pos anchor="w" x="49" y="50%" width="140" height="20"/>
+                    </item>
+                </fixed>
+            </item>
+		</box>
+	</item> 
+	
+	<item type="rect" id="system-session">
+        <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        <fixed>
+            <item type="label">
+                <pos anchor="se" x="-15" y="-20"/>
+                <normal font="Sans Bold 8" color="#444444"/>
+                <text>%c</text>
+            </item>
+            
+            <item type="pixmap" id="session_button" button="true">
+                <normal alpha="0.8" file="session_normal.png"/>
+                <prelight file="session_normal.png"/>
+                <active file="session_normal.png"/>
+                <pos anchor="sw" x="22" y="-20"/>
+            </item>
+            
+            <item type="pixmap" id="system_button" button="true">
+                <normal alpha="0.8" file="system_normal.png"/>
+                <prelight file="system_normal.png"/>
+                <active file="system_normal.png"/>
+                <pos anchor="sw" x="50" y="-20"/>
+            </item>
+	</fixed>
+    </item>
+
 	<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="#000000" font="Sans 12"/>
-				<pos anchor="n" x="50%" y="90"/>
-				<stock type="caps-lock-warning"/>
-			</item>
-		</box>
+        <pos anchor="c" x="50%" y="50%" width="416" height="262"/>
+        <fixed>
+            <item type="label" id="mesage">
+                <normal color="#444444" font="Sans Bold 10"/>
+                <pos anchor="s" x="50%" y="80%"/>
+                <stock type="caps-lock-warning"/>
+            </item>	
+        </fixed>
 	</item>
-	</fixed>
 
-	<!-- Login-Error -->
-	<fixed>
-	<item type="rect" id="pam-error">
-		<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="#000000" font="Sans 12"/>
-				<pos anchor="n" x="50%" y="60"/>
-				<text>Login failed.</text>
-			</item>
-		</box>
-	</item>
-	</fixed>
+	<item type="rect" id="pam-error-paceholder">
+	<pos anchor="c" x="50%" y="98%" widht="615" height="200"/>
 
-</item>
-
-<!-- icons and text in bottom bar -->
-<item type="rect">
-	<pos x="0" y="-60" width="100%" height="60"/>
-
-	<fixed>
-	<item type="pixmap" id="session_button" button="true">
-		<normal file="icon-session.png"/>
-		<pos x="20" y="20"/>
-	</item>
-	</fixed>
-
-	<!-- session-button -->
-	<fixed>
-	<item type="rect" id="session_button" button="true">
-		<pos x="60" y="30" width="110" height="100%"/>
-		<fixed>
-		<item type="label">
-			<normal color="#ffffff" font="Sans Bold 12"/>
-			<prelight color="#bbbbbb" font="Sans Bold 12"/>
-			<active color="#bbbbbb" font="Sans Bold 12"/>
-			<pos y="0" x="0"/>
-			<stock type="session"/>
+		<item type="label" id="dummy1">
+			<normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
+			<!-- </text> -->
 		</item>
-		</fixed>
-	</item>
-	</fixed>
-
-	<fixed>
-	<item type="pixmap" id="system_button" button="true">
-		<normal file="icon-reboot.png"/>
-		<pos x="180" y="20"/>
-	</item>
-	</fixed>
-
-	<!-- menu-button -->
-	<fixed>
-	<item type="rect" id="system_button" button="true">
-		<show modes="console" type="system"/>
-		<pos x="215" y="30" width="50" height="100%"/>
-		<fixed>
-		<item type="label">
-			<normal color="#ffffff" font="Sans Bold 12"/>
-			<prelight color="#bbbbbb" font="Sans Bold 12"/>
-			<active color="#bbbbbb" font="Sans Bold 12"/>
-			<pos y="0" x="0"/>
-			<stock type="system"/>
+		
+		<item type="label" id="pam-error">
+			<pos anchor="c" x="50%" y="50%" expand="true"/>
+			<normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
+			<!-- </text> -->
 		</item>
-		</fixed>
-	</item>
-	</fixed>
 
-	<!-- clock -->
-	<fixed>
-	<item type="label" id="clock">
-		<normal color="#ffffff" font="Sans Bold 11"/>
-		<pos anchor="se" x="-20" y="-10"/>
-		<text>%c</text>
 	</item>
-	</fixed>
-</item>
+
 </greeter>
diff --git a/kdm-theme/joy/lineedit_active.png b/kdm-theme/joy/lineedit_active.png
new file mode 100644
index 0000000..0192ee6
Binary files /dev/null and b/kdm-theme/joy/lineedit_active.png differ
diff --git a/kdm-theme/joy/lineedit_normal.png b/kdm-theme/joy/lineedit_normal.png
new file mode 100644
index 0000000..a5138e9
Binary files /dev/null and b/kdm-theme/joy/lineedit_normal.png differ
diff --git a/kdm-theme/joy/lock.png b/kdm-theme/joy/lock.png
new file mode 100644
index 0000000..21864d0
Binary files /dev/null and b/kdm-theme/joy/lock.png differ
diff --git a/kdm-theme/joy/rectangle.png b/kdm-theme/joy/rectangle.png
new file mode 100644
index 0000000..b9a13b1
Binary files /dev/null and b/kdm-theme/joy/rectangle.png differ
diff --git a/kdm-theme/joy/screenshot.png b/kdm-theme/joy/screenshot.png
index 7d3dc1e..89f36ef 100644
Binary files a/kdm-theme/joy/screenshot.png and b/kdm-theme/joy/screenshot.png differ
diff --git a/kdm-theme/joy/session_normal.png b/kdm-theme/joy/session_normal.png
new file mode 100644
index 0000000..a970bf1
Binary files /dev/null and b/kdm-theme/joy/session_normal.png differ
diff --git a/kdm-theme/joy/system_normal.png b/kdm-theme/joy/system_normal.png
new file mode 100644
index 0000000..5769fdb
Binary files /dev/null and b/kdm-theme/joy/system_normal.png differ
diff --git a/kdm-theme/joy/user_icon.png b/kdm-theme/joy/user_icon.png
new file mode 100644
index 0000000..84e9139
Binary files /dev/null and b/kdm-theme/joy/user_icon.png differ