diff --git a/modules/themeroller/data/admin_views/admin.html.php b/modules/themeroller/data/admin_views/admin.html.php
index 6b0c3fe5..b77a8d46 100644
--- a/modules/themeroller/data/admin_views/admin.html.php
+++ b/modules/themeroller/data/admin_views/admin.html.php
@@ -16,7 +16,6 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
diff --git a/modules/themeroller/data/views/page.html.php b/modules/themeroller/data/views/page.html.php
index 9f94b04f..ffd5a173 100644
--- a/modules/themeroller/data/views/page.html.php
+++ b/modules/themeroller/data/views/page.html.php
@@ -27,7 +27,6 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lte IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
diff --git a/modules/themeroller/views/admin_screen.css.php b/modules/themeroller/views/admin_screen.css.php
index 864f46a8..291166e7 100644
--- a/modules/themeroller/views/admin_screen.css.php
+++ b/modules/themeroller/views/admin_screen.css.php
@@ -8,11 +8,11 @@
  *  2)  Reusable content blocks
  *  3)  Page layout containers
  *  4)  Content blocks in specific layout containers
- *  5)  Navigation and menus
- *  6)  jQuery and jQuery UI
- *  7)  Module color overrides
- *  8)  Forms
- *  9)  States and interactions
+ *  5)  States and interactions
+ *  6)  Positioning and order
+ *  7)  Navigation and menus
+ *  8)  jQuery and jQuery UI
+ *  9)  Module color overrides
  * 10)  Right-to-left language styles
  *
  * @todo Review g-buttonset-vertical
