diff --git a/themes/Bear2/openbox-3/themerc.xml b/themes/Bear2/openbox-3/themerc.xml
index 8885c4cd..68b0adac 100644
--- a/themes/Bear2/openbox-3/themerc.xml
+++ b/themes/Bear2/openbox-3/themerc.xml
@@ -122,7 +122,7 @@
     <justify>center</justify>
   </window>
   <menu>
-    <border r="78" g="78" b="78" a="255"/>
+    <border r="157" g="157" b="157" a="255"/>
     <justify>center</justify>
     <overlap>2</overlap>
     <title>
diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index ae9972e2..ace17bf8 100644
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -346,12 +346,20 @@ int main(int argc, char **argv)
         CONT3("dimensions", "window", "border", NUM(i));
         CONT3("dimensions", "menu", "border", NUM(i));
     }
+    if (read_int(db, "menu.border.width", &i))
+        CONT3("dimensions", "menu", "border", NUM(i));
 
     if (read_color(db, "border.color", &i, &j, &k)) {
         COLOR3("window", "active", "border", i, j, k, 255);
         COLOR3("window", "inactive", "border", i, j, k, 255);
         COLOR2("menu", "border", i, j, k, 255);
     }
+    if (read_color(db, "window.active.border.color", &i, &j, &k))
+        COLOR3("window", "active", "border", i, j, k, 255);
+    if (read_color(db, "window.inactive.border.color", &i, &j, &k))
+        COLOR3("window", "inactive", "border", i, j, k, 255);
+    if (read_color(db, "menu.border.color", &i, &j, &k))
+        COLOR2("menu", "border", i, j, k, 255);
 
     if (read_int(db, "window.client.padding.width", &i)) {
         ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));