diff --git a/debian/changelog b/debian/changelog
index 85add28..b28ff6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lubuntu-artwork (0.17) UNRELEASED; urgency=low
+
+  * usr/share/lxdm/themes/Lubuntu
+   - Update with Ozone2 theme.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 11 Sep 2011 13:27:16 +0200
+
 lubuntu-artwork (0.16) oneiric; urgency=low
 
   * Update to Ozone2 (2011-07-22)
diff --git a/usr/share/lxdm/themes/Lubuntu/exit.png b/usr/share/lxdm/themes/Lubuntu/exit.png
index 8e4be07..3ac985d 100644
Binary files a/usr/share/lxdm/themes/Lubuntu/exit.png and b/usr/share/lxdm/themes/Lubuntu/exit.png differ
diff --git a/usr/share/lxdm/themes/Lubuntu/greeter.ui b/usr/share/lxdm/themes/Lubuntu/greeter.ui
index 00afbdd..7bb58ee 100644
--- a/usr/share/lxdm/themes/Lubuntu/greeter.ui
+++ b/usr/share/lxdm/themes/Lubuntu/greeter.ui
@@ -91,11 +91,11 @@
             <child>
               <object class="GtkHBox" id="bottom_hbox">
                 <property name="visible">True</property>
+                <property name="border_width">6</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkHBox" id="sessions_box">
                     <property name="visible">True</property>
-                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image2">
@@ -118,10 +118,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="sessions">
+                      <object class="GtkComboBoxEntry" id="sessions">
                         <property name="visible">True</property>
-                        <property name="entry-text-column">0</property>
-                        <property name="has-entry">True</property>
+                        <property name="text_column">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -137,7 +136,6 @@
                 <child>
                   <object class="GtkHBox" id="lang_box">
                     <property name="visible">True</property>
-                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image3">
@@ -160,10 +158,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="lang">
+                      <object class="GtkComboBoxEntry" id="lang">
                         <property name="visible">True</property>
-                        <property name="entry-text-column">0</property>
-                        <property name="has-entry">True</property>
+                        <property name="text_column">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -177,31 +174,21 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <property name="border_width">15</property>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="label" translatable="yes">Keyboard Layout:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="keyboard"/>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="label" translatable="yes">Keyboard Layout:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkComboBox" id="keyboard"/>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkButton" id="exit">
                     <property name="label">Exit</property>
@@ -214,7 +201,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="pack_type">end</property>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
diff --git a/usr/share/lxdm/themes/Lubuntu/gtkrc b/usr/share/lxdm/themes/Lubuntu/gtkrc
index 18b86a5..6bd5bb1 100644
--- a/usr/share/lxdm/themes/Lubuntu/gtkrc
+++ b/usr/share/lxdm/themes/Lubuntu/gtkrc
@@ -17,19 +17,19 @@ style "back"
 style "time"
 {
 	fg[NORMAL] = "#ffffff"
-	font_name = "Sans 10"
+	font_name = "Ubuntu 10"
 }
 
 style "prompt"
 {
 	fg[NORMAL] = "#ffffff"
-	font_name = "Sans Bold 10"
+	font_name = "Ubuntu Bold 10"
 }
 
 # Normally this won't paint an invisible event box, but we did some hacks in greeter.c.
 style "bottom"
 {
-	font_name = "Sans 10"
+	font_name = "Ubuntu 10"
 	fg[NORMAL] = "#9E9D9B"
 	engine "pixmap"
 	{
diff --git a/usr/share/lxdm/themes/Lubuntu/index.theme b/usr/share/lxdm/themes/Lubuntu/index.theme
index b61ae7b..482e3ad 100644
--- a/usr/share/lxdm/themes/Lubuntu/index.theme
+++ b/usr/share/lxdm/themes/Lubuntu/index.theme
@@ -1,5 +1,5 @@
 [LXDM Theme]
 Name=Lubuntu
-Comment=Login theme for Lubuntu
-Author=Rafael Laguna <rafaellaguna@gmail.com>;
+Comment=Lubuntu login theme
+Author=神癒礁湖 (Rafael Laguna) (rafaellaguna@gmail.com)
 License=GPL
diff --git a/usr/share/lxdm/themes/Lubuntu/lang.png b/usr/share/lxdm/themes/Lubuntu/lang.png
index a6f6323..85bf76b 100644
Binary files a/usr/share/lxdm/themes/Lubuntu/lang.png and b/usr/share/lxdm/themes/Lubuntu/lang.png differ
diff --git a/usr/share/lxdm/themes/Lubuntu/login.png b/usr/share/lxdm/themes/Lubuntu/login.png
index 40cf2a6..12052e9 100644
Binary files a/usr/share/lxdm/themes/Lubuntu/login.png and b/usr/share/lxdm/themes/Lubuntu/login.png differ
diff --git a/usr/share/lxdm/themes/Lubuntu/session.png b/usr/share/lxdm/themes/Lubuntu/session.png
index 632ff23..0dcafaf 100644
Binary files a/usr/share/lxdm/themes/Lubuntu/session.png and b/usr/share/lxdm/themes/Lubuntu/session.png differ