@@ -28,7 +28,7 @@ html {
 body, html {
   background-color: #<?= $bgColorDefault ?>;
   font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; /* ffDefault */
-  font-size: 13px/1.231; /* fsDefault/ gallery_line_height */
+  //font-size: 13px/1.231; /* fsDefault/ gallery_line_height */
 }
 
 p {
@@ -99,6 +99,172 @@ a:hover,
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+form {
+  margin: 0;
+}
+
+fieldset {
+  border: 1px solid #<?= $borderColorContent ?>;
+  padding: 0 1em .8em 1em;
+}
+
+#g-banner fieldset,
+#g-sidebar fieldset {
+  border: none;
+  padding: 0;
+}
+
+legend {
+  font-weight: bold;
+  color: #<?= $fcDefault ?>;
+  padding: 0 .2em;
+}
+
+#g-banner legend,
+#g-sidebar legend,
+input[type="hidden"] {
+  display: none;
+}
+
+input.textbox,
+input[type="text"],
+input[type="password"],
+textarea {
+  background-color: #<?= $bgColorDefault ?>;
+  border: 1px solid #<?= $borderColorActive ?>;
+  border-top-color: #<?= $borderColorContent ?>;
+  border-left-color: #<?= $borderColorContent ?>;
+  clear: both;
+  color: #<?= $fcContent ?>;
+  width: 50%;
+}
+
+textarea {
+  height: 12em;
+  width: 97%;
+}
+
+input:focus,
+input.textbox:focus,
+input[type=text]:focus,
+textarea:focus,
+option:focus {
+  background-color: #<?= $bgColorActive ?>;
+  color: #<?= $fcContent ?>;
+}
+
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: left;
+  margin-right: .4em;
+}
+
+/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+form li {
+  margin: 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
+}
+
+form ul ul {
+  clear: both;
+}
+
+form ul ul li {
+  float: left;
+}
+
+input,
+select,
+textarea {
+  display: block;
+  clear: both;
+  padding: .2em;
+}
+
+input[type="submit"],
+input[type="reset"] {
+  display: inline;
+  clear: none;
+  float: left;
+}
+
+/* Forms in dialogs and panels ~~~~~~~~~ */
+
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
+  border: none;
+  padding: 0;
+}
+
+#g-panel legend {
+  display: none;
+}
+
+label,
+input[readonly] {
+  background-color: #<?= $bgColorContent ?>;
+  color: #<?= $fcDefault ?>;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+  width: 97%;
+}
+
+/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-short-form legend,
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0;
+}
+
+.g-short-form li {
+  float: left;
+  margin: 0 !important;
+  padding: .4em 0;
+}
+
+.g-short-form .textbox,
+.g-short-form input[type=text] {
+  background-color: <?= $bgColorDefault ?>;
+  color: #<?= $fcContent ?>;
+  padding: .3em .6em;
+  width: 100%;
+}
+
+.g-short-form .textbox.g-error {
+  border: 1px solid #<?= $borderColorError ?>;
+  color: #<?= $fcError ?>;
+  padding-left: 24px;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  margin: .3em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
 
 fieldset {
   margin-bottom: 1em;
@@ -144,12 +310,17 @@ th {
   white-space: nowrap;
 }
 
-.g-even {
-  background-color: #<?= $bgColorContent ?>;
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+  font-size: .8em;
 }
 
-.g-odd {
-  background-color: #<?= $bgColorDefault ?>
+.g-text-big {
+  font-size: 1.2em;
+}
+
+.g-text-right {
+  text-align: right;
 }
 
 /** *******************************************************************
@@ -158,11 +329,13 @@ th {
 
 .g-block,
 #g-content #g-admin-dashboard .g-block {
+  background-color: #<?= $bgColorContent ?>;
   border: 1px solid #<?= $borderColorContent ?>;
   padding: 1em;
 }
 
 .g-block h2 {
+  background-color: #<?= $fcContent ?>;
   padding: .3em .8em;
 }
 
@@ -209,7 +382,8 @@ th {
 }
 
 .g-unavailable {
-  border-color: #<?= $fcHeader ?>;
+  border-color: #<?= $bgColorHeader ?>;
+  color: <?= $fcDefault ?>;
   opacity: 0.4;
 }
 
@@ -241,9 +415,38 @@ th {
   background-color: #<?= $bgColorContent ?>;
 }
 
+ul.enumeration li {
+  list-style-type: disc;
+  margin-left: 20px;
+}
+
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
+/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+.g-one-quarter {
+  width: 25%;
+}
+
+.g-one-third {
+  width: 33%;
+}
+
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
+}
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -339,10 +542,11 @@ th {
 /* Photo stream ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-photo-stream {
+  background-color: #<?= $bgColorDefault ?>;
 }
 
 #g-photo-stream .g-block-content ul {
-  border-right: 1px solid #e8e8e8;
+  border-right: 1px solid #<?= $bgColorDefault ?>;
   height: 135px;
   overflow: auto;
   overflow: -moz-scrollbars-horizontal; /* for FF */
@@ -450,178 +654,20 @@ th {
   color: #<?= $fcHighlight ?> !important;
 }
 
-/** *******************************************************************
- * 5) Navigation and menus
- *********************************************************************/
-
-/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-banner #g-login-menu {
-  color: #<?= $fcHeader ?>;
-  float: right;
+/* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-share-translations-form fieldset {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
 }
 
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
-/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-site-admin-menu {
-  bottom: 0;
-  font-size: 1.2em;
-  left: 140px;
-  position: absolute;
-}
-
-#g-site-admin-menu ul {
-  margin-bottom: 0;
+#g-share-translations-form fieldset legend {
+  display: none;
 }
 
 /** *******************************************************************
- * 6) jQuery and jQuery UI
- *********************************************************************/
-
-/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-.sf-menu a {
-  border-left:1px solid #<?= $borderColorContent ?>;
-}
-
-.sf-menu li,
-.sf-menu li li,
-.sf-menu li li ul li {
-  background-color: #<?= $bgColorDefault ?>;
-}
-
-.sf-menu li:hover {
-  background-color: #<?= $bgColorHover ?>;
-}
-
-.sf-menu li:hover,
-.sf-menu li.sfHover,
-.sf-menu a:focus,
-.sf-menu a:hover,
-.sf-menu a:active {
-  background-color: #<?= $bgColorHover ?> !important;
-}
-
-.sf-sub-indicator {
-  background-image: url("themeroller/images/ui-icons_<?= $iconColorHighlight ?>_256x240.png");
-  height: 16px;
-  width: 16px;
-}
-
-a > .sf-sub-indicator {
-  background-position: -64px -16px !important;
-  top: 0.6em;
-}
-
-.sf-menu ul a > .sf-sub-indicator {
-  background-position: -32px -16px !important;
-}
-
-/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
-
-.ui-widget-overlay {
-  background: #<?= $bgColorOverlay ?>;
-  opacity: .7;
-}
-
-#g-admin-dashboard .ui-state-highlight,
-#g-sidebar .ui-state-highlight {
-  height: 2em;
-  margin-bottom: 1em;
-}
-
-.g-buttonset-vertical a {
-  width: 8em !important;
-}
-
-#g-admin-dashboard .ui-dialog-titlebar,
-#g-admin-dashboard-sidebar .ui-dialog-titlebar {
-  padding: .2em .4em;
-}
-
-/** *******************************************************************
- * 7) Module color overrides
- *********************************************************************/
-
-/* User admin form ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-user-admin-list .g-admin {
-  color: #<?= $fcDefault ?> !important;
-  font-weight: bold;
-}
-
-.g-group {
-  border: 1px solid #<?= $borderColorContent ?> !important;
-}
-
-.g-group h4 {
-  background-color: #<?= $bgColorDefault ?> !important;
-  border-bottom: 1px dashed #<?= $fcDefault ?> !important;
-}
-
-.g-default-group h4,
-.g-default-group .g-user {
-  color: #<?= $fcDefault ?> !important;
-}
-
-/** *******************************************************************
- * 8) Forms
- *********************************************************************/
-fieldset {
-  border: 1px solid #<?= $borderColorContent ?>;
-}
-
-legend {
-  font-weight: bold;
-  color: #<?= $fcDefault ?>;
-}
-
-input.textbox,
-input[type="text"],
-input[type="password"],
-textarea {
-  background-color: #<?= $bgColorDefault ?>;
-  border: 1px solid #<?= $borderColorActive ?>;
-  border-top-color: #<?= $borderColorContent ?>;
-  border-left-color: #<?= $borderColorContent ?>;
-  color: #<?= $fcContent ?>;
-}
-
-input:focus,
-input.textbox:focus,
-input[type=text]:focus,
-textarea:focus,
-option:focus {
-  background-color: #<?= $bgColorActive ?>;
-  color: #<?= $fcContent ?>;
-}
-
-/* Forms in dialogs and panels ~~~~~~~~~ */
-
-label,
-input[readonly] {
-  background-color: #<?= $bgColorContent ?>;
-  color: #<?= $fcDefault ?>;
-}
-
-/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.g-short-form .textbox,
-.g-short-form input[type=text] {
-  background-color: <?= $bgColorDefault ?>;
-  color: #<?= $fcContent ?>;
-}
-
-.g-short-form .textbox.g-error {
-  border: 1px solid #<?= $borderColorError ?>;
-  color: #<?= $fcError ?>;
-}
-
-/** *******************************************************************
- * 9) States and interactions
- *********************************************************************/
+ *  5) States and interactions
+ **********************************************************************/
 
 .g-draggable:hover {
   border: 1px dashed #<?= $bgColorHighlight ?>;
@@ -743,9 +789,606 @@ form .g-error {
 }
 
 /** *******************************************************************
- * 10) Right to left styles
+ *  6) Positioning and order
+ **********************************************************************/
+
+.g-left {
+  clear: none;
+  float: left;
+}
+
+.g-right {
+  clear: none;
+  float: right;
+}
+
+.g-first {
+}
+
+.g-last {
+}
+
+.g-even {
+  background-color: #<?= $bgColorContent ?>;
+}
+
+.g-odd {
+  background-color: #<?= $bgColorDefault ?>;
+}
+
+
+/** *******************************************************************
+ *  7) Navigation and menus
  *********************************************************************/
 
+/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-banner #g-login-menu {
+  color: #<?= $fcHeader ?>;
+  float: right;
+}
+
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
+/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-site-admin-menu {
+  bottom: 0;
+  font-size: 1.2em;
+  left: 140px;
+  position: absolute;
+}
+
+#g-site-admin-menu ul {
+  margin-bottom: 0;
+}
+
+/** *******************************************************************
+ *  8) jQuery and jQuery UI
+ *********************************************************************/
+/* Generic block container ~~~~~~~~~~~~~~~ */
+
+.g-block {
+  clear: both;
+  margin-bottom: 2.5em;
+}
+
+.g-block-content {
+}
+
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+button {
+  padding: 2px 4px 2px 4px;
+}
+
+/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */
+
+.g-buttonset {
+  padding-left: 1px;
+}
+
+.g-buttonset li {
+  float: left;
+}
+
+.g-buttonset .g-button {
+  margin: 0;
+}
+
+.ui-icon-left .ui-icon {
+  float: left;
+  margin-right: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  float: right;
+  margin-left: .2em;
+}
+
+/* Rotate icon, ThemeRoller only provides one of these */
+
+.ui-icon-rotate-ccw {
+  background-position: -192px -64px;
+}
+
+.ui-icon-rotate-cw {
+  background-position: -208px -64px;
+}
+
+.g-progress-bar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+/* Status and validation messages ~~~~ */
+
+.g-message-block {
+  background-position: .4em .3em;
+  border: 1px solid #ccc;
+  padding: 0;
+}
+
+#g-action-status {
+  margin-bottom: 1em;
+}
+
+#g-action-status li,
+p#g-action-status,
+div#g-action-status {
+  padding: .3em .3em .3em 30px;
+}
+
+#g-site-status li {
+  border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
+}
+
+.g-module-status {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.g-message {
+  background-position: 0 50%;
+}
+
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  clear: both;
+  padding: 0 20px;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: 1em 8px 1em 18px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator {
+  padding: .2em 0;
+  width: 100%;
+}
+
+.g-paginator li {
+  float: left;
+  width: 30%;
+}
+
+.g-paginator .g-info {
+  background: none;
+  padding: .2em 0;
+  text-align: center;
+  width: 40%;
+}
+
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog .g-cancel {
+  margin: .4em 1em;
+}
+
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
+/* Inline layout  ~~~~~~~~~~ */
+
+.g-inline li {
+  float: left;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
+}
+
+.g-inline li.g-first {
+  margin-left: 0;
+}
+
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+.sf-menu ul {
+  width: 12em;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+  left:	12em;
+}
+
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+  left: 12em;
+}
+.sf-menu a {
+  border-left:1px solid #<?= $borderColorContent ?>;
+}
+
+.sf-menu li,
+.sf-menu li li,
+.sf-menu li li ul li {
+  background-color: #<?= $bgColorDefault ?>;
+}
+
+.sf-menu li:hover {
+  background-color: #<?= $bgColorHover ?>;
+}
+
+.sf-menu li:hover,
+.sf-menu li.sfHover,
+.sf-menu a:focus,
+.sf-menu a:hover,
+.sf-menu a:active {
+  background-color: #<?= $bgColorHover ?> !important;
+}
+
+.sf-sub-indicator {
+  background-image: url("themeroller/images/ui-icons_<?= $iconColorHighlight ?>_256x240.png");
+  height: 16px;
+  width: 16px;
+}
+
+a > .sf-sub-indicator {
+  background-position: -64px -16px !important;
+  top: 0.6em;
+}
+
+.sf-menu ul a > .sf-sub-indicator {
+  background-position: -32px -16px !important;
+}
+
+/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
+.ui-widget-overlay {
+  background: #<?= $bgColorOverlay ?>;
+  opacity: .7;
+}
+
+#g-admin-dashboard .ui-state-highlight,
+#g-sidebar .ui-state-highlight {
+  height: 2em;
+  margin-bottom: 1em;
+}
+
+.g-buttonset-vertical a {
+  width: 8em !important;
+}
+
+#g-admin-dashboard .ui-dialog-titlebar,
+#g-admin-dashboard-sidebar .ui-dialog-titlebar {
+  padding: .2em .4em;
+}
+
+/** *******************************************************************
+ *  9) Module color overrides
+ *********************************************************************/
+
+/* User admin form ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-user-admin-list .g-admin {
+  color: #<?= $fcDefault ?> !important;
+  font-weight: bold;
+}
+
+.g-group {
+  border: 1px solid #<?= $borderColorContent ?> !important;
+}
+
+.g-group h4 {
+  background-color: #<?= $bgColorDefault ?> !important;
+  border-bottom: 1px dashed #<?= $fcDefault ?> !important;
+}
+
+.g-default-group h4,
+.g-default-group .g-user {
+  color: #<?= $fcDefault ?> !important;
+}
+
+/** *******************************************************************
+ *  10) Right to left styles
+ *********************************************************************/
+
+.rtl {
+  direction: rtl;
+}
+
+.rtl #g-header,
+.rtl #g-content,
+.rtl #g-sidebar,
+.rtl #g-footer,
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.rtl .g-context-menu li a,
+.rtl .g-message-box li,
+.rtl #g-site-status li {
+  text-align: right;
+}
+
+.rtl .g-text-right {
+  text-align: left;
+}
+
+.rtl .g-error,
+.rtl .g-info,
+.rtl .g-success,
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-paginator li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon,
+.rtl .g-short-form li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl input.checkbox,
+.rtl input[type=checkbox],
+.rtl input.radio,
+.rtl input[type=radio] {
+  float: right;
+}
+
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
+.rtl .g-inline li {
+  margin-right: 1em;
+}
+
+.rtl .g-inline li.g-first {
+  margin-right: 0;
+}
+
+.rtl .g-breadcrumbs li {
+  background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.rtl .g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+.rtl input.checkbox {
+  margin-left: .4em;
+}
+
+.rtl #g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.rtl .ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.rtl .ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .g-buttonset .ui-corner-tl {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-tr {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-bl {
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-br {
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-right,
+.rtl .ui-progressbar .ui-corner-right {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-left,
+.rtl .ui-progressbar .ui-corner-left {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a {
+  border-left: none;
+  border-right:1px solid #<?= $borderColorContent ?>;
+}
+
+.rtl .sf-menu a.sf-with-ul {
+  padding-left: 2.25em;
+  padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+  background: url("themeroller/images/ui-icons_<?= $fcDefault ?>_256x240.png") no-repeat -96px -16px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+  left: .75em !important;
+  right: auto;
+}
+
+.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+  top: .8em;
+  background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+.rtl a:focus > .sf-sub-indicator,
+.rtl a:hover > .sf-sub-indicator,
+.rtl a:active > .sf-sub-indicator,
+.rtl li:hover > a > .sf-sub-indicator,
+.rtl li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
+.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
+/* apply hovers to modern browsers */
+.rtl .sf-menu ul a:focus > .sf-sub-indicator,
+.rtl .sf-menu ul a:hover > .sf-sub-indicator,
+.rtl .sf-menu ul a:active > .sf-sub-indicator,
+.rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
+.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 0; /* arrow hovers for modern browsers*/
+}
+
+.rtl .sf-menu li:hover ul,
+.rtl .sf-menu li.sfHover ul {
+  right: 0;
+  left: auto;
+}
+
+.rtl ul.sf-menu li li:hover ul,
+.rtl ul.sf-menu li li.sfHover ul {
+  right: 12em; /* match ul width */
+  left: auto;
+}
+.rtl ul.sf-menu li li li:hover ul,
+.rtl ul.sf-menu li li li.sfHover ul {
+  right: 12em; /* match ul width */
+  left: auto;
+}
+
+/*** shadows for all but IE6 ***/
+.rtl .sf-shadow ul {
+  background: url('../images/superfish-shadow.png') no-repeat bottom left;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-top-right-radius: 0;
+  -webkit-border-bottom-left-radius: 0;
+  -moz-border-radius-topleft: 17px;
+  -moz-border-radius-bottomright: 17px;
+  -webkit-border-top-left-radius: 17px;
+  -webkit-border-bottom-right-radius: 17px;
+  border-top-left-radius: 17px;
+  border-bottom-right-radius: 17px;
+}
+
+/* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.rtl .ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.rtl .ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-theme,
 .rtl #g-admin-theme,
@@ -783,29 +1426,3 @@ form .g-error {
   margin: 0 0 1em 1em;
 }
 
-/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.rtl .sf-menu a {
-  border-right:1px solid #<?= $borderColorContent ?>;
-}
-
-.rtl .sf-sub-indicator {
-  background: url("themeroller/images/ui-icons_<?= $fcDefault ?>_256x240.png") no-repeat -96px -16px; /* 8-bit indexed alpha png. IE6 gets solid image only */
-}
-
-/*** shadows for all but IE6 ***/
-.rtl .sf-shadow ul {
-  background: url('../images/superfish-shadow.png') no-repeat bottom left;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 0;
-  -moz-border-radius-topright: 0;
-  -moz-border-radius-bottomleft: 0;
-  -webkit-border-top-right-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -moz-border-radius-topleft: 17px;
-  -moz-border-radius-bottomright: 17px;
-  -webkit-border-top-left-radius: 17px;
-  -webkit-border-bottom-right-radius: 17px;
-  border-top-left-radius: 17px;
-  border-bottom-right-radius: 17px;
-}
diff --git a/modules/themeroller/views/site_screen.css.php b/modules/themeroller/views/site_screen.css.php
index b1bcc79f..d74d6707 100644
--- a/modules/themeroller/views/site_screen.css.php
+++ b/modules/themeroller/views/site_screen.css.php
@@ -11,7 +11,6 @@
  *  4)  Content blocks in specific layout containers
  *  5)  Navigation and menus
  *  6)  jQuery and jQuery UI
- *  7)  Forms
  *  8)  States and interactions
  *  9)  Organize module style
  * 10)  Tag module styles
