--- a/themes/enanium/css-extra/jbox.css	Wed Jul 08 23:39:31 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * jBox menu system
- */
-
-div.menu, div.menu_nojs {
-  background-image: url(../images/jbox.gif);
-  background-repeat: repeat-x;
-  background-color: #303030;
-  font-size: 7pt;
-  border-width: 0;
-}
-.menu_bg {
-  background-color: #303030;
-}
-div.menu ul, div.menu_nojs ul {
-  display: none;
-  position: absolute;
-  padding: 0;
-  margin: 0 !important;
-  background-color: #303030;
-  border-width: 0;
-  min-width: 120px;
-  text-transform: lowercase;
-}
-div.menu a, div.menu div.label, div.menu_nojs a, div.menu_nojs div.label {
-  padding: 2.5pt 5px;
-  margin-right: 3px;
-  text-decoration: none;
-  display: block;
-  float: left;
-  color: #b2b2b2;
-}
-div#content-wrapper div.menu a, div#content-wrapper div.menu_nojs a {
-  color: #b2b2b2;
-}
-div.menu div.label, div.menu_nojs div.label {
-  color: #808080;
-  cursor: default;
-}
-div.menu span.sep, div.menu_nojs span.sep {
-  display: block;
-  float: left;
-  width: 5px;
-}
-div.menu div.multopts, div.menu_nojs div.multopts {
-  line-height: 17pt;
-}
-div.menu div.multopts a, div.menu div.multopts div.label, div.menu_nojs div.multopts a, div.menu_nojs div.multopts div.label {
-  float: none;
-  display: inline;
-}
-div.menu a.liteselected, div.menu a.liteselected:hover, div.menu a:hover, div.menu_nojs a.liteselected, div.menu_nojs a.liteselected:hover, div.menu_nojs a:hover {
-  color: #c9c9c9;
-  background-color: #484848;
-  background-image: url(../images/jbox.gif);
-  background-position: 0 -32px;
-  background-repeat: repeat-x;
-}
-div.menu input[type ^="text"], div.menu input[type ^="password"], div.menu_nojs input[type ^="text"], div.menu_nojs input[type ^="password"] {
-  border-width: 0;
-  font-size: 9pt;
-  padding: 2px 5px 3px 5px;
-  max-width: 70px;
-  color: #a9a9a9;
-  background-color: #191919;
-}
-div.menu input[type ^="text"]:hover, div.menu input[type ^="password"]:hover, div.menu_nojs input[type ^="text"]:hover, div.menu_nojs input[type ^="password"]:hover {
-  background-color: #292929;
-}
-div.menu input[type ^="text"]:focus, div.menu input[type ^="password"]:focus, div.menu_nojs input[type ^="text"]:focus, div.menu_nojs input[type ^="password"]:focus {
-  background-color: #373737;
-}
-div.menu input[type ^="button"], div.menu input[type ^="submit"], div.menu_nojs input[type ^="button"], div.menu_nojs input[type ^="submit"] {
-  border-width: 0;
-  font-size: 9pt;
-  padding: 3px 5px;
-  max-width: 70px;
-}
-div.menu a.current, div.menu a.current:hover, div.menu a.selected, div.menu a.selected:hover, div.menu_nojs a.current, div.menu_nojs a.current:hover, div.menu_nojs a.selected, div.menu_nojs a.selected:hover {
-  color: #202020;
-  background-color: #FFFFFF;
-}
-div.menu a.current:hover, div.menu a.selected:hover, div.menu a.current.liteselected,
-div.menu_nojs a.current:hover, div.menu_nojs a.selected:hover, div.menu_nojs a.current.liteselected {
-  background-position: 0 -64px;
-}
-div.menu ul li, div.menu_nojs ul li {
-  list-style: none;
-}
-div.menu ul a, div.menu_nojs ul a {
-  float: none;
-  margin: 0;
-}

