Manually merged a conflict after pulling from upstream.

10 files changed, 831 insertions, 693 deletions

diff --git a/themes/admin_wind/css/screen-rtl.css b/themes/admin_wind/css/screen-rtl.css
new file mode 100644
index 00000000..0809c1b5
--- /dev/null
+++ b/themes/admin_wind/css/screen-rtl.css
@@ -0,0 +1,318 @@
+/**
+ * Gallery 3 Admin Wind Theme Right-to-Left Screen Styles
+ */
+
+.rtl {
+  direction: rtl;
+}
+
+#g-header,
+#g-content,
+#g-sidebar,
+#g-footer,
+caption,
+th,
+#g-dialog,
+.g-context-menu li a,
+.g-message-box li,
+#g-site-status li {
+  text-align: right;
+}
+
+.g-text-right {
+  text-align: left;
+}
+
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-text li,
+.g-text li {
+  margin-left: 0;
+  margin-right: 1em;
+}
+
+/* Messages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-error,
+.g-info,
+.g-success,
+.g-warning,
+#g-add-photos-status .g-success,
+#g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.g-left,
+.g-inline li,
+#g-content #g-album-grid .g-item,
+.sf-menu li,
+.g-breadcrumbs li,
+.g-paginator li,
+.g-buttonset li,
+.ui-icon-left .ui-icon,
+.g-short-form li,
+form ul ul li,
+input[type="submit"],
+input[type="reset"],
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: right;
+}
+
+.g-right,
+.ui-icon-right .ui-icon {
+  float: left;
+}
+
+.g-inline li {
+  margin-right: 1em;
+}
+
+.g-inline li.g-first {
+  margin-right: 0;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+input.checkbox {
+  margin-left: .4em;
+}
+
+#g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.g-buttonset .ui-corner-right,
+.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;
+}
+
+.g-buttonset .ui-corner-left,
+.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 ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.sf-menu a {
+  border-left: none;
+  border-right:1px solid #fff;
+}
+
+.sf-menu a.sf-with-ul {
+  padding-left: 2.25em;
+  padding-right: 1em;
+}
+
+.sf-sub-indicator {
+  left: .75em !important;
+  right: auto;
+  background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px;
+}
+
+a > .sf-sub-indicator {
+  top: .8em;
+  background-position: -10px -100px;
+}
+
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 -100px;
+}
+
+.sf-menu ul .sf-sub-indicator {
+  background-position: 0 0;
+}
+
+.sf-menu ul a > .sf-sub-indicator {
+  background-position: -10px 0;
+}
+
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 0;
+}
+
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+  right: 0;
+  left: auto;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+  right: 12em;
+  left: auto;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+  right: 12em;
+  left: auto;
+}
+
+.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 ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
+#g-content #g-album-grid .g-item,
+#g-site-theme,
+#g-admin-theme,
+.g-selected img,
+.g-available .g-block img,
+#g-content #g-photo-stream .g-item,
+li.g-group,
+#g-server-add-admin {
+  float: right;
+}
+
+#g-admin-graphics .g-available .g-block {
+  float: right;
+  margin-left: 1em;
+  margin-right: 0em;
+}
+
+#g-site-admin-menu {
+  left: auto;
+  right: 150px;
+}
+
+#g-header #g-login-menu {
+  float: left;
+}
+
+#g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
+#g-sidebar .g-block-content {
+  padding-left: 0em;
+  padding-right: 1em;
+}
+
+.g-selected img,
+.g-available .g-block img {
+  margin: 0 0 1em 1em;
+}
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index a5376ff6..58942387 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -12,7 +12,6 @@
  *   6)  Positioning and order
  *   7)  Navigation and menus
  *   8)  jQuery and jQuery UI
- *   9)  Right-to-left language styles
  *
  * @todo Review g-buttonset-vertical
  */
@@ -26,7 +25,10 @@ body, html {
   font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
 }
 
-p {
+p,
+#g-content ul,
+#g-content ol,
+#g-content dl {
   margin-bottom: 1em;
 }
 