@@ -19,7 +18,7 @@
  */
 
 /** *******************************************************************
- * 1) Font sizes, base HTML elements
+ *  1) Font sizes, base HTML elements
  **********************************************************************/
 html {
   color: #<?= $fcDefault ?>;
@@ -28,7 +27,7 @@ html {
 body, html {
   background-color: #<?= $bgColorDefault ?>;
   font-family: <?= urldecode($ffDefault) ?>;
-  font-size: 13px/1.231;   /*  gallery_line_height */
+//  font-size: 13px/1.231;   /*  gallery_line_height */
 }
 
 p {
@@ -124,6 +123,172 @@ a:hover,
   padding-left: 32px;
 }
 
+/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+form {
+  margin: 0;
+}
+
+fieldset {
+  border: 1px solid #<?= $borderColorContent ?>;
+  padding: 0 1em .8em 1em;
+}
+
+#g-banner fieldset,
+#g-sidebar fieldset {
+  border: none;
+  padding: 0;
+}
+
+legend {
+  font-weight: bold;
+  color: #<?= $fcDefault ?>;
+}
+
+#g-banner legend,
+#g-sidebar legend,
+input[type="hidden"] {
+  display: none;
+}
+
+input.textbox,
+input[type="text"],
+input[type="password"],
+textarea {
+  background-color: #<?= $bgColorDefault ?>;
+  border: 1px solid #<?= $borderColorActive ?>;
+  border-top-color: #<?= $borderColorContent ?>;
+  border-left-color: #<?= $borderColorContent ?>;
+  clear: both;
+  color: #<?= $fcContent ?>;
+  width: 50%;
+}
+
+textarea {
+  height: 12em;
+  width: 97%;
+}
+
+input:focus,
+input.textbox:focus,
+input[type=text]:focus,
+textarea:focus,
+option:focus {
+  background-color: #<?= $bgColorActive ?>;
+  color: #<?= $fcContent ?>;
+}
+
+
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: left;
+  margin-right: .4em;
+}
+
+/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+form li {
+  margin: 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
+}
+
+form ul ul {
+  clear: both;
+}
+
+form ul ul li {
+  float: left;
+}
+
+input,
+select,
+textarea {
+  display: block;
+  clear: both;
+  padding: .2em;
+}
+
+input[type="submit"],
+input[type="reset"] {
+  display: inline;
+  clear: none;
+  float: left;
+}
+
+/* Forms in dialogs and panels ~~~~~~~~~ */
+
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
+  border: none;
+  padding: 0;
+}
+
+#g-panel legend {
+  display: none;
+}
+
+label,
+input[readonly] {
+  background-color: #<?= $bgColorContent ?>;
+  color: #<?= $fcDefault ?>;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+  width: 97%;
+}
+
+/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-short-form legend,
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0;
+}
+
+.g-short-form li {
+  float: left;
+  margin: 0 !important;
+  padding: .4em 0;
+}
+
+.g-short-form .textbox,
+.g-short-form input[type=text] {
+  background-color: <?= $bgColorDefault ?>
+  color: #<?= $fcContent ?>;
+}
+
+.g-short-form .textbox.g-error {
+  border: 1px solid #<?= $borderColorError ?>;
+  color: #<?= $fcError ?>;
+}
+
+
+.g-short-form .g-cancel {
+  display: block;
+  margin: .3em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 /* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 table {
@@ -150,16 +315,21 @@ td {
   vertical-align: top;
 }
 
-.g-even {
-  background-color: #<?= $bgColorContent ?>;
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+  font-size: .8em;
 }
 
-.g-odd {
-  background-color: #<?= $bgColorDefault ?>;
+.g-text-big {
+  font-size: 1.2em;
+}
+
+.g-text-right {
+  text-align: right;
 }
 
 /** *******************************************************************
- * 2) Reusable content blocks
+ *  2) Reusable content blocks
  *********************************************************************/
 
 .g-block h2 {
@@ -171,10 +341,36 @@ td {
   margin-top: 1em;
 }
 
-/*** ******************************************************************
- * 3) Page layout containers
+/** *******************************************************************
+ *  3) Page layout containers
  *********************************************************************/
 
+
+/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+.g-one-quarter {
+  width: 25%;
+}
+
+.g-one-third {
+  width: 33%;
+}
+
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
+}
+
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-view {
@@ -281,7 +477,7 @@ td {
 }
 
 /** *******************************************************************
- * 4) Content blocks in specific layout containers
+ *  4) Content blocks in specific layout containers
  *********************************************************************/
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -456,7 +652,145 @@ td {
 }
 
 /** *******************************************************************
- * 5) Navigation and menus
+ *  5) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-selected,
+.g-highlight {
+  font-weight: bold;
+}
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-deselected,
+.g-understate {
+  color: #<?= $borderColorContent ?>;
+  font-weight: normal;
+}
+
+.g-editable:hover {
+  background-color: #<?= $bgColorActive ?>;
+  color: #<?= $iconColorActive ?>
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  background-image: none;
+}
+
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
+  border: 2px solid #<?= $fcError ?>;
+}
+
+.g-error,
+tr.g-error td.g-error,
+#g-add-photos-status .g-error {
+  background: #<?= $borderColorError ?> url('../images/ico-error.png') no-repeat .4em 50%;
+  color: #<?= $fcError ?>;
+}
+
+.g-info {
+  background: #<?= $bgColorContent ?> url('../images/ico-info.png') no-repeat .4em 50%;
+}
+
+.g-success,
+#g-add-photos-status .g-success {
+  background: #<?= $bgColorContent ?> url('../images/ico-success.png') no-repeat .4em 50%;
+}
+
+tr.g-success {
+  background-image: none;
+}
+
+tr.g-success td.g-success {
+  background-image: url('../images/ico-success.png');
+}
+
+.g-warning,
+tr.g-warning td.g-warning {
+  background: #<?= $bgColorWarning ?> url('../images/ico-warning.png') no-repeat .4em 50%;
+  color: #<?= $fcWarning ?>;
+}
+
+form .g-error {
+  background-color: #<?= $bgColorError ?>;
+}
+
+.g-default {
+  background-color: #<?= $bgColorDefault ?>;
+  font-weight: bold;
+}
+
+.g-draggable:hover {
+  border: 1px dashed #<?= $bgColorHighlight ?>;
+}
+
+.ui-sortable .g-target,
+.ui-state-highlight {
+  background-color: #<?= $bgColorHighlight ?>;
+  border: 2px dotted #<?= $borderColorHighlight ?>;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.g-loading-large,
+.g-dialog-loading-large {
+  background: #<?= $bgColorContent ?> url('../images/loading-large.gif') no-repeat center center !important;
+}
+
+.g-loading-small {
+  background: #<?= $bgColorContent ?> url('../images/loading-small.gif') no-repeat center center !important;
+}
+
+/** *******************************************************************
+ *  6) Positioning and order
+ **********************************************************************/
+
+.g-left {
+  clear: none;
+  float: left;
+}
+
+.g-right {
+  clear: none;
+  float: right;
+}
+
+.g-first {
+}
+
+.g-last {
+}
+
+.g-even {
+  background-color: #<?= $bgColorContent ?>;
+}
+
+.g-odd {
+  background-color: #<?= $bgColorDefault ?>;
+}
+
+/** *******************************************************************
+ *  7) Navigation and menus
  *********************************************************************/
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -554,27 +888,34 @@ td {
 }
 
 /** *******************************************************************
- * 6) jQuery and jQuery UI
+ *  8) jQuery and jQuery UI
  *********************************************************************/
 
-/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+/* Generic block container ~~~~~~~~~~~~~~~ */
 
-.ui-widget-overlay {
-  background: #<?= $bgColorOverlay ?>;
-  opacity: .7;
+.g-block {
+  clear: both;
+  margin-bottom: 2.5em;
 }
 
-/* Rotate icon, ThemeRoller only provides one of these */
-
-.ui-icon-rotate-ccw {
-  background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
-  background-position: -208px -64px;
+.g-block-content {
 }
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+.sf-menu ul {
+	width: 12em;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:	12em;
+}
+
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left: 12em;
+}
+
 .sf-menu a {
   border-left:1px solid #<?= $borderColorContent ?>;
 }
@@ -612,172 +953,187 @@ a > .sf-sub-indicator {
   background-position: -32px -16px !important;
 }
 
-/** *******************************************************************
- * 7) Forms
- *********************************************************************/
-fieldset {
-  border: 1px solid #<?= $borderColorContent ?>;
+/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
+.ui-widget-overlay {
+  background: #<?= $bgColorOverlay ?>;
+  opacity: .7;
 }
 
-legend {
-  font-weight: bold;
-  color: #<?= $fcDefault ?>;
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
 }
 
-input.textbox,
-input[type="text"],
-input[type="password"],
-textarea {
-  background-color: #<?= $bgColorDefault ?>;
-  border: 1px solid #<?= $borderColorActive ?>;
-  border-top-color: #<?= $borderColorContent ?>;
-  border-left-color: #<?= $borderColorContent ?>;
-  color: #<?= $fcContent ?>;
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
 }
 
-input:focus,
-input.textbox:focus,
-input[type=text]:focus,
-textarea:focus,
-option:focus {
-  background-color: #<?= $bgColorActive ?>;
-  color: #<?= $fcContent ?>;
+button {
+  padding: 2px 4px 2px 4px;
 }
 
-/* Forms in dialogs and panels ~~~~~~~~~ */
+/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */
 
-label,
-input[readonly] {
-  background-color: #<?= $bgColorContent ?>;
-  color: #<?= $fcDefault ?>;
+.g-buttonset {
+  padding-left: 1px;
 }
 
-/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.g-short-form .textbox,
-.g-short-form input[type=text] {
-  background-color: <?= $bgColorDefault ?>
-  color: #<?= $fcContent ?>;
+.g-buttonset li {
+  float: left;
 }
 
-.g-short-form .textbox.g-error {
-  border: 1px solid #<?= $borderColorError ?>;
-  color: #<?= $fcError ?>;
+.g-buttonset .g-button {
+  margin: 0;
+}
+
+.ui-icon-left .ui-icon {
+  float: left;
+  margin-right: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  float: right;
+  margin-left: .2em;
+}
+
+/* Rotate icon, ThemeRoller only provides one of these */
+
+.ui-icon-rotate-ccw {
+  background-position: -192px -64px;
+}
+
+.ui-icon-rotate-cw {
+  background-position: -208px -64px;
+}
+
+.g-progress-bar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+/* Status and validation messages ~~~~ */
+
+.g-message-block {
+  background-position: .4em .3em;
+  border: 1px solid #ccc;
+  padding: 0;
+}
+
+#g-action-status {
+  margin-bottom: 1em;
+}
+
+#g-action-status li,
+p#g-action-status,
+div#g-action-status {
+  padding: .3em .3em .3em 30px;
+}
+
+#g-site-status li {
+  border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
+}
+
+.g-module-status {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.g-message {
+  background-position: 0 50%;
+}
+
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  clear: both;
+  padding: 0 20px;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: 1em 8px 1em 18px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator {
+  padding: .2em 0;
+  width: 100%;
+}
+
+.g-paginator li {
+  float: left;
+  width: 30%;
+}
+
+.g-paginator .g-info {
+  background: none;
+  padding: .2em 0;
+  text-align: center;
+  width: 40%;
+}
+
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog .g-cancel {
+  margin: .4em 1em;
+}
+
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
+/* Inline layout  ~~~~~~~~~~ */
+
+.g-inline li {
+  float: left;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
+}
+
+.g-inline li.g-first {
+  margin-left: 0;
 }
 
 /** *******************************************************************
- * 8) States and interactions
- *********************************************************************/
-
-.g-active,
-.g-enabled,
-.g-available,
-.g-selected,
-.g-highlight {
-  font-weight: bold;
-}
-
-.g-inactive,
-.g-disabled,
-.g-unavailable,
-.g-uneditable,
-.g-locked,
-.g-deselected,
-.g-understate {
-  color: #<?= $borderColorContent ?>;
-  font-weight: normal;
-}
-
-.g-editable:hover {
-  background-color: #<?= $bgColorActive ?>;
-  color: #<?= $iconColorActive ?>
-}
-
-form li.g-error,
-form li.g-info,
-form li.g-success,
-form li.g-warning {
-  background-image: none;
-}
-
-
-form.g-error input[type="text"],
-li.g-error input[type="text"],
-form.g-error input[type="password"],
-li.g-error input[type="password"],
-form.g-error input[type="checkbox"],
-li.g-error input[type="checkbox"],
-form.g-error input[type="radio"],
-li.g-error input[type="radio"],
-form.g-error textarea,
-li.g-error textarea,
-form.g-error select,
-li.g-error select {
-  border: 2px solid #<?= $fcError ?>;
-}
-
-.g-error,
-tr.g-error td.g-error,
-#g-add-photos-status .g-error {
-  background: #<?= $borderColorError ?> url('../images/ico-error.png') no-repeat .4em 50%;
-  color: #<?= $fcError ?>;
-}
-
-.g-info {
-  background: #<?= $bgColorContent ?> url('../images/ico-info.png') no-repeat .4em 50%;
-}
-
-.g-success,
-#g-add-photos-status .g-success {
-  background: #<?= $bgColorContent ?> url('../images/ico-success.png') no-repeat .4em 50%;
-}
-
-tr.g-success {
-  background-image: none;
-}
-
-tr.g-success td.g-success {
-  background-image: url('../images/ico-success.png');
-}
-
-.g-warning,
-tr.g-warning td.g-warning {
-  background: #<?= $bgColorWarning ?> url('../images/ico-warning.png') no-repeat .4em 50%;
-  color: #<?= $fcWarning ?>;
-}
-
-form .g-error {
-  background-color: #<?= $bgColorError ?>;
-}
-
-.g-default {
-  background-color: #<?= $bgColorDefault ?>;
-  font-weight: bold;
-}
-
-.g-draggable:hover {
-  border: 1px dashed #<?= $bgColorHighlight ?>;
-}
-
-.ui-sortable .g-target,
-.ui-state-highlight {
-  background-color: #<?= $bgColorHighlight ?>;
-  border: 2px dotted #<?= $borderColorHighlight ?>;
-}
-
-/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
-
-.g-loading-large,
-.g-dialog-loading-large {
-  background: #<?= $bgColorContent ?> url('../images/loading-large.gif') no-repeat center center !important;
-}
-
-.g-loading-small {
-  background: #<?= $bgColorContent ?> url('../images/loading-small.gif') no-repeat center center !important;
-}
-
-/** *******************************************************************
- * 9) Organize module style
+ *  9) Organize module style
  *********************************************************************/
 #g-organize {
   background-color: #<?= $bgColorContent ?>;
@@ -860,6 +1216,291 @@ form .g-error {
  * 11) Right to left language styles
  *********************************************************************/
 
+.rtl {
+  direction: rtl;
+}
+
+.rtl #g-header,
+.rtl #g-content,
+.rtl #g-sidebar,
+.rtl #g-footer,
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.rtl .g-context-menu li a,
+.rtl .g-message-box li,
+.rtl #g-site-status li {
+  text-align: right;
+}
+
+.rtl .g-text-right {
+  text-align: left;
+}
+
+.rtl .g-error,
+.rtl .g-info,
+.rtl .g-success,
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-paginator li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon,
+.rtl .g-short-form li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl input.checkbox,
+.rtl input[type=checkbox],
+.rtl input.radio,
+.rtl input[type=radio] {
+  float: right;
+}
+
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
+.rtl .g-inline li {
+  margin-right: 1em;
+}
+
+.rtl .g-inline li.g-first {
+  margin-right: 0;
+}
+
+.rtl .g-breadcrumbs li {
+  background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.rtl .g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+.rtl input.checkbox {
+  margin-left: .4em;
+}
+
+.rtl #g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.rtl .ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.rtl .ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .g-buttonset .ui-corner-tl {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-tr {
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-bl {
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-br {
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-right,
+.rtl .ui-progressbar .ui-corner-right {
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-left,
+.rtl .ui-progressbar .ui-corner-left {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
+}
+
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a {
+  border-left: none;
+  border-right:1px solid #<?= $borderColorHighlight ?>;
+}
+
+.rtl .sf-menu a.sf-with-ul {
+  padding-left: 2.25em;
+  padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+  left: .75em !important;
+  right: auto;
+  background: url("themeroller/images/ui-icons_<?= $iconColorHighlight ?>_256x240.png")  no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+
+.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+  top: .8em;
+  background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+.rtl a:focus > .sf-sub-indicator,
+.rtl a:hover > .sf-sub-indicator,
+.rtl a:active > .sf-sub-indicator,
+.rtl li:hover > a > .sf-sub-indicator,
+.rtl li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
+.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
+/* apply hovers to modern browsers */
+.rtl .sf-menu ul a:focus > .sf-sub-indicator,
+.rtl .sf-menu ul a:hover > .sf-sub-indicator,
+.rtl .sf-menu ul a:active > .sf-sub-indicator,
+.rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
+.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 0; /* arrow hovers for modern browsers*/
+}
+
+.rtl .sf-menu li:hover ul,
+.rtl .sf-menu li.sfHover ul {
+  right: 0;
+  left: auto;
+}
+
+.rtl ul.sf-menu li li:hover ul,
+.rtl ul.sf-menu li li.sfHover ul {
+  right: 12em; /* match ul width */
+  left: auto;
+}
+.rtl ul.sf-menu li li li:hover ul,
+.rtl ul.sf-menu li li li.sfHover ul {
+  right: 12em; /* match ul width */
+  left: auto;
+}
+
+/*** shadows for all but IE6 ***/
+.rtl .sf-shadow ul {
+  background:	url('superfish/images/shadow.png') no-repeat bottom left;
+  padding: 0 0 9px 8px;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-top-right-radius: 0;
+  -webkit-border-bottom-left-radius: 0;
+  -moz-border-radius-topleft: 17px;
+  -moz-border-radius-bottomright: 17px;
+  -webkit-border-top-left-radius: 17px;
+  -webkit-border-bottom-right-radius: 17px;
+  border-top-left-radius: 17px;
+  border-bottom-right-radius: 17px;
+}
+
+/* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.rtl .ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.rtl .ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-paginator .g-info {
+  width: 35%;
+}
+
+.rtl .g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.rtl .g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
+
 .rtl #g-header #g-login-menu,
 .rtl #g-header #g-quick-search-form {
   clear: left;
@@ -890,107 +1531,3 @@ form .g-error {
   padding-left: 1.2em !important;
   padding-right: 0;
 }
-
-.rtl .g-breadcrumbs li {
-  background: transparent url('../images/ico-separator-rtl.png') no-repeat scroll right center;
-}
-
-.rtl .g-breadcrumbs .g-first {
-  background: none;
-}
-
-/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
-.rtl .g-buttonset .ui-corner-tl {
-        -moz-border-radius-topleft: 0;
-        -webkit-border-top-left-radius: 0;
-        border-top-left-radius: 0;
-        -moz-border-radius-topright: 5px !important;
-        -webkit-border-top-right-radius: 5px !important;
-        border-top-right-radius: 5px !important;
-}
-
-.rtl .g-buttonset .ui-corner-tr {
-        -moz-border-radius-topright: 0;
-        -webkit-border-top-right-radius: 0;
-        border-top-right-radius: 0;
-        -moz-border-radius-topleft: 5px !important;
-        -webkit-border-top-left-radius: 5px !important;
-        border-top-left-radius: 5px !important;
-}
-
-.rtl .g-buttonset .ui-corner-bl {
-        -moz-border-radius-bottomleft: 0;
-        -webkit-border-bottom-left-radius: 0;
-        border-bottom-left-radius: 0;
-        -moz-border-radius-bottomright: 5px !important;
-        -webkit-border-bottom-right-radius: 5px !important;
-        border-bottom-right-radius: 5px !important;
-}
-
-.rtl .g-buttonset .ui-corner-br {
-        -moz-border-radius-bottomright: 0;
-        -webkit-border-bottom-right-radius: 0;
-        border-bottom-right-radius: 0;
-        -moz-border-radius-bottomleft: 5px !important;
-        -webkit-border-bottom-left-radius: 5px !important;
-        border-bottom-left-radius: 5px !important;
-}
-
-.rtl .g-buttonset .ui-corner-right,
-.rtl .ui-progressbar .ui-corner-right {
-        -moz-border-radius-topright: 0;
-        -webkit-border-top-right-radius: 0;
-        border-top-right-radius: 0;
-        -moz-border-radius-topleft: 5px !important;
-        -webkit-border-top-left-radius: 5px !important;
-        border-top-left-radius: 5px !important;
-        -moz-border-radius-bottomright: 0;
-        -webkit-border-bottom-right-radius: 0;
-        border-bottom-right-radius: 0;
-        -moz-border-radius-bottomleft: 5px !important;
-        -webkit-border-bottom-left-radius: 5px !important;
-        border-bottom-left-radius: 5px !important;
-}
-
-.rtl .g-buttonset .ui-corner-left,
-.rtl .ui-progressbar .ui-corner-left {
-        -moz-border-radius-topleft: 0;
-        -webkit-border-top-left-radius: 0;
-        border-top-left-radius: 0;
-        -moz-border-radius-topright: 5px !important;
-        -webkit-border-top-right-radius: 5px !important;
-        border-top-right-radius: 5px !important;
-        -moz-border-radius-bottomleft: 0;
-        -webkit-border-bottom-left-radius: 0;
-        border-bottom-left-radius: 0;
-        -moz-border-radius-bottomright: 5px !important;
-        -webkit-border-bottom-right-radius: 5px !important;
-        border-bottom-right-radius: 5px !important;
-}
-
-/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.rtl .sf-menu a {
-  border-right:1px solid #<?= $borderColorHighlight ?>;
-}
-
-.rtl .sf-sub-indicator {
-  background: url("themeroller/images/ui-icons_2e83ff_256x240.png") no-repeat -96px -16px; /* 8-bit indexed alpha png. IE6 gets solid image only */
-}
-
-/*** shadows for all but IE6 ***/
-.rtl .sf-shadow ul {
-  background: url('../images/superfish-shadow.png') no-repeat bottom left;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 0;
-  -moz-border-radius-topright: 0;
-  -moz-border-radius-bottomleft: 0;
-  -webkit-border-top-right-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -moz-border-radius-topleft: 17px;
-  -moz-border-radius-bottomright: 17px;
-  -webkit-border-top-left-radius: 17px;
-  -webkit-border-bottom-right-radius: 17px;
-  border-top-left-radius: 17px;
-  border-bottom-right-radius: 17px;
-}
diff --git a/themes/browny_admin_wind/css/screen.css b/themes/browny_admin_wind/css/screen.css
index 441a1a3b..b7d87f74 100644
--- a/themes/browny_admin_wind/css/screen.css
+++ b/themes/browny_admin_wind/css/screen.css
@@ -8,11 +8,13 @@
  *  2)  Reusable content blocks
  *  3)  Page layout containers
  *  4)  Content blocks in specific layout containers
- *  5)  Navigation and menus
- *  6)  ThemeRoller
- *  7)  jQuery and jQuery UI
- *  8)  Right-to-left language styles
- *  9)  More Browny
+ *  5)  States and interactions
+ *  6)  Positioning and order
+ *  7)  Navigation and menus
+ *  8)  ThemeRoller
+ *  9)  jQuery and jQuery UI
+ * 10)  Right-to-left language styles
+ * 11)  More Browny
  *
  * @todo Review g-buttonset-vertical
  */