--- a/themes/enanium/css-extra/toolbar.css	Wed Jul 08 23:39:31 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/* toolbar */
-div.toolbar {
-  border: 1px solid #3b619c;
-  background-color: #D0D0D0;
-  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
-  background-position: 0 -90px;
-  padding: 1px 0;
-  height: 22px;
-  font-family: arial, sans-serif;
-  font-size: 8pt;
-}
-div.toolbar ul {
-  margin: 0;
-  padding: 0;
-}
-div.toolbar ul li {
-  list-style: none;
-  margin: 0;
-  float: left;
-}
-div.toolbar a img {
-  opacity: 0.6;
-}
-div.toolbar a:hover img, div.toolbar a:focus img {
-  opacity: 1;
-}
-div.toolbar a {
-  display: block;
-  padding: 2px;
-  border: 1px solid transparent;
-  cursor: default;
-  width: auto;
-  color: #000000 !important;
-  margin: 0 2px;
-  max-height: 16px;
-  text-decoration: none;
-}
-div.toolbar a:hover, div.toolbar a:focus {
-  border: 1px solid #000080;
-  background-color: #ceceed;
-  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
-  background-position: 0 -118px;
-  color: #000000 !important;
-  text-decoration: none;
-}
-div.toolbar a:active {
-  background-color: #E0E0E0;
-  background-position: 0 -138px;
-}
-div.toolbar img {
-  margin: 0;
-  padding: 0;
-  display: inline;
-  border-width: 0px;
-}
-div.toolbar a span {
-  position: relative;
-  top: -3px !important;
-}
-div.toolbar a span.noimage {
-  position: relative;
-  top: 0px !important;
-  height: 16px !important;
-  display: block;
-  padding-left: 2px !important;
-}
-div.toolbar li span {
-  padding-left: 4px;
-  padding-right: 2px;
-  position: relative;
-  top: 4px;
-}
-
-/* vertical toolbar */
-div.toolbar_vert {
-  border: 1px solid #82aae2;
-  background-color: #c9ddf8;
-  padding: 2px 0;
-}
-div.toolbar_vert ul {
-  margin: 0;
-  padding: 0;
-}
-div.toolbar_vert ul li {
-  list-style: none;
-  margin: 0;
-}
-div.toolbar_vert a img {
-  opacity: 0.6;
-  /*filter: alpha(opacity=60);*/
-}
-div.toolbar_vert a:hover img {
-  opacity: 1;
-  /*filter: alpha(opacity=100);*/
-}
-div.toolbar_vert a {
-  display: block;
-  padding: 2px;
-  border: 1px solid transparent;
-  cursor: default;
-  width: auto;
-  color: #000000 !important;
-  margin: 0 2px;
-  max-height: 16px;
-  text-decoration: none;
-}
-div.toolbar_vert a:hover {
-  border: 1px solid #202090;
-  background-color: #ceceed;
-  color: #000000 !important;
-  text-decoration: none;
-  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
-  background-position: 0 -118px;
-}
-div.toolbar_vert a:active {
-  border: 1px solid #A0A0A0;
-  background-color: #E0E0E0;
-}
-div.toolbar_vert img {
-  margin: 0;
-  padding: 0;
-  display: inline;
-  border-width: 0px;
-}
-div.toolbar_vert a span {
-  position: relative;
-  top: -4px;
-}
-div.toolbar_vert li span {
-  padding-left: 2px;
-  padding-right: 5px;
-}
-
-div.toolbar_vert li > span {
-  display: block;
-  padding: 4px 5px;
-}
-

--- a/themes/enanium/css/babygrand.css	Wed Jul 08 23:39:31 2009 -0400
+++ b/themes/enanium/css/babygrand.css	Wed Jul 08 23:40:18 2009 -0400
@@ -4,10 +4,6 @@
  * Copyright (C) 2009 Dan Fuhry
  */
 
-/* Includes */
-@import url(../css-extra/jbox.css);
-@import url(../css-extra/toolbar.css);
-
 /* Core definitions - structure */
 
 html, body {
@@ -438,3 +434,237 @@
   text-decoration: underline;
   color: #f0f0f0 !important;
 }