@@ -87,7 +89,25 @@ a:hover,
   text-decoration: none;
 }
 
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+ul.g-text li,
+.g-text ul li {
+  list-style-type: disc;
+}
+
+ol.g-text li,
+.g-text ol li {
+  list-style-type: decimal;
+}
+
+.g-text li,
+.g-text li {
+  margin-left: 1em;
+}
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 form {
   margin: 0;
 }
@@ -296,6 +316,7 @@ th {
 }
 
 /* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 .g-text-small {
   font-size: .8em;
 }
@@ -333,10 +354,6 @@ th {
   padding: 0;
 }
 
-#g-sidebar .g-block-content {
-  padding: 0;
-}
-
 #g-content .g-selected,
 #g-content .g-available .g-block {
   border: 1px solid #ccc;
@@ -399,15 +416,12 @@ 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%;
 }
@@ -602,11 +616,13 @@ ul.enumeration li {
 }
 
 /* In-line editing  ~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-in-place-edit-message {
   background-color: #FFF;
 }
 
-/* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Language options  ~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-share-translations-form fieldset {
   border: 0px;
   margin: 0px;
@@ -703,11 +719,11 @@ tr.g-error td.g-error,
 }
 
 tr.g-success {
-	background-image: none;
+  background-image: none;
 }
 
 tr.g-success td.g-success {
-	background-image: url('../images/ico-success.png');
+  background-image: url('../images/ico-success.png');
 }
 
 .g-warning,
@@ -731,8 +747,8 @@ form .g-error {
 }
 
 .g-default {
-	background-color: #c5dbec;
-	font-weight: bold;
+  background-color: #c5dbec;
+  font-weight: bold;
 }
 
 .g-draggable {
@@ -810,6 +826,7 @@ form .g-error {
 /** *******************************************************************
  *  8) jQuery and jQuery UI
  *********************************************************************/
+
 /* Generic block container ~~~~~~~~~~~~~~~ */
 
 .g-block {
@@ -878,7 +895,7 @@ button {
 .g-progress-bar {
   height: 1em;
   width: 100%;
-  margin-top: .5em;
+  margin: .5em 0;
   display: inline-block;
 }
 
@@ -993,18 +1010,19 @@ div#g-action-status {
 }
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
 .sf-menu ul {
-	width: 12em;
+  width: 12em;
 }
 
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:	12em;
+  left: 12em;
 }
 
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left: 12em;
+  left: 12em;
 }
 
 