@@ -90,6 +92,184 @@ a:hover,
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+form {
+  margin: 0;
+}
+
+fieldset {
+  border: 1px solid #ccc;
+  padding: 0 1em .8em 1em;
+}
+
+#g-banner fieldset,
+#g-sidebar fieldset {
+  border: none;
+  padding: 0;
+}
+
+legend {
+  font-weight: bold;
+  margin: 0;
+  padding: 0 .2em;
+}
+
+#g-banner legend,
+#g-sidebar legend,
+input[type="hidden"] {
+  display: none;
+}
+
+input.textbox,
+input[type="text"],
+input[type="password"],
+textarea {
+  border: 1px solid #e8e8e8;
+  border-top-color: #ccc;
+  border-left-color: #ccc;
+  clear: both;
+  color: #333;
+  width: 50%;
+}
+
+textarea {
+  height: 12em;
+  width: 97%;
+}
+
+input:focus,
+input.textbox:focus,
+input[type=text]:focus,
+textarea:focus,
+option:focus {
+  background-color: #ffc;
+  color: #000;
+}
+
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: left;
+  margin-right: .4em;
+}
+
+/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+form li {
+  margin: 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
+}
+
+form ul ul {
+  clear: both;
+}
+
+form ul ul li {
+  float: left;
+}
+
+input,
+select,
+textarea {
+  display: block;
+  clear: both;
+  padding: .2em;
+}
+
+input[type="submit"],
+input[type="reset"] {
+  display: inline;
+  clear: none;
+  float: left;
+}
+
+/* Forms in dialogs and panels ~~~~~~~~~ */
+
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
+  border: none;
+  padding: 0;
+}
+
+#g-panel legend {
+  display: none;
+}
+
+input[readonly] {
+  background-color: #F4F4FC;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+  width: 97%;
+}
+
+/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-short-form legend,
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0;
+}
+
+.g-short-form li {
+  float: left;
+  margin: 0 !important;
+  padding: .4em 0;
+}
+
+.g-short-form .textbox,
+.g-short-form input[type=text] {
+  color: #666;
+  padding: .3em .6em;
+  width: 100%;
+}
+
+.g-short-form .textbox.g-error {
+  border: 1px solid #f00;
+  color: #f00;
+  padding-left: 24px;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  margin: .3em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+fieldset {
+  margin-bottom: 1em;
+}
+
+#g-content form ul li {
+  padding: .4em 0;
+}
+
+#g-dialog form {
+  width: 270px;
+}
+
+#g-dialog fieldset {
+  margin-bottom: 0;
+}
 
 fieldset {
   margin-bottom: 1em;
@@ -229,9 +409,38 @@ th {
   background-color: #fff;
 }
 
+ul.enumeration li {
+  list-style-type: disc;
+  margin-left: 20px;
+}
+
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
+/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+.g-one-quarter {
+  width: 25%;
+}
+
+.g-one-third {
+  width: 33%;
+}
+
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
+}
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -411,8 +620,192 @@ th {
   background-color: #FFF;
 }
 
