diff --git a/debian/changelog b/debian/changelog
index 62db662..afcf977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lubuntu-artwork (0.18) UNRELEASED; urgency=low
+
+  * usr/share/themes/Lubuntu-default/
+   - Fix bug for the white menu items on gtk3 theme. (LP: #853172)
+   - Adjust menuitems border for panel buttons.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 18 Sep 2011 13:38:07 +0200
+
 lubuntu-artwork (0.17) oneiric; urgency=low
 
   * usr/share/lxdm/themes/Lubuntu
diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png b/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png
index 6fe52ae..93e3c81 100644
Binary files a/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png and b/usr/share/themes/Lubuntu-default/gtk-2.0/widgets/Panel/panel-button-active.png differ
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
index 46358da..aa5ec4f 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-menus.css
@@ -12,7 +12,7 @@
 /* menuitem */
 .menuitem {
 	padding: 2;
-	border-width: 1;
+	border-width: 0;
 	border-radius: 0;
 	text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.4);
 	border-style: solid;
@@ -28,10 +28,14 @@
 	-unico-inner-stroke-style: none;
 }
 
-.menuitem:prelight,
-.menuitem *:prelight {
-	color: @selected_fg_color;
-	text-shadow: none;
+.menubar.menuitem:prelight {
+    background-image: none;
+    background-color: @menu_bg_color;
+    color: @menu_fg_color;
+    border-style: solid;
+    border-radius: 0;
+    border-width: 0;
+    border-color: @inactive_frame_color;
 }
 
 .menuitem:insensitive,
diff --git a/usr/share/themes/Lubuntu-default/lubuntu.desktop b/usr/share/themes/Lubuntu-default/lubuntu.desktop
index 99c691a..9383d5e 100644
--- a/usr/share/themes/Lubuntu-default/lubuntu.desktop
+++ b/usr/share/themes/Lubuntu-default/lubuntu.desktop
@@ -1,6 +1,8 @@
-# Theme for Lubuntu Oneiric Ocelot
-# Author: 神癒礁湖 (Rafael Laguna)
-# Released under GPL. See COPYING for license.
+# Theme for Lubuntu 11.10 (oneiric ocelot)
+# Author: 神癒礁湖 (Rafael Laguna) · rafaellaguna@ubuntu.com
+# Released under GPL3. See COPYING for license.
+# For questions & feedback: lubuntu-desktop@lists.launchpad.net
+# Subscribe here: https://launchpad.net/~lubuntu-desktop
 
 [Desktop Entry]
 Type=X-GNOME-Metatheme
@@ -8,8 +10,6 @@ Name=lubuntu
 Comment=Lubuntu desktop default theme
 Encoding=UTF-8
 
-Name[ca_ES]=lubuntu
-
 [X-GNOME-Metatheme]
 CursorSize=24
 GtkTheme=lubuntu