@@ -1018,6 +1036,7 @@ ul.sf-menu li li li.sfHover ul {
 }
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
 .ui-widget-overlay {
   background: #000;
   opacity: .7;
@@ -1037,301 +1056,3 @@ ul.sf-menu li li li.sfHover ul {
 #g-admin-dashboard-sidebar .ui-dialog-titlebar {
   padding: .2em .4em;
 }
-
-/** *******************************************************************
- *  9) 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('../../../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 #g-content #g-album-grid .g-item,
-.rtl #g-site-theme,
-.rtl #g-admin-theme,
-.rtl .g-selected img,
-.rtl .g-available .g-block img,
-.rtl #g-content #g-photo-stream .g-item,
-.rtl li.g-group,
-.rtl #g-server-add-admin {
-  float: right;
-}
-
-.rtl #g-admin-graphics .g-available .g-block {
-  float: right;
-  margin-left: 1em;
-  margin-right: 0em;
-}
-
-.rtl #g-site-admin-menu {
-  left: auto;
-  right: 150px;
-}
-
-.rtl #g-header #g-login-menu {
-  float: left;
-}
-
-.rtl #g-header #g-login-menu li {
-  margin-left: 0;
-  padding-left: 0;
-  padding-right: 1.2em;
-}
-
-.rtl .g-selected img,
-.rtl .g-available .g-block img {
-  margin: 0 0 1em 1em;
-}
diff --git a/themes/admin_wind/theme.info b/themes/admin_wind/theme.info
index 4034b64a..466d8e43 100644
--- a/themes/admin_wind/theme.info
+++ b/themes/admin_wind/theme.info
@@ -4,3 +4,7 @@ version = 1
 author = "Gallery Team"
 admin = 1
 site = 0
+author_name = "Gallery Team"
+author_url = "http://codex.gallery2.org/Gallery:Team"
+info_url = "http://codex.gallery2.org/Gallery3:Themes:admin_wind"
+discuss_url = "http://gallery.menalto.com/forum_theme_admin_wind"
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index a56b6f41..9a149149 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -15,6 +15,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
 
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
@@ -27,6 +29,7 @@
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
+    <?= $theme->script("jquery.scrollTo.js") ?>
 
     <?= $theme->admin_head() ?>
 
@@ -36,8 +39,11 @@
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("screen.css") ?>
+    <? if (locales::is_rtl()): ?>
+    <?= $theme->css("screen-rtl.css") ?>
+    <? endif; ?>
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
 
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
deleted file mode 100644
index 5fff5845..00000000
--- a/themes/admin_wind/views/pager.html.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-paginator">
-  <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t2("Item %from_number of %count",
-                       "Items %from_number - %to_number of %count",
-                       $total_items,
-                       array("from_number" => $current_first_item,
-                             "to_number" => $current_last_item,
-                             "count" => $total_items)) ?>
-  <li>
-  <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? endif ?>
-  <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? endif ?>
-  </li>
-  <li class="g-info"><?= $from_to_msg ?></li>
-  <li class="g-text-right">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? endif ?>
-  <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? endif ?>
-  </li>
-</ul>
diff --git a/themes/admin_wind/views/paginator.html.php b/themes/admin_wind/views/paginator.html.php
new file mode 100644
index 00000000..b46d9741
--- /dev/null
+++ b/themes/admin_wind/views/paginator.html.php
@@ -0,0 +1,88 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+// This is a generic paginator for admin collections.  Depending on the page type, there are
+// different sets of variables available.  With this data, you can make a paginator that
+// lets you say "You're viewing photo 5 of 35", or "You're viewing photos 10 - 18 of 37"
+// for album views.
+
+//
+// Available variables for all page types:
+//   $page_type               - "collection", "item", or "other"
+//   $page_subtype            - "album", "movie", "photo", "tag", etc.
+//   $previous_page_url       - the url to the previous page, if there is one
+//   $next_page_url           - the url to the next page, if there is one
+//   $total                   - the total number of photos in this album
+//
+// Available for the "collection" page types:
+//   $page                    - what page number we're on
+//   $max_pages               - the maximum page number
+//   $page_size               - the page size
+//   $first_page_url          - the url to the first page, or null if we're on the first page
+//   $last_page_url           - the url to the last page, or null if we're on the last page
+//   $first_visible_position  - the position number of the first visible photo on this page
+//   $last_visible_position   - the position number of the last visible photo on this page
+//
+// Available for "item" page types:
+//   $position                - the position number of this photo
+//
+?>
+
+<? if ($total): ?>
+<ul class="g-paginator ui-helper-clearfix">
+  <li class="g-first">
+  <? if ($page_type == "collection"): ?>
+    <? if (isset($first_page_url)): ?>
+      <a href="<?= $first_page_url ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
+        <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
+    <? else: ?>
+      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
+        <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
+    <? endif ?>
+  <? endif ?>
+
+  <? if (isset($previous_page_url)): ?>
+    <a href="<?= $previous_page_url ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
+  <? else: ?>
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
+  <? endif ?>
+  </li>
+
+  <li class="g-info">
+    <? if ($total): ?>
+      <? if ($page_type == "collection"): ?>
+        <?= /* @todo This message isn't easily localizable */
+            t2("Viewing %from_number of %count",
+               "Viewing %from_number - %to_number of %count",
+               $total,
+               array("from_number" => $first_visible_position,
+                     "to_number" => $last_visible_position,
+                     "count" => $total)) ?>
+      <? else: ?>
+        <?= t("%position of %total", array("position" => $position, "total" => $total)) ?>
+      <? endif ?>
+    <? endif ?>
+  </li>
+
+  <li class="g-text-right">
+  <? if (isset($next_page_url)): ?>
+    <a href="<?= $next_page_url ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
+  <? else: ?>
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
+  <? endif ?>
+
+  <? if ($page_type == "collection"): ?>
+    <? if (isset($last_page_url)): ?>
+      <a href="<?= $last_page_url ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
+        <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
+    <? else: ?>
+      <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
+        <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
+    <? endif ?>
+  <? endif ?>
+  </li>
+</ul>
+<? endif ?>
\ No newline at end of file
diff --git a/themes/wind/css/screen-rtl.css b/themes/wind/css/screen-rtl.css
new file mode 100644
index 00000000..914a19dd
--- /dev/null
+++ b/themes/wind/css/screen-rtl.css
@@ -0,0 +1,334 @@
+/**
+ * Gallery 3 Wind Theme Right-to-Left Screen Styles
+ */
+
+.rtl {
+  direction: rtl;
+}
+
+#g-header,
+#g-content,
+#g-sidebar,
+#g-footer,
+caption,
+th,
+#g-dialog,
+.g-context-menu li a,
+.g-message-box li,
+#g-site-status li {
+  text-align: right;
+}
+
+.g-text-right {
+  text-align: left;
+}
+
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-text li,
+.g-text li {
+  margin-left: 0;
+  margin-right: 1em;
+}
+
+/* Messages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-error,
+.g-info,
+.g-success,
+.g-warning,
+#g-add-photos-status .g-success,
+#g-add-photos-status .g-error {
+  background-position: center right;
+  padding-right: 30px !important;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  padding-right: 0 !important;
+}
+
+.g-left,
+.g-inline li,
+#g-content #g-album-grid .g-item,
+.sf-menu li,
+.g-breadcrumbs li,
+.g-paginator li,
+.g-buttonset li,
+.ui-icon-left .ui-icon,
+.g-short-form li,
+form ul ul li,
+input[type="submit"],
+input[type="reset"],
+input.checkbox,
+input[type=checkbox],
+input.radio,
+input[type=radio] {
+  float: right;
+}
+
+.g-right,
+.ui-icon-right .ui-icon {
+  float: left;
+}
+
+.g-inline li {
+  margin-right: 1em;
+}
+
+.g-inline li.g-first {
+  margin-right: 0;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
+  padding: 1em 18px 1em 8px;
+}
+
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-right: 0;
+}
+
+input.checkbox {
+  margin-left: .4em;
+}
+
+#g-add-comment {
+  right: inherit;
+  left: 0;
+}
+
+.ui-icon-left .ui-icon {
+  margin-left: .2em;
+}
+
+.ui-icon-right .ui-icon {
+  margin-right: .2em;
+}
+
+/* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.g-buttonset .ui-corner-right,
+.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;
+}
+
+.g-buttonset .ui-corner-left,
+.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 ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.sf-menu a {
+  border-left: none;
+  border-right:1px solid #fff;
+}
+
+.sf-menu a.sf-with-ul {
+  padding-left: 2.25em;
+  padding-right: 1em;
+}
+
+.sf-sub-indicator {
+  left: .75em !important;
+  right: auto;
+  background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px;
+}
+
+a > .sf-sub-indicator {
+  top: .8em;
+  background-position: -10px -100px;
+}
+
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 -100px;
+}
+
+.sf-menu ul .sf-sub-indicator {
+  background-position:  0 0;
+}
+
+.sf-menu ul a > .sf-sub-indicator {
+  background-position: -10px 0;
+}
+
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+  background-position: 0 0;
+}
+
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+  right: 0;
+  left: auto;
+}
+
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+  right: 12em;
+  left: auto;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+  right: 12em;
+  left: auto;
+}
+
+.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 ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.ui-dialog .ui-dialog-titlebar {
+  padding: 0.5em 1em 0.3em 0.3em;
+}
+
+.ui-dialog .ui-dialog-title {
+  float: right;
+}
+
+.ui-dialog .ui-dialog-titlebar-close {
+  left: 0.3em;
+  right: auto;
+}
+
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator .g-info {
+  width: 35%;
+}
+
+.g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
+
+#g-header #g-login-menu,
+#g-header #g-quick-search-form {
+  clear: left;
+  float: left;
+}
+
+#g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
+#g-site-menu {
+  left: auto;
+  right: 150px;
+}
+
+#g-view-menu #g-slideshow-link {
+  background-image: url('../images/ico-view-slideshow-rtl.png');
+}
+
+#g-sidebar .g-block-content {
+  padding-right: 1em;
+  padding-left: 0;
+}
+
+#g-footer #g-credits li {
+  padding-left: 1.2em !important;
+  padding-right: 0;
+}
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index a49b8c28..d3e0f83c 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -12,7 +12,6 @@
  *   6)  Positioning and order
  *   7)  Navigation and menus
  *   8)  jQuery and jQuery UI
- *   9)  Right-to-left language styles
  */
 
 /** *******************************************************************
@@ -106,12 +105,30 @@ a:hover,
 }
 
 #g-dialog #g-action-status li {
-  width: 400px;
+  width: 434px;
   white-space: normal;
   padding-left: 32px;
 }
 
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+ul.g-text li,
+.g-text ul li {
+  list-style-type: disc;
+}
+
+ol.g-text li,
+.g-text ol li {
+  list-style-type: decimal;
+}
+
+.g-text li,
+.g-text li {
+  margin-left: 1em;
+}
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 form {
   margin: 0;
 }
@@ -302,6 +319,7 @@ td {
 }
 
 /* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 .g-text-small {
   font-size: .8em;
 }
@@ -332,6 +350,7 @@ td {
  *********************************************************************/
 
 /* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+
 .g-one-quarter {
   width: 25%;
 }
@@ -523,7 +542,8 @@ td {
   background-color: #fff;
 }
 
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-edit-permissions-form td {
   background-image: none;
 }
@@ -635,11 +655,11 @@ tr.g-error td.g-error,
 }
 
 tr.g-success {
-	background-image: none;
+  background-image: none;
 }
 
 tr.g-success td.g-success {
-	background-image: url('../images/ico-success.png');
+  background-image: url('../images/ico-success.png');
 }
 
 .g-warning,
@@ -823,6 +843,7 @@ form .g-error {
 /** *******************************************************************
  *  8) jQuery and jQuery UI
  *********************************************************************/