+/* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-share-translations-form fieldset {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+}
+
+#g-share-translations-form fieldset legend {
+  display: none;
+}
+
 /** *******************************************************************
- * 5) Navigation and menus
+ *  5) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-selected,
+.g-highlight {
+  font-weight: bold;
+}
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-deselected,
+.g-understate {
+  color: #ccc;
+  font-weight: normal;
+}
+
+.g-editable {
+  padding: .2em .3em;
+}
+
+.g-editable:hover {
+  background-color: #ffc;
+  cursor: text;
+}
+
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
+  padding-left: 30px;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  background-image: none;
+  padding: .3em .8em .3em 0;
+}
+
+.g-short-form li.g-error {
+  padding: .3em 0;
+}
+
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
+  border: 2px solid #f00;
+  margin-bottom: .2em;
+}
+
+.g-error,
+.g-denied,
+tr.g-error td.g-error,
+#g-add-photos-status .g-error {
+  background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
+  color: #f00;
+}
+
+.g-info {
+  background: #e8e8e8 url('images/ico-info.png') no-repeat .4em 50%;
+}
+
+.g-success,
+.g-allowed,
+#g-add-photos-status .g-success {
+  background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
+}
+
+tr.g-success {
+	background-image: none;
+}
+
+tr.g-success td.g-success {
+	background-image: url('images/ico-success.png');
+}
+
+.g-warning,
+tr.g-warning td.g-warning {
+  background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%;
+}
+
+form .g-error {
+  background-color: #fff;
+  padding-left: 20px;
+}
+
+.g-open {
+}
+
+.g-closed {
+}
+
+.g-installed {
+  background-color: #eeeeee;
+}
+
+.g-default {
+  background-color: #c5dbec;
+  font-weight: bold;
+}
+
+.g-draggable {
+  cursor: move;
+}
+
+.g-draggable:hover {
+  border: 1px dashed #000;
+}
+
+.ui-sortable .g-target,
+.ui-state-highlight {
+  background-color: #fcf9ce;
+  border: 2px dotted #999;
+  height: 2em;
+  margin: 1em 0;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.g-loading-large,
+.g-dialog-loading-large {
+  background: #e8e8e8 url('images/loading-large.gif') no-repeat center center !important;
+}
+
+.g-loading-small {
+  background: #e8e8e8 url('images/loading-small.gif') no-repeat center center !important;
+}
+
+/** *******************************************************************
+ *  6) Positioning and order
+ **********************************************************************/
+
+.g-left {
+  clear: none;
+  float: left;
+}
+
+.g-right {
+  clear: none;
+  float: right;
+}
+
+.g-first {
+}
+
+.g-last {
+}
+
+.g-even {
+  background-color: #ede4d5;
+}
+
+.g-odd {
+  background-color: #fff;
+}
+
+/** *******************************************************************
+ * 7) Navigation and menus
  *********************************************************************/
 
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -429,7 +822,7 @@ th {
 }
 
 /** *******************************************************************
- * 6) ThemeRoller Theme
+ * 8) ThemeRoller Theme
  **********************************************************************/
 /* ~browny~ */
 
@@ -437,10 +830,204 @@ th {
 @import "themeroller/ui.tabs.css";
 
 /** *******************************************************************
- * 7) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
  *********************************************************************/
+/* Generic block container ~~~~~~~~~~~~~~~ */
+
+.g-block {
+  clear: both;
+  margin-bottom: 2.5em;
+}
+
+.g-block-content {
+}
+
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+button {
+  padding: 2px 4px 2px 4px;
+}
+
+/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */
+
+.g-buttonset {
+  padding-left: 1px;
+}
+
+.g-buttonset li {
+  float: left;
+}
+
+.g-buttonset .g-button {
+  margin: 0;
+}
+
+.ui-icon-left .ui-icon {
+  float: left;
+  margin-right: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  float: right;
+  margin-left: .2em;
+}
+
+/* Rotate icon, ThemeRoller only provides one of these */
+
+.ui-icon-rotate-ccw {
+  background-position: -192px -64px;
+}
+
+.ui-icon-rotate-cw {
+  background-position: -208px -64px;
+}
+
+.g-progress-bar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+/* Status and validation messages ~~~~ */
+
+.g-message-block {
+  background-position: .4em .3em;
+  border: 1px solid #ccc;
+  padding: 0;
+}
+
+#g-action-status {
+  margin-bottom: 1em;
+}
+
+#g-action-status li,
+p#g-action-status,
+div#g-action-status {
+  padding: .3em .3em .3em 30px;
+}
+
+#g-site-status li {
+  border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
+}
+
+.g-module-status {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.g-message {
+  background-position: 0 50%;
+}
+
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  clear: both;
+  padding: 0 20px;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: 1em 8px 1em 18px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator {
+  padding: .2em 0;
+  width: 100%;
+}
+
+.g-paginator li {
+  float: left;
+  width: 30%;
+}
+
+.g-paginator .g-info {
+  background: none;
+  padding: .2em 0;
+  text-align: center;
+  width: 40%;
+}
+
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog .g-cancel {
+  margin: .4em 1em;
+}
+
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
+/* Inline layout  ~~~~~~~~~~ */
+
+.g-inline li {
+  float: left;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
+}
+
+.g-inline li.g-first {
+  margin-left: 0;
+}
 
 /* Superfish menu overrides ~~~~~~~~~~~ */
+.sf-menu ul {
+	width: 12em;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:	12em;
+}
+
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left: 12em;
+}
 
 /* ~browny~ */
 .sf-menu li li,
@@ -464,10 +1051,10 @@ th {
 }
 
 /* ~browny~ */
-.sf-menu li:hover, 
+.sf-menu li:hover,
 .sf-menu li.sfHover,
-.sf-menu a:focus, 
-.sf-menu a:hover, 
+.sf-menu a:focus,
+.sf-menu a:hover,
 .sf-menu a:active {
 	background: #e0cbae;
 }
@@ -490,9 +1077,267 @@ th {
 }
 
 /** *******************************************************************
- * 8) Right to left styles
+ * 10) Right to left styles
  *********************************************************************/
 