+
+/*
+ * jBox menu system
+ */
+
+div.menu, div.menu_nojs {
+  background-image: url(../images/jbox.gif);
+  background-repeat: repeat-x;
+  background-color: #303030;
+  font-size: 7pt;
+  border-width: 0;
+}
+.menu_bg {
+  background-color: #303030;
+}
+div.menu ul, div.menu_nojs ul {
+  display: none;
+  position: absolute;
+  padding: 0;
+  margin: 0 !important;
+  background-color: #303030;
+  border-width: 0;
+  min-width: 120px;
+  text-transform: lowercase;
+}
+div.menu a, div.menu div.label, div.menu_nojs a, div.menu_nojs div.label {
+  padding: 2.5pt 5px;
+  margin-right: 3px;
+  text-decoration: none;
+  display: block;
+  float: left;
+  color: #b2b2b2;
+}
+div#content-wrapper div.menu a, div#content-wrapper div.menu_nojs a {
+  color: #b2b2b2;
+}
+div.menu div.label, div.menu_nojs div.label {
+  color: #808080;
+  cursor: default;
+}
+div.menu span.sep, div.menu_nojs span.sep {
+  display: block;
+  float: left;
+  width: 5px;
+}
+div.menu div.multopts, div.menu_nojs div.multopts {
+  line-height: 17pt;
+}
+div.menu div.multopts a, div.menu div.multopts div.label, div.menu_nojs div.multopts a, div.menu_nojs div.multopts div.label {
+  float: none;
+  display: inline;
+}
+div.menu a.liteselected, div.menu a.liteselected:hover, div.menu a:hover, div.menu_nojs a.liteselected, div.menu_nojs a.liteselected:hover, div.menu_nojs a:hover {
+  color: #c9c9c9;
+  background-color: #484848;
+  background-image: url(../images/jbox.gif);
+  background-position: 0 -32px;
+  background-repeat: repeat-x;
+}
+div.menu input[type ^="text"], div.menu input[type ^="password"], div.menu_nojs input[type ^="text"], div.menu_nojs input[type ^="password"] {
+  border-width: 0;
+  font-size: 9pt;
+  padding: 2px 5px 3px 5px;
+  max-width: 70px;
+  color: #a9a9a9;
+  background-color: #191919;
+}
+div.menu input[type ^="text"]:hover, div.menu input[type ^="password"]:hover, div.menu_nojs input[type ^="text"]:hover, div.menu_nojs input[type ^="password"]:hover {
+  background-color: #292929;
+}
+div.menu input[type ^="text"]:focus, div.menu input[type ^="password"]:focus, div.menu_nojs input[type ^="text"]:focus, div.menu_nojs input[type ^="password"]:focus {
+  background-color: #373737;
+}
+div.menu input[type ^="button"], div.menu input[type ^="submit"], div.menu_nojs input[type ^="button"], div.menu_nojs input[type ^="submit"] {
+  border-width: 0;
+  font-size: 9pt;
+  padding: 3px 5px;
+  max-width: 70px;
+}
+div.menu a.current, div.menu a.current:hover, div.menu a.selected, div.menu a.selected:hover, div.menu_nojs a.current, div.menu_nojs a.current:hover, div.menu_nojs a.selected, div.menu_nojs a.selected:hover {
+  color: #202020;
+  background-color: #FFFFFF;
+}
+div.menu a.current:hover, div.menu a.selected:hover, div.menu a.current.liteselected,
+div.menu_nojs a.current:hover, div.menu_nojs a.selected:hover, div.menu_nojs a.current.liteselected {
+  background-position: 0 -64px;
+}
+div.menu ul li, div.menu_nojs ul li {
+  list-style: none;
+}
+div.menu ul a, div.menu_nojs ul a {
+  float: none;
+  margin: 0;
+}
+
+/* toolbar */
+
+div.toolbar {
+  border: 1px solid #3b619c;
+  background-color: #D0D0D0;
+  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
+  background-position: 0 -90px;
+  padding: 1px 0;
+  height: 22px;
+  font-family: arial, sans-serif;
+  font-size: 8pt;
+}
+div.toolbar ul {
+  margin: 0;
+  padding: 0;
+}
+div.toolbar ul li {
+  list-style: none;
+  margin: 0;
+  float: left;
+}
+div.toolbar a img {
+  opacity: 0.6;
+}
+div.toolbar a:hover img, div.toolbar a:focus img {
+  opacity: 1;
+}
+div.toolbar a {
+  display: block;
+  padding: 2px;
+  border: 1px solid transparent;
+  cursor: default;
+  width: auto;
+  color: #000000 !important;
+  margin: 0 2px;
+  max-height: 16px;
+  text-decoration: none;
+}
+div.toolbar a:hover, div.toolbar a:focus {
+  border: 1px solid #000080;
+  background-color: #ceceed;
+  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
+  background-position: 0 -118px;
+  color: #000000 !important;
+  text-decoration: none;
+}
+div.toolbar a:active {
+  background-color: #E0E0E0;
+  background-position: 0 -138px;
+}
+div.toolbar img {
+  margin: 0;
+  padding: 0;
+  display: inline;
+  border-width: 0px;
+}
+div.toolbar a span {
+  position: relative;
+  top: -3px !important;
+}
+div.toolbar a span.noimage {
+  position: relative;
+  top: 0px !important;
+  height: 16px !important;
+  display: block;
+  padding-left: 2px !important;
+}
+div.toolbar li span {
+  padding-left: 4px;
+  padding-right: 2px;
+  position: relative;
+  top: 4px;
+}
+
+/* vertical toolbar */
+div.toolbar_vert {
+  border: 1px solid #82aae2;
+  background-color: #c9ddf8;
+  padding: 2px 0;
+}
+div.toolbar_vert ul {
+  margin: 0;
+  padding: 0;
+}
+div.toolbar_vert ul li {
+  list-style: none;
+  margin: 0;
+}
+div.toolbar_vert a img {
+  opacity: 0.6;
+  /*filter: alpha(opacity=60);*/
+}
+div.toolbar_vert a:hover img {
+  opacity: 1;
+  /*filter: alpha(opacity=100);*/
+}
+div.toolbar_vert a {
+  display: block;
+  padding: 2px;
+  border: 1px solid transparent;
+  cursor: default;
+  width: auto;
+  color: #000000 !important;
+  margin: 0 2px;
+  max-height: 16px;
+  text-decoration: none;
+}
+div.toolbar_vert a:hover {
+  border: 1px solid #202090;
+  background-color: #ceceed;
+  color: #000000 !important;
+  text-decoration: none;
+  background-image: url(../../oxygen/images/bleu/sprite-horiz.gif);
+  background-position: 0 -118px;
+}
+div.toolbar_vert a:active {
+  border: 1px solid #A0A0A0;
+  background-color: #E0E0E0;
+}
+div.toolbar_vert img {
+  margin: 0;
+  padding: 0;
+  display: inline;
+  border-width: 0px;
+}
+div.toolbar_vert a span {
+  position: relative;
+  top: -4px;
+}
+div.toolbar_vert li span {
+  padding-left: 2px;
+  padding-right: 5px;
+}
+
+div.toolbar_vert li > span {
+  display: block;
+  padding: 4px 5px;
+}
+