diff --git a/debian/changelog b/debian/changelog
index ec26b87..480debb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 lubuntu-artwork (0.17) UNRELEASED; urgency=low
 
-  * usr/share/lxdm/themes/Lubuntu
-   - Update with Ozone2 theme.
   * usr/share/lubuntu/wallpapers/1110-*
    - Add community wallpapers.
   * debian/copyright:
diff --git a/usr/share/lxdm/themes/Lubuntu/exit.png b/usr/share/lxdm/themes/Lubuntu/exit.png
index 3ac985d..8e4be07 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 94a81c8..00afbdd 100644
--- a/usr/share/lxdm/themes/Lubuntu/greeter.ui
+++ b/usr/share/lxdm/themes/Lubuntu/greeter.ui
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">exit.png</property>
-  </object>
+  <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="lxdm">
-    <property name="can_focus">False</property>
     <property name="decorated">False</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkLabel" id="time">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xalign">1</property>
             <property name="xpad">12</property>
             <property name="ypad">12</property>
@@ -24,47 +17,38 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="pixbuf">login.png</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
                     <child>
                       <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="prompt">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">User:</property>
                           </object>
                           <packing>
@@ -77,7 +61,7 @@
                           <object class="GtkEntry" id="login_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">•</property>
+                            <property name="invisible_char">&#x2022;</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -89,8 +73,6 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -98,8 +80,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -107,116 +87,118 @@
           <object class="GtkEventBox" id="bottom_pane">
             <property name="visible">True</property>
             <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
             <property name="visible_window">False</property>
             <child>
               <object class="GtkHBox" id="bottom_hbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</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="can_focus">False</property>
+                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">session.png</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Desktop:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkComboBox" id="sessions">
+                        <property name="visible">True</property>
+                        <property name="entry-text-column">0</property>
+                        <property name="has-entry">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="lang_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="border_width">15</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">lang.png</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label_lang">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Language:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkComboBox" id="lang">
+                        <property name="visible">True</property>
+                        <property name="entry-text-column">0</property>
+                        <property name="has-entry">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
+                    <property name="border_width">15</property>
                     <child>
                       <object class="GtkLabel" id="label3">
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Keyboard Layout:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="keyboard">
-                        <property name="can_focus">False</property>
-                      </object>
+                      <object class="GtkComboBox" id="keyboard"/>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -226,13 +208,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">image4</property>
                     <property name="relief">none</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="pack_type">end</property>
                     <property name="position">3</property>
                   </packing>
@@ -242,11 +222,14 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="pixbuf">exit.png</property>
+  </object>
 </interface>
diff --git a/usr/share/lxdm/themes/Lubuntu/gtkrc b/usr/share/lxdm/themes/Lubuntu/gtkrc
index 6bd5bb1..18b86a5 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 = "Ubuntu 10"
+	font_name = "Sans 10"
 }
 
 style "prompt"
 {
 	fg[NORMAL] = "#ffffff"
-	font_name = "Ubuntu Bold 10"
+	font_name = "Sans Bold 10"
 }
 
 # Normally this won't paint an invisible event box, but we did some hacks in greeter.c.
 style "bottom"
 {
-	font_name = "Ubuntu 10"
+	font_name = "Sans 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 482e3ad..b61ae7b 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=Lubuntu login theme
-Author=神癒礁湖 (Rafael Laguna) (rafaellaguna@gmail.com)
+Comment=Login theme for Lubuntu
+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 85bf76b..a6f6323 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 12052e9..40cf2a6 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 0dcafaf..632ff23 100644
Binary files a/usr/share/lxdm/themes/Lubuntu/session.png and b/usr/share/lxdm/themes/Lubuntu/session.png differ