+.rtl {
+  direction: rtl;
+}
+
+.rtl #g-header,
+.rtl #g-content,
+.rtl #g-sidebar,
+.rtl #g-footer,
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.rtl .g-context-menu li a,
+.rtl .g-message-box li,
+.rtl #g-site-status li {
+  text-align: right;
+}
+
+.rtl .g-text-right {
+  text-align: left;
+}
+
+.rtl .g-error,
+.rtl .g-info,
+.rtl .g-success,
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-paginator li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon,
+.rtl .g-short-form li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl input.checkbox,
+.rtl input[type=checkbox],
+.rtl input.radio,
+.rtl input[type=radio] {
+  float: right;
+}
+
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
+.rtl .g-inline li {
+  margin-right: 1em;
+}
+
+.rtl .g-inline li.g-first {
+  margin-right: 0;
+}
+
+.rtl .g-breadcrumbs li {
+  background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.rtl .g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+.rtl input.checkbox {
+  margin-left: .4em;
+}
+
+.rtl #g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.rtl .ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.rtl .ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .g-buttonset .ui-corner-tl {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-tr {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-bl {
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-br {
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-right,
+.rtl .ui-progressbar .ui-corner-right {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-left,
+.rtl .ui-progressbar .ui-corner-left {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a {
+    border-left: none;
+	border-right:1px solid #fff;
+}
+
+.rtl .sf-menu a.sf-with-ul {
+	padding-left: 2.25em;
+	padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+	left: .75em !important;
+    right: auto;
+	background: url('superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top:			.8em;
+	background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+.rtl a:focus > .sf-sub-indicator,
+.rtl a:hover > .sf-sub-indicator,
+.rtl a:active > .sf-sub-indicator,
+.rtl li:hover > a > .sf-sub-indicator,
+.rtl li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
+.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
+/* apply hovers to modern browsers */
+.rtl .sf-menu ul a:focus > .sf-sub-indicator,
+.rtl .sf-menu ul a:hover > .sf-sub-indicator,
+.rtl .sf-menu ul a:active > .sf-sub-indicator,
+.rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
+.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 0; /* arrow hovers for modern browsers*/
+}
+
+.rtl .sf-menu li:hover ul,
+.rtl .sf-menu li.sfHover ul {
+	right: 0;
+	left: auto;
+}
+
+.rtl ul.sf-menu li li:hover ul,
+.rtl ul.sf-menu li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+.rtl ul.sf-menu li li li:hover ul,
+.rtl ul.sf-menu li li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+
+/*** shadows for all but IE6 ***/
+.rtl .sf-shadow ul {
+	background:	url('superfish/images/shadow.png') no-repeat bottom left;
+	padding: 0 0 9px 8px;
+	border-top-right-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-topleft: 17px;
+	-moz-border-radius-bottomright: 17px;
+	-webkit-border-top-left-radius: 17px;
+	-webkit-border-bottom-right-radius: 17px;
+	border-top-left-radius: 17px;
+	border-bottom-right-radius: 17px;
+}
+
+/* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.rtl .ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.rtl .ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-theme,
 .rtl #g-admin-theme,
@@ -532,7 +1377,7 @@ th {
 }
 
 /** *******************************************************************
- * 9) More Browny (Extra overrides for better Browny look)
+ * 11) More Browny (Extra overrides for better Browny look)
  *********************************************************************/
 
 /* /lib/gallery.common.css ~~~~~~~~~~~~ */
diff --git a/themes/browny_admin_wind/js/ui.init.js b/themes/browny_admin_wind/js/ui.init.js
index e0210ce5..4ed912f8 100644
--- a/themes/browny_admin_wind/js/ui.init.js
+++ b/themes/browny_admin_wind/js/ui.init.js
@@ -4,7 +4,7 @@
  */
 
 $(document).ready(function(){
-  
+
   // Initialize Superfish menus
   $("#g-site-admin-menu .g-menu").hide().addClass("sf-menu");
   $("#g-site-admin-menu .g-menu").superfish({
@@ -54,7 +54,9 @@ $(document).ready(function(){
   $(".g-available .g-block").addClass("ui-corner-all");
   $(".g-unavailable").addClass("ui-corner-all");
 
+  // Remove titles for menu options since we're displaying that text anyway
+  $(".sf-menu a, .sf-menu li").removeAttr("title");
+
   // Initialize button hover effect
   $.fn.gallery_hover_init();
-
 });
diff --git a/themes/browny_admin_wind/views/admin.html.php b/themes/browny_admin_wind/views/admin.html.php
index c4b51f41..c8041069 100644
--- a/themes/browny_admin_wind/views/admin.html.php
+++ b/themes/browny_admin_wind/views/admin.html.php
@@ -16,7 +16,6 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
diff --git a/themes/browny_wind/css/screen.css b/themes/browny_wind/css/screen.css
index 15c04991..29d5de2f 100644
--- a/themes/browny_wind/css/screen.css
+++ b/themes/browny_wind/css/screen.css
@@ -7,12 +7,14 @@
  *  1)  Font sizes, base HTML elements
  *  2)  Reusable content blocks
  *  3)  Page layout containers
- *  4)  Content blocks in specific layout containers
- *  5)  Navigation and menus
- *  6)  ThemeRoller
- *  7)  jQuery and jQuery UI
- *  8)  Right-to-left language styles
- *  9)  More Browny
+ *  4)  Content blocks in specific layout containers  
+ *  5)  States and interactions
+ *  6)  Positioning and order
+ *  7)  Navigation and menus
+ *  8)  ThemeRoller
+ *  9)  jQuery and jQuery UI
+ * 10)  Right-to-left language styles
+ * 11)  More Browny
  */
 
 /** *******************************************************************
@@ -113,6 +115,170 @@ a:hover,
   padding-left: 32px;
 }
 
+/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+form {
+  margin: 0;
+}
+
+fieldset {
+  border: 1px solid #ccc;
+  padding: 0 1em .8em 1em;
+}
+
+#g-banner fieldset,
+#g-sidebar fieldset {
+  border: none;
+  padding: 0;
+}
+
+legend {
+  font-weight: bold;
+  margin: 0;
+  padding: 0 .2em;
+}
+
+#g-banner legend,
+#g-sidebar legend,
+input[type="hidden"] {
+  display: none;
+}
+
+input.textbox,
+input[type="text"],
+input[type="password"],
+textarea {
+  border: 1px solid #e8e8e8;
+  border-top-color: #ccc;
+  border-left-color: #ccc;
+  clear: both;
+  color: #333;
+  width: 50%;
+}
+
+textarea {
+  height: 12em;
+  width: 97%;
+}
+
+input:focus,
+input.textbox:focus,
+input[type=text]:focus,
+textarea:focus,
+option:focus {
+  background-color: #ffc;
+  color: #000;
+}
+
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: left;
+  margin-right: .4em;
+}
+
+/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+form li {
+  margin: 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
+}
+
+form ul ul {
+  clear: both;
+}
+
+form ul ul li {
+  float: left;
+}
+
+input,
+select,
+textarea {
+  display: block;
+  clear: both;
+  padding: .2em;
+}
+
+input[type="submit"],
+input[type="reset"] {
+  display: inline;
+  clear: none;
+  float: left;
+}
+
+/* Forms in dialogs and panels ~~~~~~~~~ */
+
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
+  border: none;
+  padding: 0;
+}
+
+#g-panel legend {
+  display: none;
+}
+
+input[readonly] {
+  background-color: #F4F4FC;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+  width: 97%;
+}
+
+/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-short-form legend,
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0;
+}
+
+.g-short-form li {
+  float: left;
+  margin: 0 !important;
+  padding: .4em 0;
+}
+
+.g-short-form .textbox,
+.g-short-form input[type=text] {
+  color: #666;
+  padding: .3em .6em;
+  width: 100%;
+}
+
+.g-short-form .textbox.g-error {
+  border: 1px solid #f00;
+  color: #f00;
+  padding-left: 24px;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  margin: .3em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 /* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 table {
@@ -139,6 +305,19 @@ td {
   vertical-align: top;
 }
 
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+  font-size: .8em;
+}
+
+.g-text-big {
+  font-size: 1.2em;
+}
+
+.g-text-right {
+  text-align: right;
+}
+
 /** *******************************************************************
  * 2) Reusable content blocks
  *********************************************************************/
@@ -157,6 +336,31 @@ td {
  * 3) Page layout containers
  *********************************************************************/
 
+/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+.g-one-quarter {
+  width: 25%;
+}
+
+.g-one-third {
+  width: 33%;
+}
+
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
+}
+
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-view {
@@ -356,7 +560,182 @@ td {
 }
 
 /** *******************************************************************
- * 5) Navigation and menus
+ *  5) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-selected,
+.g-highlight {
+  font-weight: bold;
+}
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-deselected,
+.g-understate {
+  color: #ccc;
+  font-weight: normal;
+}
+
+.g-editable {
+  padding: .2em .3em;
+}
+
+.g-editable:hover {
+  background-color: #ffc;
+  cursor: text;
+}
+
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
+  padding-left: 30px;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  background-image: none;
+  padding: .3em .8em .3em 0;
+}
+
+.g-short-form li.g-error {
+  padding: .3em 0;
+}
+
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
+  border: 2px solid #f00;
+  margin-bottom: .2em;
+}
+
+.g-error,
+.g-denied,
+tr.g-error td.g-error,
+#g-add-photos-status .g-error {
+  background: #f6cbca url('../images/ico-error.png') no-repeat .4em 50%;
+  color: #f00;
+}
+
+.g-info {
+  background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
+}
+
+/* ~browny~ */
+.g-success,
+.g-allowed,
+#g-add-photos-status .g-success {
+  background: #fcf9ce url('../images/ico-success.png') no-repeat .4em 50%;
+}
+
+tr.g-success {
+	background-image: none;
+}
+
+tr.g-success td.g-success {
+	background-image: url('../images/ico-success.png');
+}
+
+.g-warning,
+tr.g-warning td.g-warning {
+  background: #fcf9ce url('../images/ico-warning.png') no-repeat .4em 50%;
+}
+
+form .g-error {
+  background-color: #fff;
+  padding-left: 20px;
+}
+
+.g-open {
+}
+
+.g-closed {
+}
+
+.g-installed {
+  background-color: #eeeeee;
+}
+
+.g-default {
+  background-color: #c5dbec;
+  font-weight: bold;
+}
+
+.g-draggable {
+  cursor: move;
+}
+
+.g-draggable:hover {
+  border: 1px dashed #000;
+}
+
+.ui-sortable .g-target,
+.ui-state-highlight {
+  background-color: #fcf9ce;
+  border: 2px dotted #999;
+  height: 2em;
+  margin: 1em 0;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.g-loading-large,
+.g-dialog-loading-large {
+  background: #e8e8e8 url('../images/loading-large.gif') no-repeat center center !important;
+}
+
+.g-loading-small {
+  background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center !important;
+}
+
+/** *******************************************************************
+ *  6) Positioning and order
+ **********************************************************************/
+
+.g-left {
+  clear: none;
+  float: left;
+}
+
+.g-right {
+  clear: none;
+  float: right;
+}
+
+.g-first {
+}
+
+.g-last {
+}
+
+.g-even {
+  background-color: #fff;
+}
+
+/* ~browny~ */
+.g-odd {
+  background-color: #EDE4D5;
+}
+
+/** *******************************************************************
+ * 7) Navigation and menus
  *********************************************************************/
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -458,7 +837,7 @@ td {
 }
 
 /** *******************************************************************
- * 6) ThemeRoller Theme
+ * 8) ThemeRoller Theme
  **********************************************************************/
 /* ~browny~ */
 
@@ -467,10 +846,33 @@ td {
 @import "themeroller/ui.tabs.css";
 
 /** *******************************************************************
- * 7) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
  *********************************************************************/
 
+/* Generic block container ~~~~~~~~~~~~~~~ */
+
+.g-block {
+  clear: both;
+  margin-bottom: 2.5em;
+}
+
+.g-block-content {
+}
+
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+.sf-menu ul {
+	width: 12em;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:	12em;
+}
+
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left: 12em;
+}
 
 /* ~browny~ */
 .sf-menu li li,
@@ -499,9 +901,474 @@ td {
 	background: #e0cbae;
 }
 
+/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
+.ui-widget-overlay {
+  background: #000;
+  opacity: .7;
+}
+
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+button {
+  padding: 2px 4px 2px 4px;
+}
+
+/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */
+
+.g-buttonset {
+  padding-left: 1px;
+}
+
+.g-buttonset li {
+  float: left;
+}
+
+.g-buttonset .g-button {
+  margin: 0;
+}
+
+.ui-icon-left .ui-icon {
+  float: left;
+  margin-right: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  float: right;
+  margin-left: .2em;
+}
+
+/* Rotate icon, ThemeRoller only provides one of these */
+
+.ui-icon-rotate-ccw {
+  background-position: -192px -64px;
+}
+
+.ui-icon-rotate-cw {
+  background-position: -208px -64px;
+}
+
+.g-progress-bar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+/* Status and validation messages ~~~~ */
+
+.g-message-block {
+  background-position: .4em .3em;
+  border: 1px solid #ccc;
+  padding: 0;
+}
+
+#g-action-status {
+  margin-bottom: 1em;
+}
+
+#g-action-status li,
+p#g-action-status,
+div#g-action-status {
+  padding: .3em .3em .3em 30px;
+}
+
+#g-site-status li {
+  border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
+}
+
+.g-module-status {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.g-message {
+  background-position: 0 50%;
+}
+
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  clear: both;
+  padding: 0 20px;
+}
+
+/* ~browny~ */
+.g-breadcrumbs li {
+  background: transparent url('../images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: .5em 8px .5em 18px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator {
+  padding: .2em 0;
+  width: 100%;
+}
+
+.g-paginator li {
+  float: left;
+  width: 30%;
+}
+
+.g-paginator .g-info {
+  background: none;
+  padding: .2em 0;
+  text-align: center;
+  width: 40%;
+}
+
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog .g-cancel {
+  margin: .4em 1em;
+}
+
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
+/* Inline layout  ~~~~~~~~~~ */
+
+.g-inline li {
+  float: left;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
+}
+
+.g-inline li.g-first {
+  margin-left: 0;
+}
+
 /** *******************************************************************
  * 8) Right to left language styles
  *********************************************************************/
+.rtl {
+  direction: rtl;
+}
+
+.rtl #g-header,
+.rtl #g-content,
+.rtl #g-sidebar,
+.rtl #g-footer,
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.rtl .g-context-menu li a,
+.rtl .g-message-box li,
+.rtl #g-site-status li {
+  text-align: right;
+}
+
+.rtl .g-text-right {
+  text-align: left;
+}
+
+.rtl .g-error,
+.rtl .g-info,
+.rtl .g-success,
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-paginator li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon,
+.rtl .g-short-form li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl input.checkbox,
+.rtl input[type=checkbox],
+.rtl input.radio,
+.rtl input[type=radio] {
+  float: right;
+}
+
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
+.rtl .g-inline li {
+  margin-right: 1em;
+}
+
+.rtl .g-inline li.g-first {
+  margin-right: 0;
+}
+
+/* ~browny~ */
+.rtl .g-breadcrumbs li {
+  background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: .5em 18px .5em 8px;
+}
+
+.rtl .g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+.rtl input.checkbox {
+  margin-left: .4em;
+}
+
+.rtl #g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.rtl .ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.rtl .ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .g-buttonset .ui-corner-tl {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-tr {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-bl {
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-br {
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-right,
+.rtl .ui-progressbar .ui-corner-right {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-left,
+.rtl .ui-progressbar .ui-corner-left {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a {
+    border-left: none;
+	border-right:1px solid #fff;
+}
+
+.rtl .sf-menu a.sf-with-ul {
+	padding-left: 2.25em;
+	padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+	left: .75em !important;
+    right: auto;
+	background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top:			.8em;
+	background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+.rtl a:focus > .sf-sub-indicator,
+.rtl a:hover > .sf-sub-indicator,
+.rtl a:active > .sf-sub-indicator,
+.rtl li:hover > a > .sf-sub-indicator,
+.rtl li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
+.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
+/* apply hovers to modern browsers */
+.rtl .sf-menu ul a:focus > .sf-sub-indicator,
+.rtl .sf-menu ul a:hover > .sf-sub-indicator,
+.rtl .sf-menu ul a:active > .sf-sub-indicator,
+.rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
+.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 0; /* arrow hovers for modern browsers*/
+}
+
+.rtl .sf-menu li:hover ul,
+.rtl .sf-menu li.sfHover ul {
+	right: 0;
+	left: auto;
+}
+
+.rtl ul.sf-menu li li:hover ul,
+.rtl ul.sf-menu li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+.rtl ul.sf-menu li li li:hover ul,
+.rtl ul.sf-menu li li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+
+/*** shadows for all but IE6 ***/
+.rtl .sf-shadow ul {
+	background:	url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
+	padding: 0 0 9px 8px;
+	border-top-right-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-topleft: 17px;
+	-moz-border-radius-bottomright: 17px;
+	-webkit-border-top-left-radius: 17px;
+	-webkit-border-bottom-right-radius: 17px;
+	border-top-left-radius: 17px;
+	border-bottom-right-radius: 17px;
+}
+
+/* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.rtl .ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.rtl .ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-paginator .g-info {
+  width: 35%;
+}
+
+.rtl .g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.rtl .g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
 
 .rtl #g-header #g-login-menu,
 .rtl #g-header #g-quick-search-form {
@@ -539,34 +1406,6 @@ td {
  *********************************************************************/
 /* ~browny~ */
 
-/* /lib/gallery.common.css ~~~~~~~~~~~~~~~ */
-
-.g-info {
-  background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
-}
-
-.g-success,
-.g-allowed,
-#g-add-photos-status .g-success {
-  background: #fcf9ce url('../images/ico-success.png') no-repeat .4em 50%;
-}
-
-tr.g-success td.g-success {
-	background-image: url('../images/ico-success.png');
-}
-
-.g-odd {
-  background-color: #EDE4D5;
-}
-
-.g-breadcrumbs li {
-  padding: .5em 8px .5em 18px;
-}
-
-.rtl .g-breadcrumbs li {
-  padding: .5em 18px .5em 8px;
-}
-
 /* /modules/gallery/css/gallery.css ~~~~~~ */
 
 #g-add-photos-form p {
@@ -666,4 +1505,4 @@ table.calendar td:hover {
 /* DownloadAlbum */
 #g-view-menu #g-download-album-link {
   background-image: url('../images/ico-view-downloadalbum.png');
-}
\ No newline at end of file
+}
diff --git a/themes/browny_wind/js/ui.init.js b/themes/browny_wind/js/ui.init.js
index 53b58516..2c67bf3a 100644
--- a/themes/browny_wind/js/ui.init.js
+++ b/themes/browny_wind/js/ui.init.js
@@ -43,6 +43,9 @@ $(document).ready(function() {
     });
   }
 