+
 /* Generic block container ~~~~~~~~~~~~~~~ */
 
 .g-block {
@@ -834,18 +855,19 @@ form .g-error {
 }
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
 .sf-menu ul {
-	width: 12em;
+  width: 12em;
 }
 
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:	12em;
+  left: 12em;
 }
 
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left: 12em;
+  left: 12em;
 }
 
 .sf-menu li li,
@@ -922,7 +944,7 @@ button {
 .g-progress-bar {
   height: 1em;
   width: 100%;
-  margin-top: .5em;
+  margin: .5em 0;
   display: inline-block;
 }
 
@@ -1037,326 +1059,7 @@ div#g-action-status {
 }
 
 /* Autocomplete  ~~~~~~~~~~ */
+
 .ac_loading {
   background: white url('../images/loading-small.gif') right center no-repeat !important;
 }
-
-/** *******************************************************************
- *  9) 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 #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 {
-  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;
-}
diff --git a/themes/wind/theme.info b/themes/wind/theme.info
index 17ea7c20..e0be78b9 100644
--- a/themes/wind/theme.info
+++ b/themes/wind/theme.info
@@ -4,3 +4,7 @@ version = 1
 author = "Gallery Team"
 site = 1
 admin = 0
+author_name = "Gallery Team"
+author_url = "http://codex.gallery2.org/Gallery:Team"
+info_url = "http://codex.gallery2.org/Gallery3:Themes:wind"
+discuss_url = "http://gallery.menalto.com/forum_theme_wind"
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 2b86556d..045e3c45 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -21,7 +21,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
-
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
@@ -66,6 +67,9 @@
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("screen.css") ?>
+    <? if (locales::is_rtl()): ?>
+    <?= $theme->css("screen-rtl.css") ?>
+    <? endif; ?>
     <!--[if lte IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
           media="screen,print,projection" />