+  // Remove titles for menu options since we're displaying that text anyway
+  $(".sf-menu a, .sf-menu li").removeAttr("title");
+
   // Album and search results views
   if ($("#g-album-grid").length) {
     // Set equal height for album items and vertically align thumbnails/metadata
@@ -87,9 +90,18 @@ $(document).ready(function() {
         $(this).css("top", 0).css("left", 0);
         // Remove the placeholder and hover class from the item
         $(this).removeClass("g-hover-item");
+	$(this).gallery_valign();
         $("#g-place-holder").remove();
       }
     );
+
+    // Realign any thumbnails that change so that when we rotate a thumb it stays centered.
+    $(".g-item").bind("gallery.change", function() {
+      $(".g-item").each(function() {
+	$(this).height($(this).find("img").height() + 2);
+      });
+      $(".g-item").equal_heights().gallery_valign();
+    });
   }
 
   // Photo/Item item view
diff --git a/themes/browny_wind/views/page.html.php b/themes/browny_wind/views/page.html.php
index 45ad51a7..6da76f87 100644
--- a/themes/browny_wind/views/page.html.php
+++ b/themes/browny_wind/views/page.html.php
@@ -27,7 +27,6 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lte IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
diff --git a/themes/browny_wind/views/photo.html.php b/themes/browny_wind/views/photo.html.php
index f8b5511c..b42ab987 100644
--- a/themes/browny_wind/views/photo.html.php
+++ b/themes/browny_wind/views/photo.html.php
@@ -4,10 +4,23 @@
 <!-- Use javascript to show the full size as an overlay on the current page -->
 <script type="text/javascript">
   $(document).ready(function() {
+    full_dims = [<?= $theme->item()->width ?>, <?= $theme->item()->height ?>];
     $(".g-fullsize-link").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, full_dims[0], full_dims[1]);
       return false;
     });
+
+    // After the image is rotated or replaced we have to reload the image dimensions
+    // so that the full size view isn't distorted.
+    $("#g-photo").bind("gallery.change", function() {
+      $.ajax({
+        url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>",
+        dataType: "json",
+        success: function(data, textStatus) {
+          full_dims = data.full;
+        }
+      });
+    });
   });
 </script>
 <? endif ?>
diff --git a/themes/three_nids/css/screen.css b/themes/three_nids/css/screen.css
index ec2c977e..3832283c 100644
--- a/themes/three_nids/css/screen.css
+++ b/themes/three_nids/css/screen.css
@@ -8,10 +8,12 @@
  *  2)  Reusable content blocks
  *  3)  Page layout containers
  *  4)  Content blocks in specific layout containers
- *  5)  Navigation and menus
- *  6)  Browser hacks
- *  7)  jQuery and jQuery UI
- *  8)  Right-to-left language styles
+ *  5)  States and interactions
+ *  6)  Positioning and order
+ *  7)  Navigation and menus
+ *  8)  Browser hacks
+ *  9)  jQuery and jQuery UI
+ * 10)  Right-to-left language styles
  */
 
 /** *******************************************************************
@@ -60,6 +62,8 @@ h2 {
   margin-bottom: .6em;
 }
 
+#g-content,
+#g-site-menu,
 h3 {
   font-size: 1.2em;
 }
@@ -67,6 +71,23 @@ h4 {
   font-size: 0.9em;
 }
 
+#g-sidebar,
+.g-breadcrumbs {
+  font-size: .9em;
+}
+
+#g-banner,
+#g-footer,
+.g-message {
+  font-size: .8em;
+}
+
+#g-album-grid .g-item,
+#g-item #g-photo,
+#g-item #g-movie {
+  font-size: .7em;
+}
+
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 a,
@@ -123,6 +144,9 @@ td {
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+form {
+  margin: 0;
+}
 
 fieldset {
   border: 1px solid #ccc;
@@ -226,6 +250,87 @@ li.g-error select {
   border: 2px solid red;
 }
 
+/* Forms in dialogs and panels ~~~~~~~~~ */
+
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
+  border: none;
+  padding: 0;
+}
+
+#g-panel legend {
+  display: none;
+}
+
+input[readonly] {
+  background-color: #F4F4FC;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+  width: 97%;
+}
+
+/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-short-form legend,
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0;
+}
+
+.g-short-form li {
+  float: left;
+  margin: 0 !important;
+  padding: .4em 0;
+}
+
+.g-short-form .textbox,
+.g-short-form input[type=text] {
+  color: #666;
+  padding: .3em .6em;
+  width: 100%;
+}
+
+.g-short-form .textbox.g-error {
+  border: 1px solid #f00;
+  color: #f00;
+  padding-left: 24px;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  margin: .3em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+  font-size: .8em;
+}
+
+.g-text-big {
+  font-size: 1.2em;
+}
+
+.g-text-right {
+  text-align: right;
+}
+
 /** *******************************************************************
  * 2) Reusable content blocks
  *********************************************************************/
@@ -258,6 +363,31 @@ li.g-error select {
  * 3) Page layout containers
  *********************************************************************/
 
+/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+.g-one-quarter {
+  width: 25%;
+}
+
+.g-one-third {
+  width: 33%;
+}
+
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
+}
+
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-view {
@@ -396,6 +526,13 @@ li.g-error select {
   z-index: 1;
 }
 
+/* Search results ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-content #g-search-results {
+  margin-top: 1em;
+  padding-top: 1em;
+}
+
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
 #g-content #g-item {
@@ -472,8 +609,207 @@ li.g-error select {
   background-color: #FFF;
 }
 
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-edit-permissions-form td {
+  background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+  border: 1px solid #ccc;
+}
+
+#g-permissions .g-denied {
+  background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+  background-color: #cfc;
+}
+
+#g-permissions .g-breadcrumbs a {
+  border: 1px solid #fff;
+}
+
+#g-permissions .g-active a {
+  border: 1px solid #ddd;
+  background: #eee;
+}
+
 /** *******************************************************************
- * 5) Navigation and menus
+ *  5) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-selected,
+.g-highlight {
+  font-weight: bold;
+}
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-deselected,
+.g-understate {
+  color: #ccc;
+  font-weight: normal;
+}
+
+.g-editable {
+  padding: .2em .3em;
+}
+
+.g-editable:hover {
+  background-color: #ffc;
+  cursor: text;
+}
+
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
+  padding-left: 30px;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  background-image: none;
+  padding: .3em .8em .3em 0;
+}
+
+.g-short-form li.g-error {
+  padding: .3em 0;
+}
+
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
+  border: 2px solid #f00;
+  margin-bottom: .2em;
+}
+
+.g-error,
+.g-denied,
+tr.g-error td.g-error,
+#g-add-photos-status .g-error {
+  background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
+  color: #f00;
+}
+
+.g-info {
+  background: #e8e8e8 url('images/ico-info.png') no-repeat .4em 50%;
+}
+
+.g-success,
+.g-allowed,
+#g-add-photos-status .g-success {
+  background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
+}
+
+tr.g-success {
+	background-image: none;
+}
+
+tr.g-success td.g-success {
+	background-image: url('images/ico-success.png');
+}
+
+.g-warning,
+tr.g-warning td.g-warning {
+  background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%;
+}
+
+form .g-error {
+  background-color: #fff;
+  padding-left: 20px;
+}
+
+.g-open {
+}
+
+.g-closed {
+}
+
+.g-installed {
+  background-color: #eeeeee;
+}
+
+.g-default {
+  background-color: #c5dbec;
+  font-weight: bold;
+}
+
+.g-draggable {
+  cursor: move;
+}
+
+.g-draggable:hover {
+  border: 1px dashed #000;
+}
+
+.ui-sortable .g-target,
+.ui-state-highlight {
+  background-color: #fcf9ce;
+  border: 2px dotted #999;
+  height: 2em;
+  margin: 1em 0;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.g-loading-large,
+.g-dialog-loading-large {
+  background: #e8e8e8 url('images/loading-large.gif') no-repeat center center !important;
+}
+
+.g-loading-small {
+  background: #e8e8e8 url('images/loading-small.gif') no-repeat center center !important;
+}
+
+/** *******************************************************************
+ *  6) Positioning and order
+ **********************************************************************/
+
+.g-left {
+  clear: none;
+  float: left;
+}
+
+.g-right {
+  clear: none;
+  float: right;
+}
+
+.g-first {
+}
+
+.g-last {
+}
+
+.g-even {
+  background-color: #fff;
+}
+
+.g-odd {
+  background-color: #eee;
+}
+
+/** *******************************************************************
+ * 7 Navigation and menus
  *********************************************************************/
 
 #g-site-menu,
@@ -652,11 +988,34 @@ li.g-error select {
 }
 
 /** *******************************************************************
- * 6) jQuery and jQuery UI
+ * 8) jQuery and jQuery UI
  *********************************************************************/
+/* Generic block container ~~~~~~~~~~~~~~~ */
+
+.g-block {
+  clear: both;
+  margin-bottom: 2.5em;
+}
+
+.g-block-content {
+}
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
 
+.sf-menu ul {
+	width: 12em;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:	12em;
+}
+
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left: 12em;
+}
+
 .sf-menu a {
 	border-left:	1px solid #e8e8e8;
 	border-top:		1px solid #e8e8e8;
@@ -689,6 +1048,27 @@ li.g-error select {
   opacity: .7;
 }
 
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+button {
+  padding: 2px 4px 2px 4px;
+}
+
 /* jQuery UI ThemeRoller buttons */
 
 .g-buttonset {
@@ -721,6 +1101,122 @@ li.g-error select {
   background-position: -208px -64px;
 }
 
+.g-progress-bar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+/* Status and validation messages ~~~~ */
+
+.g-message-block {
+  background-position: .4em .3em;
+  border: 1px solid #ccc;
+  padding: 0;
+}
+
+#g-action-status {
+  margin-bottom: 1em;
+}
+
+#g-action-status li,
+p#g-action-status,
+div#g-action-status {
+  padding: .3em .3em .3em 30px;
+}
+
+#g-site-status li {
+  border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
+}
+
+.g-module-status {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.g-message {
+  background-position: 0 50%;
+}
+
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  clear: both;
+  padding: 0 20px;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: 1em 8px 1em 18px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator {
+  padding: .2em 0;
+  width: 100%;
+}
+
+.g-paginator li {
+  float: left;
+}
+
+.g-paginator .g-info {
+  background: none;
+  padding: .2em 0;
+  text-align: center;
+  width: 40%;
+}
+
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog .g-cancel {
+  margin: .4em 1em;
+}
+
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
+/* Inline layout  ~~~~~~~~~~ */
+
+.g-inline li {
+  float: left;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
+}
+
+.g-inline li.g-first {
+  margin-left: 0;
+}
+
 /* STUFF THAT NEEDS A HOME */
 
 #g-move ul {
@@ -796,8 +1292,316 @@ li.g-error select {
 
 /* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
 
-.rtl {
-  direction: rtl;
+.rtl #g-header,
+.rtl #g-content,
+.rtl #g-sidebar,
+.rtl #g-footer,
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.rtl .g-context-menu li a,
+.rtl .g-message-box li,
+.rtl #g-site-status li {
+  text-align: right;
+}
+
+.rtl .g-text-right {
+  text-align: left;
+}
+
+.rtl .g-error,
+.rtl .g-info,
+.rtl .g-success,
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-paginator li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon,
+.rtl .g-short-form li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl input.checkbox,
+.rtl input[type=checkbox],
+.rtl input.radio,
+.rtl input[type=radio] {
+  float: right;
+}
+
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
+.rtl .g-inline li {
+  margin-right: 1em;
+}
+
+.rtl .g-inline li.g-first {
+  margin-right: 0;
+}
+
+.rtl .g-breadcrumbs li {
+  background: transparent url('images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.rtl .g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+.rtl input.checkbox {
+  margin-left: .4em;
+}
+
+.rtl #g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.rtl .ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.rtl .ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .g-buttonset .ui-corner-tl {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-tr {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-bl {
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-br {
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-right,
+.rtl .ui-progressbar .ui-corner-right {
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	border-top-right-radius: 0;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
+}
+
+.rtl .g-buttonset .ui-corner-left,
+.rtl .ui-progressbar .ui-corner-left {
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-left-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
+}
+
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a {
+    border-left: none;
+	border-right:1px solid #fff;
+}
+
+.rtl .sf-menu a.sf-with-ul {
+	padding-left: 2.25em;
+	padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+	left: .75em !important;
+    right: auto;
+	background: url('superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top:			.8em;
+	background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+.rtl a:focus > .sf-sub-indicator,
+.rtl a:hover > .sf-sub-indicator,
+.rtl a:active > .sf-sub-indicator,
+.rtl li:hover > a > .sf-sub-indicator,
+.rtl li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
+.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
+/* apply hovers to modern browsers */
+.rtl .sf-menu ul a:focus > .sf-sub-indicator,
+.rtl .sf-menu ul a:hover > .sf-sub-indicator,
+.rtl .sf-menu ul a:active > .sf-sub-indicator,
+.rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
+.rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: 0 0; /* arrow hovers for modern browsers*/
+}
+
+.rtl .sf-menu li:hover ul,
+.rtl .sf-menu li.sfHover ul {
+	right: 0;
+	left: auto;
+}
+
+.rtl ul.sf-menu li li:hover ul,
+.rtl ul.sf-menu li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+.rtl ul.sf-menu li li li:hover ul,
+.rtl ul.sf-menu li li li.sfHover ul {
+	right:	12em; /* match ul width */
+	left: auto;
+}
+
+/*** shadows for all but IE6 ***/
+.rtl .sf-shadow ul {
+	background:	url('superfish/images/shadow.png') no-repeat bottom left;
+	padding: 0 0 9px 8px;
+	border-top-right-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-topleft: 17px;
+	-moz-border-radius-bottomright: 17px;
+	-webkit-border-top-left-radius: 17px;
+	-webkit-border-bottom-right-radius: 17px;
+	border-top-left-radius: 17px;
+	border-bottom-right-radius: 17px;
+}
+
+/* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.rtl .ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.rtl .ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-paginator .g-info {
+  width: 35%;
+}
+
+.rtl .g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.rtl .g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
+
+.rtl #g-header #g-login-menu,
+.rtl #g-header #g-quick-search-form {
+  clear: left;
+  float: left;
+}
+
+.rtl #g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
+.rtl #g-site-menu {
+  left: auto;
+  right: 150px;
+}
+
+.rtl #g-view-menu #g-slideshow-link {
+  background-image: url('../images/ico-view-slideshow-rtl.png');
+}
+
+.rtl #g-sidebar .g-block-content {
+  padding-right: 1em;
+  padding-left: 0;
+}
+
+.rtl #g-footer #g-credits li {
+  padding-left: 1.2em !important;
+  padding-right: 0;
 }
 
 .rtl caption,
diff --git a/themes/three_nids/views/page.html.php b/themes/three_nids/views/page.html.php
index ffad767f..ae0e1b16 100644
--- a/themes/three_nids/views/page.html.php
+++ b/themes/three_nids/views/page.html.php
@@ -33,7 +33,6 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("jquery.fancybox.css") ?>
     <?= $theme->css("screen.css") ?>
     <?= $theme->css("three_nids.css") ?>