Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

65 files changed, 1395 insertions, 2779 deletions

diff --git a/themes/admin_default/css/fix-ie.css b/themes/admin_default/css/fix-ie.css
deleted file mode 100644
index 6bc2334c..00000000
--- a/themes/admin_default/css/fix-ie.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Fix display in IE 6 and 7
- */
-
-#gHeader,
-#gGroupAdmin,
-#gDeveloperTools,
-.gAvailable .gBlock {
-  zoom: 1;
-}
-
-.gUnavailable {
-  filter: alpha(opacity=40);
-}
-
-.gUnavailable:hover {
-  filter: alpha(opacity=100);
-}
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
deleted file mode 100644
index de6d436e..00000000
--- a/themes/admin_default/css/screen.css
+++ /dev/null
@@ -1,1170 +0,0 @@
-/**
- * Gallery 3 Default Theme Screen Styles
- *
- * @requires YUI reset, font, grids CSS
- *
- * Sheet organization:
- *  1)  Basic HTML elements
- *  2)  Reusable classes
- *  3)  Reusable content blocks
- *  4)  Page layout containers
- *  5)  Content blocks in specific layout containers
- *  6)  Navigation and menus
- *  7)  Browser hacks
- *  8)  jQuery and jQuery UI
- *  9)  Right-to-left language styles
- */
-
-/** *******************************************************************
- * 1) Basic HTML elements
- **********************************************************************/
-
-body, html {
-  background-color: #ccc;
-  font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-}
-
-p {
-  margin-bottom: 1em;
-}
-
-em {
-  font-style: oblique;
-}
-
-h1, h2, h3, h4, h5, strong, th {
-  font-weight: bold;
-}
-
-h1 {
-  font-size: 1.7em;
-}
-
-#gSearchResults h1 {
-  margin-bottom: 1em;
-}
-
-#gProgress h1 {
-  font-size: 1.1em;
-}
-
-h2 {
-  font-size: 1.4em;
-}
-
-#gSidebar .gBlock h2 {
-  font-size: 1.2em;
-}
-
-#gSidebar .gBlock li {
-  margin-bottom: .6em;
-}
-
-h3 {
-  font-size: 1.2em;
-}
-
-/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-a,
-.gMenu a,
-#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
-a.ui-state-hover,
-input.ui-state-hover,
-button.ui-state-hover {
-  color: #5382BF !important;
-  text-decoration: none;
-  -moz-outline-style: none;
-}
-
-a:hover,
-#gDialog a:hover {
-  text-decoration: underline;
-}
-
-.gMenu a:hover {
-  text-decoration: none;
-}
-
-#gDialog .gCancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
-
-#gForgotPasswordLink {
-  float: right;
-  font-size: .9em;
-}
-
-#gDialog .gCancel {
-  float: left;
-}
-
-/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-table {
-  width: 100%;
-}
-
-#gContent table {
-  margin: 1em 0 3em 0;
-}
-
-caption,
-th {
-  text-align: left;
-}
-
-th,
-td {
-  border: none;
-  border-bottom: 1px solid #ccc;
-  padding: .5em;
-  vertical-align: top;
-}
-
-#gAdminMaintenance td {
-  vertical-align: middle;
-}
-
-/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-fieldset {
-  border: 1px solid #ccc;
-  padding-bottom: .8em;
-}
-
-#gHeader fieldset,
-#gSidebar fieldset,
-.gShortForm fieldset {
-  border: none;
-}
-
-legend {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-#gHeader legend,
-#gSidebar legend,
-#gContent #gSearchForm legend,
-input[type="hidden"],
-.gShortForm label {
-  display: none;
-}
-
-label {
-  cursor: help;
-}
-
-input[type="text"],
-input[type="password"] {
-  width: 50%;
-}
-
-input[type="text"],
-input[type="password"],
-textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-}
-
-textarea {
-  width: 100%;
-  height: 12em;
-}
-
-input:focus,
-textarea:focus,
-option:focus {
-  background-color: #ffc;
-  color: #000;
-}
-
-/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form li {
-  margin: 0 !important;
-  padding: .3em 1.5em .3em 1em;
-}
-
-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;
-}
-
-/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gValidationRule {
-  font-size: 80%;
-  margin-top: .5em;
-}
-
-form.gError input[type="text"],
-li.gError input[type="text"],
-form.gError input[type="password"],
-li.gError input[type="password"],
-form.gError input[type="checkbox"],
-li.gError input[type="checkbox"],
-form.gError input[type="radio"],
-li.gError input[type="radio"],
-form.gError textarea,
-li.gError textarea,
-form.gError select,
-li.gError select {
-  border: 2px solid red;
-}
-
-/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
-/** *******************************************************************
- * 3) Reusable content blocks
- *********************************************************************/
-
-.gBlock {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  clear: both;
-  margin-bottom: 2.5em;
-  padding: 1em;
-}
-
-#gSidebar .gBlockContent {
-  padding: 0;
-}
-
-.gBlock h2 {
-  background-color: #e8e8e8;
-  padding: .3em .8em;
-}
-
-.gBlockContent {
-  margin-top: 1em;
-}
-
-.gSelected img,
-.gAvailable .gBlock img {
-  float: left;
-  margin: 0 1em 1em 0;
-}
-
-.rtl .gSelected img,
-.rtl .gAvailable .gBlock img {
-  float: right;
-}
-
-.gSelected {
-  background: #e8e8e8;
-}
-
-.gAvailable .gInstalledToolkit:hover {
-  cursor: pointer;
-  background: #eee;
-}
-
-.gAvailable .gButtonLink {
-  width: 96%;
-}
-
-.gSelected .gButtonLink {
-  display: none;
-}
-
-.gUnavailable {
-  border-color: #999;
-  opacity: 0.4;
-}
-
-.gOddRow {
-  background-color: #eee;
-}
-
-.gEvenRow {
-  background-color: #fff;
-}
-
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gMessage {
-  width: 100%;
-}
-
-#gSiteStatus li,
-#gMessage li,
-.gModuleStatus {
-  border: 1px solid #ccc;
-  margin-bottom: .4em;
-}
-
-#gSiteStatus li {
-  margin-bottom: 0;
-  border: none;
-  border-bottom: 1px solid #ccc;
-}
-
-.gModuleStatus {
-  clear: both;
-  margin-bottom: 1em;
-}
-
-.gError,
-.gInfo,
-.gSuccess,
-.gWarning {
-  padding: .4em .5em .4em 30px;
-}
-
-.gError, tr.gError td.gError {
-  background: #f6cbca url('../images/ico-error.png') no-repeat .4em 50%;
-}
-
-.gInfo {
-  background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
-}
-
-.gSuccess {
-  background: #d9efc2  url('../images/ico-success.png') no-repeat .4em 50%;
-}
-
-.gWarning, tr.gWarning td.gWarning {
-  background: #fcf9ce url('../images/ico-warning.png') no-repeat .4em 50%;
-}
-
-.gPager .gInfo,
-tr.gError,
-tr.gInfo,
-tr.gSuccess,
-tr.gWarning {
-  background: none;
-}
-
-.gInfo td.gInfo {
-  background-color: transparent;
-}
-
-.gSuccess td.gSuccess {
-  background-color: transparent;
-}
-
-.gError td {
-  background-color: #f6cbca;
-}
-
-.gWarning td {
-  background-color: #fcf9ce;
-}
-
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.gShortForm li {
-  float: left;
-  padding: .4em 0;
-}
-
-.gShortForm input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
-/*** ******************************************************************
- * 4) Page layout containers
- *********************************************************************/
-
-/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gView {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border-bottom: none;
-  min-width: 974px !important;
-}
-
-/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
-
-#gHeader {
-  background-color: #e8e8e8;
-  border-bottom: 1px solid #ccc;
-  font-size: .8em;
-  margin-bottom: 20px;
-  padding: 0 20px;
-  position: relative;
-}
-
-#gContent {
-  font-size: 1.1em;
-  padding-left: 20px;
-  width: 96%;
-}
-
-#gSidebar {
-  background-color: #fff;
-  font-size: .9em;
-  padding: 0 20px;
-  width: 220px;
-}
-
-#gFooter {
-  background-color: #e8e8e8;
-  border-top: 1px solid #ccc;
-  font-size: .8em;
-  margin-top: 20px;
-  padding: 10px 20px;
-}
-
-/** *******************************************************************
- * 5) Content blocks in specific layout containers
- *********************************************************************/
-
-/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gHeader #gLogo {
-  background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
-  color: #A5A5A5 !important;
-  display: block;
-  height: 55px;
-  padding-top: 5px;
-  width: 105px;
-}
-
-#gHeader #gLogo:hover {
-  color: #f60 !important;
-  text-decoration: none;
-}
-
-#gHeader #gQuickSearchForm {
-  clear: right;
-  float: right;
-  margin: 1em 0;
-}
-
-#gHeader #gQuickSearchForm input[type='text'] {
-  width: 17em;
-}
-
-#gContent .gBlock h2 {
-  background-color: transparent;
-  padding-left: 0;
-}
-
-#gSidebar .gBlockContent {
-  padding-left: 1em;
-}
-
-/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gHeader #gLoginMenu li,
-#gFooter #gCredits li {
-  display: inline;
-}
-
-#gHeader #gLoginMenu li {
-  padding-left: 1.2em;
-}
-
-#gFooter #gCredits li {
-  padding-right: 1.2em;
-}
-
-#gContent #gSearchResults {
-  margin-top: 1em;
-  padding-top: 1em;
-}
-
-.gBlock .ui-dialog-titlebar {
-  margin: -1em -1em 0;
-}
-
-#gSidebar .gBlock h2 {
-  background: none;
-}
-
-#gPhotoStream {
-  background-color: #e8e8e8;
-}
-
-#gPhotoStream .gBlockContent ul {
-  border-right: 1px solid #e8e8e8;
-  height: 135px;
-  overflow: auto;
-  overflow: -moz-scrollbars-horizontal; /* for FF */
-  overflow-x: scroll; /* scroll horizontal */
-  overflow-y: hidden; /* Hide vertical*/
-}
-
-#gContent #gPhotoStream .gItem {
-  background-color: #fff;
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
-  float: left;
-  height: 90px;
-  overflow: hidden;
-  text-align: center;
-  width: 90px;
-}
-
-.rtl #gContent #gPhotoStream .gItem {
-  float: right;
-}
-
-#gSiteStatus {
-  margin-bottom: 0;
-}
-
-#gContent .gItem {
-  background-color: #fff;
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
-  height: 90px;
-  padding: 14px 8px;
-  text-align: center;
-  width: 90px;
-}
-
-#gAdminCommentsMenu {
-  margin: 1em 0;
-}
-
-#gAdminCommentsMenu a {
-  margin: 0;
-  padding: .2em .6em;
-}
-
-#gAdminGraphics .gAvailable .gBlock {
-  clear: none;
-  float: left;
-  height: 17em;
-  margin-right: 1em;
-  width: 30%;
-}
-
-.rtl #gAdminGraphics .gAvailable .gBlock {
-  float: right;
-  margin-left: 1em;
-  margin-right: 0em;
-}
-
-#gSiteTheme,
-#gAdminTheme {
-  float: left;
-  width: 48%;
-}
-
-.rtl #gSiteTheme,
-.rtl #gAdminTheme {
-  float: right;
-}
-
-#gSiteTheme {
-  margin-right: 1em;
-}
-
-#gUserAdminList {
-  margin-bottom: 1em;
-}
-#gUserAdminList td {
-  vertical-align: bottom;
-}
-
-#gUserAdminList .gDraggable:hover {
-  border: 1px dashed black;
-}
-
-#gUserAdminList .admin {
-  color: #55f;
-  font-weight: bold;
-}
-
-.gActions a,
-.gActions span {
-  margin-right: 3em;
-}
-
-li.gGroup {
-  float: left;
-  display: block;
-  width: 200px;
-  border: 1px solid gray;
-  padding: 0;
-  margin: 0 1em 1em 0;
-}
-
-.rtl li.gGroup {
-  float: right;
-}
-
-li.gGroup h4 {
-  background-color: #eee;
-  border-bottom: 1px dashed #ccc;
-  padding: .5em 0 .5em .5em;
-}
-li.gGroup .gButtonLink {
-  padding: 0;
-}
-li.gGroup ul, li.gGroup div {
-  height: 180px;
-  margin: 1px;
-  overflow: auto;
-  padding-top: .2em;
-}
-li.gGroup div p {
-  color: gray;
-  text-align: center;
-  padding: 2em .5em 0 .5em
-}
-li.gGroup .gUser {
-  padding: .2em 0 0 .5em;
-}
-li.gGroup .gUser .gButtonLink {
-  vertical-align: middle;
-}
-
-li.gDefaultGroup h4, li.gDefaultGroup .gUser {
-  color: gray;
-}
-
-#gAdminAdvancedSettings tr.setting:hover {
-  background: #ffc;
-}
-
-/** *******************************************************************
- * 5) Navigation and menus
- *********************************************************************/
-
-#gSiteAdminMenu,
-#gTagCloud ul {
-  font-size: 1.2em;
-}
-
-/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gHeader #gLoginMenu {
-  color: #999;
-  float: right;
-  margin: 0;
-  padding: 5px 0;
-}
-
-.rtl #gHeader #gLoginMenu {
-  text-align: left;
-}
-
-/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gSiteAdminMenu {
-  bottom: 0;
-	display: none;
-  font-size: 1.2em;
-  left: 140px;
-  position: absolute;
-}
-
-#gSiteAdminMenu ul {
-  margin-bottom: 0;
-}
-
-/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gPager {
-  clear: both;
-  margin: 0;
-  padding: 5px 0 !important;
-  width: 100%;
-}
-
-.gPager li {
-  float: left;
-  margin: 0;
-  width: 30%;
-}
-
-.gPager .gInfo {
-  text-align: center;
-  width: 40%;
-}
-
-/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-#gSiteAdminMenu:after,
-#gHeader:after,
-#gAdminCommentsMenu:after,
-#gGroupAdmin:after,
-.gSelected:after,
-.gAvailable .gBlock:after,
-#gModuleCreateForm ul li ul:after,
-#gDeveloperTools:after,
-#gPhotoStream:after,
-#gViewMenu:after {
-  clear: both;
-  content: ".";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
-
-/** *******************************************************************
- * 7) jQuery and jQuery UI
- *********************************************************************/
-
-/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-
-.sf-menu li li, .sf-menu li li ul li {
-  background-color: #bdd2ff;
-}
-
-.sf-menu li:hover {
-  background-color: #dfe9ff;
-}
-
-/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
-
-.gLoadingLarge {
-  background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
-  font-size: 0;
-}
-
-.gDialogLoadingLarge {
-  background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
-  font-size: 0;
-}
-
-.gLoadingSmall {
-  background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
-  font-size: 0;
-}
-
-.gDraggable {
-  cursor: move;
-}
-
-.gDropTarget {
-  background-color: #cfdeff;
-  border: 1px dotted #999;
-  height: 100px;
-  margin: 1em 0;
-}
-
-/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gPanel {
-  display: none;
-  padding: 1em;
-}
-
-#gPanel legend {
-  display: none;
-}
-
-#gPanel fieldset {
-  border: none;
-}
-
-.ui-draggable {
-  cursor: move;
-}
-
-.gButtonSetVertical a {
-  width: 8em !important;
-}
-
-#gAdminDashboard .ui-dialog-titlebar,
-#gAdminDashboardSidebar .ui-dialog-titlebar {
-  padding: .2em .4em;
-}
-
-.ui-widget-overlay {
-  background: #000;
-  opacity: .7;
-}
-
-#gDialog {
-  text-align: left;
-}
-
-#gDialog li {
-  padding-left: 0;
-}
-
-#gDialog form input[type="text"],
-#gDialog form input[type="password"] {
-  width: 100%;
-}
-
-#gDialog #gLoginForm,
-#gDialog #gAddUserForm,
-#gDialog #gAddGroupForm {
-  margin: 0 auto;
-  width: 270px;
-}
-
-#gDialog fieldset {
-  border: none;
-}
-
-#gDialog legend {
-  display: none;
-}
-
-/* jQuery UI ThemeRoller buttons */
-
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
-.gButtonSet {
-  padding-left: 1px;
-}
-
-.gButtonSet li {
-  float: left;
-}
-
-.gButtonSet .gButtonLink {
-  margin: 0;
-}
-
-.ui-icon-left .ui-icon {
-  float: left;
-  margin-right: .2em;
-}
-
-.ui-icon-right .ui-icon {
-  float: right;
-  margin-left: .2em;
-}
-
-.ui-icon-rotate-ccw {
-  background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
-  background-position: -208px -64px;
-}
-
-/*************** STUFF THAT NEEDS A HOME ****************/
-
-#gMove ul {
-  padding-left: 1em;
-}
-
-#gMove .selected {
-  background: #999;
-}
-
-.gProgressBar {
-  height: 1em;
-  width: 100%;
-  margin-top: .5em;
-  display: inline-block;
-}
-
-#gAddPhotos p {
-  margin: 0;
-  padding: 0;
-}
-
-#gAddPhotosCanvas {
-  height: 325px;
-  width: 450px;
-  overflow: auto;
-}
-
-#gAddPhotosQueue .progressbar {
-  height: 4px;
-}
-
-#gAddPhotosQueue .title {
-  font-size: 1.25em;
-}
-
-#gAddPhotosQueue .status {
-  font-size: .75em;
-}
-
-#gAddPhotosQueue .box {
-  margin-bottom: 8px;
-  padding: 4px;
-}
-
-#gAddPhotosQueue .pending {
-  background-color: #e8e8e8;
-  border: 1px solid #d7d7d7;
-}
-
-#gAddPhotosQueue .error {
-  background-color: #fcc;
-  border: 1px solid #ebb;
-}
-
-#gAddPhotosQueue .uploading {
-  background-color: #ff9;
-  border: 1px solid #ee8;
-}
-
-#gAddPhotosQueue .complete {
-  background-color: #cfc;
-  border: 1px solid #beb;
-}
-
-#gAdminG2ImportNotes {
-  padding-bottom: 20px;
-}
-
-#gAdminG2ImportDetails {
-  padding-top: 20px;
-}
-
-#gAdminG2ImportDetails .gWarning {
-  margin-top: 4px;
-}
-
-#gAdminG2ImportDetails .gInfo {
-  padding: 2px;
-  border: 1px solid #999;
-  margin-bottom: 10px;
-}
-
-#gAdminG2ImportNotes p,
-#gAdminG2ImportDetails .gInfo p {
-  padding: 0;
-  margin: 0;
-}
-
-#gAdminG2ImportNotes ul li,
-#gAdminG2Import .gInfo ul li {
-  padding-left: 0;
-  margin-left: 20px;
-  list-style-type: disc;
-}
-
-#gTagAdmin {
-  table-layout: fixed;
-}
-
-#gTagAdmin td {
-  border: 0;
-}
-
-#gTagAdmin ul {
-  padding-bottom: .3em;
-}
-
-#gTagAdmin li {
-  padding: .1em 0 .2em .3em;
-}
-
-#gTagAdmin .gColumn {
-  float: left;
-  width: 200px;
-}
-
-.rtl #gTagAdmin .gColumn {
-  float: right;
-}
-
-.gEditable {
-  padding: .1em .3em .2em .3em;
-}
-
-.gEditable:hover {
-  background-color: #ffc;
-  cursor: text;
-}
-
-#gRenameTagForm input {
-  padding: 0 .2em 0 .2em;
-  clear: none;
-  float: left;
-  margin: 0 .2em 0 0;
-}
-
-.rtl #gRenameTagForm input {
-  float: right;
-}
-
-#gRenameTagForm input[type="text"].gError {
-  border: 2px solid red;
-  background: none;
-}
-
-#gRenameTagForm input[type="submit"] {
-  height: 25px;
-}
-
-#gRenameTagForm a, #gRenameTagForm span {
-  display: block;
-  float: left;
-  padding: .2em .2em 0 .1em;
-}
-
-.rtl #gRenameTagForm a, #gRenameTagForm span {
-  float: right;
-}
-
-#gTaskLogDialog h1 {
-  font-size: 1.1em;
-}
-
-.gTaskLog {
-  border: 1pt solid;
-  font-size: .9em;
-  height: 400px;
-  margin: .5em 0;
-  overflow: auto;
-  padding: .5em
-}
-
-#gServerAddAdmin {
-  margin:auto;
-  text-align: left;
-}
-
-.rtl #gServerAddAdmin {
-  text-align: right;
-}
-
-#gServerAddAdmin form fieldset {
-  border: medium none;
-}
-
-#gServerAddAdmin legend {
-  display: none;
-}
-
-#gServerAddAdmin .gWarning {
-  background-color: #FFFF99;
-}
-
-#gAuthorizedPath {
-  margin: 0 !important;
-  padding: 0.3em 1.5em 0.3em 1em;
-}
-
-#gServerAdd Admin #path {
-  width: 80%;
-}
-
-.gRemoveDir:hover {
-  cursor: pointer;
-}
-
-#gLanguagesForm table {
-	width: 400px;
-	float: left;
-	margin: 0 3em 1em 0;
-}
-
-#gLanguagesForm .installed {
-  background-color: #EEEEEE;
-}
-
-#gLanguagesForm .default {
-	background-color: #C5DBEC;
-	font-weight: bold;
-}
-
-#gLanguagesForm input {
-	clear: both;
-}
-
-#gTranslations {
-	padding: 2em 0 0 0;
-	clear: both;
-}
-
-#gTranslations .gButtonLink {
-	padding: .5em;
-}
-
-.gDocLink {
-  float: right;
-}
-
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
-
-.rtl {
-  direction: rtl;
-}
-
-.rtl caption,
-.rtl th,
-.rtl #gDialog {
-  text-align: right;
-}
-
-.rtl .txtright {
-  text-align: left;
-}
-
-.rtl #gHeader #gQuickSearchForm,
-.rtl #gForgotPasswordLink,
-.rtl #gHeader #gLoginMenu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl #gDialog .gCancel,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
-.rtl .gShortForm li,
-.rtl #gContent #gAlbumGrid .gItem,
-.rtl #gSiteAdminMenu,
-.rtl .gPager li,
-.rtl .gButtonSet li,
-.rtl .ui-icon-left .ui-icon {
-  float: right;
-}
diff --git a/themes/admin_default/images/avatar.jpg b/themes/admin_default/images/avatar.jpg
deleted file mode 100644
index 2e76b12b..00000000
--- a/themes/admin_default/images/avatar.jpg
+++ /dev/null
diff --git a/themes/admin_default/images/ico-error.png b/themes/admin_default/images/ico-error.png
deleted file mode 100644
index c37bd062..00000000
--- a/themes/admin_default/images/ico-error.png
+++ /dev/null
diff --git a/themes/admin_default/images/ico-info.png b/themes/admin_default/images/ico-info.png
deleted file mode 100644
index 12cd1aef..00000000
--- a/themes/admin_default/images/ico-info.png
+++ /dev/null
diff --git a/themes/admin_default/images/ico-separator.gif b/themes/admin_default/images/ico-separator.gif
deleted file mode 100644
index 3de2d0d3..00000000
--- a/themes/admin_default/images/ico-separator.gif
+++ /dev/null
diff --git a/themes/admin_default/images/ico-success.png b/themes/admin_default/images/ico-success.png
deleted file mode 100644
index a9925a06..00000000
--- a/themes/admin_default/images/ico-success.png
+++ /dev/null
diff --git a/themes/admin_default/images/ico-view-hybrid.png b/themes/admin_default/images/ico-view-hybrid.png
deleted file mode 100644
index ee902e55..00000000
--- a/themes/admin_default/images/ico-view-hybrid.png
+++ /dev/null
diff --git a/themes/admin_default/images/ico-warning.png b/themes/admin_default/images/ico-warning.png
deleted file mode 100644
index 628cf2da..00000000
--- a/themes/admin_default/images/ico-warning.png
+++ /dev/null
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
deleted file mode 100644
index 1e09fd9f..00000000
--- a/themes/admin_default/js/ui.init.js
+++ /dev/null
@@ -1,59 +0,0 @@
-$(document).ready(function(){
-  // Initialize Superfish menus
-  $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
-  $("ul.gMenu").addClass("sf-menu");
-  $("ul.sf-menu").superfish({
-    delay: 500,
-    animation: {
-      opacity: "show",
-      height: "show"
-    },
-    pathClass: "current",
-    speed: "fast"
-  });
-  $("#gSiteAdminMenu").css("display", "block");
-
-  // Initialize status message effects
-  $("#gMessage li").gallery_show_message();
-
-  // Initialize modal dialogs
-  $(".gDialogLink").gallery_dialog();
-
-  // Initialize ajax links
-  $(".gDialogLink").gallery_ajax();
-
-  // Initialize panels
-  $(".gPanelLink").gallery_panel();
-
-  if ($("#gPhotoStream").length) {
-    // Vertically align thumbs in photostream
-    $(".gItem").gallery_valign();
-  }
-
-  // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
-
-  // Round view menu buttons
-  if ($("#gAdminCommentsMenu").length) {
-    $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
-    $("#gAdminCommentsMenu").addClass("gButtonSet");
-    $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
-    $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
-    $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
-  }
-
-  // Round corners
-  $(".gSelected").addClass("ui-corner-all");
-  $(".gAvailable .gBlock").addClass("ui-corner-all");
-  $(".gUnavailable").addClass("ui-corner-all");
-
-  // Add hover state for buttons
-  $(".ui-state-default").hover(
-    function() {
-      $(this).addClass("ui-state-hover");
-    },
-    function() {
-      $(this).removeClass("ui-state-hover");
-    }
-  );
-});
diff --git a/themes/admin_default/views/pager.html.php b/themes/admin_default/views/pager.html.php
deleted file mode 100644
index 5034ec19..00000000
--- a/themes/admin_default/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="gPager">
-  <? /* @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="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css
new file mode 100644
index 00000000..5475cb79
--- /dev/null
+++ b/themes/admin_wind/css/fix-ie.css
@@ -0,0 +1,18 @@
+/**
+ * Fix display in IE 6 and 7
+ */
+
+.g-unavailable {
+  filter: alpha(opacity=40);
+}
+
+.g-unavailable:hover {
+  filter: alpha(opacity=100);
+}
+
+tr.g-error td,
+tr.g-info td,
+tr.g-success td,
+tr.g-warning td {
+  background: none !important;
+} 
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
new file mode 100644
index 00000000..73ec8ac5
--- /dev/null
+++ b/themes/admin_wind/css/screen.css
@@ -0,0 +1,480 @@
+/**
+ * Gallery 3 Admin Wind Theme Screen Styles
+ *
+ * @requires YUI reset, font, grids CSS
+ *
+ * Sheet organization:
+ *  1)  Basic HTML elements
+ *  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)  Right-to-left language styles
+ *
+ * @todo Review g-buttonset-vertical
+ */
+
+/** *******************************************************************
+ * 1) Basic HTML elements
+ **********************************************************************/
+
+body, html {
+  background-color: #ccc;
+  font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+p {
+  margin-bottom: 1em;
+}
+
+em {
+  font-style: oblique;
+}
+
+h1, h2, h3, h4, h5, strong, th {
+  font-weight: bold;
+}
+
+h1 {
+  font-size: 1.7em;
+}
+
+#g-dialog h1 {
+  font-size: 1.1em;
+}
+
+h2 {
+  font-size: 1.4em;
+}
+
+#g-sidebar .g-block h2 {
+  font-size: 1.2em;
+}
+
+#g-sidebar .g-block li {
+  margin-bottom: .6em;
+}
+
+h3 {
+  font-size: 1.2em;
+}
+
+/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+a,
+.g-menu a,
+#g-dialog a,
+.g-button,
+.g-button:hover,
+.g-button:active,
+a.ui-state-hover,
+input.ui-state-hover,
+button.ui-state-hover {
+  color: #5382BF !important;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+a:hover,
+#g-dialog a:hover {
+  text-decoration: underline;
+}
+
+.g-menu a:hover {
+  text-decoration: none;
+}
+
+/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+fieldset {
+  margin-bottom: 1em;
+}
+
+#g-content form ul li {
+  padding: .4em 0;
+}
+
+#g-dialog form {
+  width: 270px;
+}
+
+#g-dialog fieldset {
+  margin-bottom: 0;
+}
+
+/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+table {
+  width: 100%;
+}
+
+#g-content table {
+  margin: .6em 0 2em 0;
+}
+
+caption,
+th {
+  text-align: left;
+}
+
+th,
+td {
+  border: none;
+  border-bottom: 1px solid #ccc;
+  padding: .5em;
+  vertical-align: middle;
+}
+
+th {
+  vertical-align: bottom;
+  white-space: nowrap;
+}
+
+/** *******************************************************************
+ * 2) Reusable content blocks
+ *********************************************************************/
+
+.g-block,
+#g-content #g-admin-dashboard .g-block {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  padding: 1em;
+}
+
+.g-block h2 {
+  background-color: #e8e8e8;
+  padding: .3em .8em;
+}
+
+.g-block-content {
+  margin-top: 1em;
+}
+
+#g-content .g-block {
+  border: none;
+  padding: 0;
+}
+
+#g-sidebar .g-block-content {
+  padding: 0;
+}
+
+#g-content .g-selected,
+#g-content .g-available .g-block {
+  border: 1px solid #ccc;
+  padding: .8em;
+}
+
+.g-selected img,
+.g-available .g-block img {
+  float: left;
+  margin: 0 1em 1em 0;
+}
+
+.g-selected {
+  background: #e8e8e8;
+}
+
+.g-available .g-installed-toolkit:hover {
+  cursor: pointer;
+  background: #eee;
+}
+
+.g-available .g-button {
+  width: 96%;
+}
+
+.g-selected .g-button {
+  display: none;
+}
+
+.g-unavailable {
+  border-color: #999;
+  opacity: 0.4;
+}
+
+.g-info td {
+  background-color: transparent;
+  background-image: none;
+}
+
+.g-success td {
+  background-color: transparent;
+  background-image: none;
+}
+
+.g-error td {
+  background-color: #f6cbca;
+  background-image: none;
+}
+
+.g-warning td {
+  background-color: #fcf9ce;
+  background-image: none;
+}
+
+.g-module-status.g-info,
+#g-log-entries .g-info,
+.g-module-status.g-success,
+#g-log-entries .g-success {
+  background-color: #fff;
+}
+
+/*** ******************************************************************
+ * 3) Page layout containers
+ *********************************************************************/
+
+/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header #g-login-menu {
+  margin-top: 1em;
+}
+
+/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-view {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-bottom: none;
+  min-width: 974px !important;
+}
+
+/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header {
+  background-color: #e8e8e8;
+  border-bottom: 1px solid #ccc;
+  font-size: .8em;
+  margin-bottom: 20px;
+  padding: 0 20px;
+  position: relative;
+}
+
+#g-content {
+  font-size: 1.1em;
+  padding: 0 2em;
+  width: 96%;
+}
+
+#g-sidebar {
+  background-color: #fff;
+  font-size: .9em;
+  padding: 0 20px;
+  width: 220px;
+}
+
+#g-footer {
+  background-color: #e8e8e8;
+  border-top: 1px solid #ccc;
+  font-size: .8em;
+  margin-top: 20px;
+  padding: 10px 20px;
+}
+
+/** *******************************************************************
+ * 4) Content blocks in specific layout containers
+ *********************************************************************/
+
+/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header #g-logo {
+  background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
+  color: #A5A5A5 !important;
+  display: block;
+  height: 65px;
+  padding-top: 5px;
+  width: 105px;
+}
+
+#g-header #g-logo:hover {
+  color: #f60 !important;
+  text-decoration: none;
+}
+
+#g-content .g-block h2 {
+  background-color: transparent;
+  padding-left: 0;
+}
+
+#g-sidebar .g-block-content {
+  padding-left: 1em;
+}
+
+.g-block .ui-dialog-titlebar {
+  margin: -1em -1em 0;
+}
+
+#g-sidebar .g-block h2 {
+  background: none;
+}
+
+/* Photo stream ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-photo-stream {
+  background-color: #e8e8e8;
+}
+
+#g-photo-stream .g-block-content ul {
+  border-right: 1px solid #e8e8e8;
+  height: 135px;
+  overflow: auto;
+  overflow: -moz-scrollbars-horizontal; /* for FF */
+  overflow-x: scroll; /* scroll horizontal */
+  overflow-y: hidden; /* Hide vertical*/
+}
+
+#g-content #g-photo-stream .g-item {
+  background-color: #fff;
+  border: 1px solid #e8e8e8;
+  border-right-color: #ccc;
+  border-bottom-color: #ccc;
+  float: left;
+  height: 90px;
+  overflow: hidden;
+  text-align: center;
+  width: 90px;
+}
+
+#g-content .g-item {
+  background-color: #fff;
+  border: 1px solid #e8e8e8;
+  border-right-color: #ccc;
+  border-bottom-color: #ccc;
+  height: 90px;
+  padding: 14px 8px;
+  text-align: center;
+  width: 90px;
+}
+
+/* Graphics settings ~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-admin-graphics .g-available .g-block {
+  clear: none;
+  float: left;
+  margin-right: 1em;
+  width: 30%;
+}
+
+/* Appearance settings ~~~~~~~~~~~~~~~~~~~ */
+
+#g-site-theme,
+#g-admin-theme {
+  float: left;
+  width: 48%;
+}
+
+#g-site-theme {
+  margin-right: 1em;
+}
+
+/* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-admin-blocks-list {
+  float: left;
+  margin: 0 2em 2em 0;
+  width: 30%;
+}
+
+.g-admin-blocks-list div:last-child {
+  border: .1em solid;
+  height: 100%;
+}
+
+.g-admin-blocks-list ul {
+  height: 98%;
+  margin: .1em .1em;
+  padding: .1em;
+}
+
+.g-admin-blocks-list ul li.g-draggable {
+  background-color: #e8e8e8;
+  margin: .5em;
+  padding: .3em .8em;
+}
+
+/* In-line editing  ~~~~~~~~~~~~~~~~~~~~~~ */
+#g-in-place-edit-message {
+  background-color: #FFF;
+}
+
+/** *******************************************************************
+ * 5) Navigation and menus
+ *********************************************************************/
+
+/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-site-admin-menu {
+  bottom: 0;
+  font-size: 1.2em;
+  left: 140px;
+  position: absolute;
+}
+
+#g-site-admin-menu ul {
+  margin-bottom: 0;
+}
+
+/** *******************************************************************
+ * 6) jQuery and jQuery UI
+ *********************************************************************/
+
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
+.sf-menu li li,
+.sf-menu li li ul li {
+  background-color: #bdd2ff;
+}
+
+.sf-menu li:hover {
+  background-color: #dfe9ff;
+}
+
+/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
+#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) Right to left styles
+ *********************************************************************/
+
+.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 li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
diff --git a/themes/default/images/avatar.jpg b/themes/admin_wind/images/avatar.jpg
index acad9314..acad9314 100644
--- a/themes/default/images/avatar.jpg
+++ b/themes/admin_wind/images/avatar.jpg
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
new file mode 100644
index 00000000..e0210ce5
--- /dev/null
+++ b/themes/admin_wind/js/ui.init.js
@@ -0,0 +1,60 @@
+/**
+ * Initialize jQuery UI and Gallery Plugins
+ * @todo Move ui-corner-all assignments to theme admin views
+ */
+
+$(document).ready(function(){
+  
+  // Initialize Superfish menus
+  $("#g-site-admin-menu .g-menu").hide().addClass("sf-menu");
+  $("#g-site-admin-menu .g-menu").superfish({
+    delay: 500,
+    animation: {
+      opacity: "show",
+      height: "show"
+    },
+    pathClass: "g-selected",
+    speed: "fast"
+  }).show();
+
+  // Initialize status message effects
+  $("#g-action-status li").gallery_show_message();
+
+  // Initialize modal dialogs
+  $(".g-dialog-link").gallery_dialog();
+
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
+  // Initialize ajax links
+  $(".g-ajax-link").gallery_ajax();
+
+  // Initialize panels
+  $(".g-panel-link").gallery_panel();
+
+  if ($("#g-photo-stream").length) {
+    // Vertically align thumbs in photostream
+    $(".g-item").gallery_valign();
+  }
+
+  // Apply jQuery UI button css to submit inputs
+  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
+
+  // Round view menu buttons
+  if ($("#g-admin-comments-menu").length) {
+    $("#g-admin-comments-menu ul").removeClass("g-menu");
+    $("#g-admin-comments-menu").addClass("g-buttonset");
+    $("#g-admin-comments-menu a").addClass("g-button ui-state-default");
+    $("#g-admin-comments-menu ul li:first a").addClass("ui-corner-left");
+    $("#g-admin-comments-menu ul li:last a").addClass("ui-corner-right");
+  }
+
+  // Round corners
+  $(".g-selected").addClass("ui-corner-all");
+  $(".g-available .g-block").addClass("ui-corner-all");
+  $(".g-unavailable").addClass("ui-corner-all");
+
+  // Initialize button hover effect
+  $.fn.gallery_hover_init();
+
+});
diff --git a/themes/admin_default/theme.info b/themes/admin_wind/theme.info
index b3d9741d..4034b64a 100644
--- a/themes/admin_default/theme.info
+++ b/themes/admin_wind/theme.info
@@ -1,4 +1,4 @@
-name = "Gallery Default"
+name = "Gallery Wind"
 description = "A crisp Site Administration theme with soft colors and drop down menus."
 version = 1
 author = "Gallery Team"
diff --git a/themes/admin_default/thumbnail.png b/themes/admin_wind/thumbnail.png
index b07a4cc2..b07a4cc2 100644
--- a/themes/admin_default/thumbnail.png
+++ b/themes/admin_wind/thumbnail.png
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ef15ed25..25ba1c97 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -4,12 +4,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title><?= t("Admin Dashboard") ?></title>
+    <title><?= t("Admin dashboard") ?></title>
     <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
 
     <?= $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") ?>"
@@ -22,7 +23,7 @@
    <?= $theme->script("gallery.common.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
-   var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
+   var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
    </script>
    <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
@@ -35,21 +36,31 @@
   <body <?= $theme->body_attributes() ?>>
     <?= $theme->admin_page_top() ?>
     <? if ($sidebar): ?>
-    <div id="doc3" class="yui-t5 gView">
+    <div id="doc3" class="yui-t5 g-view">
     <? else: ?>
-    <div id="doc3" class="yui-t7 gView">
+    <div id="doc3" class="yui-t7 g-view">
     <? endif; ?>
       <?= $theme->site_status() ?>
-      <div id="gHeader">
+      <div id="g-header" class="ui-helper-clearfix">
         <?= $theme->admin_header_top() ?>
-        <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
+        <ul id="g-login-menu" class="g-inline g-right">
+          <li class="g-first">
+            <? if (identity::is_writable()): ?>
+            <?= t('Logged in as %name', array('name' => html::mark_clean(
+              '<a href="' . url::site("form/edit/users/{$user->id}") .
+              '" title="' . t("Edit your profile")->for_html_attr() .
+              '" id="g-user-profile-link" class="g-dialog-link">' .
+              html::clean($user->display_name()) . '</a>'))) ?>
+            <? else: ?>
+            <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
+            <? endif ?>
+          </li>
+          <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
+        <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
-        <div id="gSiteAdminMenu" style="display: none;">
+        <div id="g-site-admin-menu" class="ui-helper-clearfix">
           <?= $theme->admin_menu() ?>
         </div>
         <?= $theme->admin_header_bottom() ?>
@@ -57,19 +68,19 @@
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
-            <div id="gContent" class="yui-g">
+            <div id="g-content" class="yui-g">
               <?= $theme->messages() ?>
               <?= $content ?>
             </div>
           </div>
         </div>
         <? if ($sidebar): ?>
-        <div id="gSidebar" class="yui-b">
+        <div id="g-sidebar" class="yui-b">
           <?= $sidebar ?>
         </div>
         <? endif ?>
       </div>
-      <div id="gFooter">
+      <div id="g-footer" class="g-inline ui-helper-clearfix">
         <?= $theme->admin_footer() ?>
         <div>
           <?= $theme->admin_credits() ?>
diff --git a/themes/admin_default/views/block.html.php b/themes/admin_wind/views/block.html.php
index 6cbea76e..d1d2d088 100644
--- a/themes/admin_default/views/block.html.php
+++ b/themes/admin_wind/views/block.html.php
@@ -2,9 +2,9 @@
 <? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
 <? endif ?>
-<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget">
+<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="g-block ui-widget">
   <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right">
-    <? if ($css_id != "gBlockAdder"): ?>
+    <? if ($css_id != "g-block-adder"): ?>
     <a href="<?= url::site("admin/dashboard/remove_block/$id?csrf=$csrf") ?>"
        class="ui-dialog-titlebar-close ui-corner-all">
       <span class="ui-icon ui-icon-closethick">remove</span>
@@ -12,7 +12,7 @@
     <? endif ?>
     <?= $title ?>
   </div>
-  <div class="gBlockContent">
+  <div class="g-block-content">
     <?= $content ?>
   </div>
 </div>
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
new file mode 100644
index 00000000..7870ef3f
--- /dev/null
+++ b/themes/admin_wind/views/pager.html.php
@@ -0,0 +1,44 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? // See http://docs.kohanaphp.com/libraries/pagination ?>
+<ul class="g-pager">
+  <? /* @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/default/css/screen.css b/themes/default/css/screen.css
deleted file mode 100644
index 64ecf775..00000000
--- a/themes/default/css/screen.css
+++ /dev/null
@@ -1,1128 +0,0 @@
-/**
- * Gallery 3 Default Theme Screen Styles
- *
- * @requires YUI reset, font, grids CSS
- *
- * Sheet organization:
- *  1)  Basic HTML elements
- *  2)  Reusable classes
- *  3)  Reusable content blocks
- *  4)  Page layout containers
- *  5)  Content blocks in specific layout containers
- *  6)  Navigation and menus
- *  7)  Browser hacks
- *  8)  jQuery and jQuery UI
- *  9)  Right-to-left language styles
- */
-
-/** *******************************************************************
- * 1) Basic HTML elements
- **********************************************************************/
-
-body, html {
-  background-color: #ccc;
-  font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-}
-
-p {
-  margin-bottom: 1em;
-}
-
-em {
-  font-style: oblique;
-}
-
-h1, h2, h3, h4, h5, strong, th {
-  font-weight: bold;
-}
-
-h1 {
-  font-size: 1.7em;
-}
-
-#gSearchResults h1 {
-  margin-bottom: 1em;
-}
-
-#gProgress h1 {
-  font-size: 1.1em;
-}
-
-h2 {
-  font-size: 1.4em;
-}
-
-#gSidebar .gBlock h2 {
-  font-size: 1.2em;
-}
-
-#gSidebar .gBlock li {
-  margin-bottom: .6em;
-}
-
-h3 {
-  font-size: 1.2em;
-}
-
-/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-a,
-.gMenu a,
-#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
-a.ui-state-hover,
-input.ui-state-hover,
-button.ui-state-hover {
-  color: #5382bf !important;
-  cursor: pointer !important;
-  text-decoration: none;
-  -moz-outline-style: none;
-}
-
-a:hover,
-#gDialog a:hover {
-  text-decoration: underline;
-}
-
-.gMenu a:hover {
-  text-decoration: none;
-}
-
-#gDialog .gCancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
-
-#gForgotPasswordLink {
-  float: right;
-  font-size: .9em;
-}
-
-#gDialog .gCancel {
-  float: left;
-}
-
-#gDialog #gMessage li {
-  width: 400px;
-  white-space: normal;
-  padding-left: 32px;
-}
-
-/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-table {
-  width: 100%;
-}
-
-#gContent table {
-  margin: 1em 0;
-}
-
-caption,
-th {
-  text-align: left;
-}
-
-th,
-td {
-  border: none;
-  border-bottom: 1px solid #ccc;
-  padding: .5em;
-  vertical-align: top;
-}
-
-/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-fieldset {
-  border: 1px solid #ccc;
-  padding-bottom: .8em;
-}
-
-#gBanner fieldset,
-#gSidebar fieldset,
-.gShortForm fieldset {
-  border: none;
-}
-
-legend {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-#gBanner legend,
-#gSidebar legend,
-#gContent #gSearchForm legend,
-input[type="hidden"],
-.gShortForm label {
-  display: none;
-}
-
-label {
-  cursor: help;
-}
-
-input[type="text"],
-input[type="password"] {
-  width: 50%;
-}
-
-input[type="text"],
-input[type="password"],
-textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-}
-
-textarea {
-  width: 100%;
-  height: 12em;
-}
-
-input:focus,
-textarea:focus,
-option:focus {
-  background-color: #ffc;
-  color: #000;
-}
-
-/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form li {
-  margin: 0 !important;
-  padding: .3em 1.5em .3em 1em;
-}
-
-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;
-}
-
-/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gValidationRule {
-  font-size: 80%;
-  margin-top: .5em;
-}
-
-form.gError input[type="text"],
-li.gError input[type="text"],
-form.gError input[type="password"],
-li.gError input[type="password"],
-form.gError input[type="checkbox"],
-li.gError input[type="checkbox"],
-form.gError input[type="radio"],
-li.gError input[type="radio"],
-form.gError textarea,
-li.gError textarea,
-form.gError select,
-li.gError select {
-  border: 2px solid red;
-}
-
-/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
-/** *******************************************************************
- * 3) Reusable content blocks
- *********************************************************************/
-
-.gBlock {
-  clear: both;
-  margin-bottom: 2.5em;
-}
-
-.gBlock h2 {
-  background-color: #e8e8e8;
-  padding: .3em .8em;
-}
-
-.gBlockContent {
-  margin-top: 1em;
-}
-
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gMessage {
-  width: 100%;
-}
-
-#gSiteStatus li,
-#gMessage li,
-.gModuleStatus {
-  border: 1px solid #ccc;
-  margin-bottom: .4em;
-}
-
-#gSiteStatus li {
-  margin-bottom: 0;
-  border: none;
-  border-bottom: 1px solid #ccc;
-}
-
-.gModuleStatus {
-  clear: both;
-  margin-bottom: 1em;
-}
-
-.gError,
-.gInfo,
-.gSuccess,
-.gWarning {
-  background-position: .4em 50%;
-  background-repeat: no-repeat;
-  padding: .4em .5em .4em 30px;
-}
-
-.gError {
-  background-color: #f6cbca;
-  background-image: url('../images/ico-error.png');
-}
-
-.gInfo {
-  background-color: #e8e8e8;
-  background-image: url('../images/ico-info.png');
-}
-
-.gSuccess {
-  background-color: #d9efc2;
-  background-image: url('../images/ico-success.png');
-}
-
-.gWarning {
-  background-color: #fcf9ce;
-  background-image: url('../images/ico-warning.png');
-}
-
-form .gError,
-.gPager .gInfo {
-  background-color: #fff !important;
-}
-
-.gPager .gInfo {
-  background-image: none !important;
-  padding: 0 !important;
-}
-
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.gShortForm li {
-  float: left;
-  padding: .4em 0;
-}
-
-.gShortForm input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
-/*** ******************************************************************
- * 4) Page layout containers
- *********************************************************************/
-
-/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gView {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border-bottom: none;
-}
-
-/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
-
-#gHeader {
-  margin-bottom: 1em;
-}
-
-#gBanner {
-  background-color: #e8e8e8;
-  border-bottom: 1px solid #ccc;
-  font-size: .8em;
-  min-height: 5em;
-  padding: 1em 20px;
-  position: relative;
-}
-
-#gContent {
-  font-size: 1.2em;
-  padding-left: 20px;
-  position: relative;
-  width: 696px;
-}
-
-#gSidebar {
-  font-size: .9em;
-  padding: 0 20px;
-  width: 220px;
-}
-
-#gFooter {
-  background-color: #e8e8e8;
-  border-top: 1px solid #ccc;
-  font-size: .8em;
-  margin-top: 20px;
-  padding: 10px 20px;
-}
-
-/** *******************************************************************
- * 5) Content blocks in specific layout containers
- *********************************************************************/
-
-/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gBanner #gLogo img {
-  margin: 0;
-}
-
-#gBanner #gQuickSearchForm {
-  clear: right;
-  float: right;
-  margin-top: 1em;
-}
-
-#gBanner #gQuickSearchForm input[type='text'] {
-  width: 17em;
-}
-
-#gContent .gBlock h2 {
-  background-color: transparent;
-  padding-left: 0;
-}
-
-#gSidebar .gBlockContent {
-  padding-left: 1em;
-}
-
-/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gContent #gAlbumGrid {
-  margin: 1em 0;
-  position: relative;
-  z-index: 1;
-}
-
-#gContent #gAlbumGrid .gItem {
-  background-color: #fff;
-  border: 1px solid #fff;
-  float: left;
-  font-size: .7em;
-  height: 220px;
-  overflow: hidden;
-  padding: .6em 8px;
-  position: relative;
-  text-align: center;
-  width: 213px;
-  z-index: 1;
-}
-
-#gContent #gAlbumGrid .gItem h2 {
-  margin: 5px 0;
-}
-
-#gContent .gPhoto h2,
-#gContent .gItem .gMetadata {
-  display: none;
-}
-
-#gContent #gAlbumGrid .gAlbum {
-  background-color: #e8e8e8;
-}
-
-#gContent #gAlbumGrid .gAlbum h2 span {
-  background: transparent url('../images/ico-album.png') no-repeat top left;
-  display: inline-block;
-  height: 16px;
-  margin-right: 5px;
-  width: 16px;
-}
-
-#gContent #gAlbumGrid .gHoverItem {
-  background-color: #fff;
-  border: 1px solid #000;
-}
-
-#gContent .gHoverItem h2,
-#gContent .gHoverItem .gMetadata {
-  display: block;
-}
-
-/* Individual photo content ~~~~~~~~~~~~~~ */
-
-#gContent #gItem {
-  position: relative;
-  width: 99%;
-}
-
-#gContent #gPhoto {
-  position: relative;
-}
-
-#gContent #gItem .gFullSizeLink img {
-  display: block;
-  margin: 1em auto !important;
-}
-
-#gContent #gComments {
-  margin-top: 2em;
-  position: relative;
-}
-
-#gContent #gComments ul li {
-  margin: 1em 0;
-}
-
-#gContent #gComments .gAuthor {
-  border-bottom: 1px solid #ccc;
-  color: #999;
-  height: 32px;
-  line-height: 32px;
-}
-
-#gContent #gComments ul li div {
-  padding: 0 8px 8px 43px;
-}
-
-#gContent #gComments ul li #gRecaptcha {
-  padding: 0;
-}
-
-#gContent #gComments ul li #gRecaptcha div {
-  padding: 0;
-}
-
-#gContent #gComments .gAvatar {
-  height: 32px;
-  margin-right: .4em;
-  width: 32px;
-}
-
-#gAddCommentButton {
-  position: absolute;
-  right: 0;
-  top: 2px;
-}
-
-#gContent #gAddCommentForm {
-  margin-top: 2em;
-}
-
-/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gBanner #gLoginMenu li,
-#gFooter #gCredits li {
-  display: inline;
-}
-
-#gBanner #gLoginMenu li {
-  padding-left: 1.2em;
-}
-
-#gFooter #gCredits li {
-  padding-right: 1.2em;
-}
-
-#gContent #gSearchResults {
-  margin-top: 1em;
-  padding-top: 1em;
-}
-
-/** *******************************************************************
- * 5) Navigation and menus
- *********************************************************************/
-
-#gSiteMenu,
-#gTagCloud ul {
-  font-size: 1.2em;
-}
-
-/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gBanner #gLoginMenu {
-  color: #999;
-  float: right;
-}
-
-/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gSiteMenu {
-  bottom: 0;
-	display: none;
-  left: 140px;
-  position: absolute;
-}
-
-#gSiteMenu ul {
-  margin-bottom: 0 !important;
-}
-
-/* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gContextMenu {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-}
-
-.gItem .gContextMenu {
-  display: none;
-  margin-top: 2em;
-  width: 100%;
-}
-
-#gItem .gContextMenu {
-  font-size: .7em;
-}
-
-#gItem .gContextMenu ul {
-  display: none;
-}
-
-.gContextMenu li {
-  border-left: none;
-  border-right: none;
-  border-bottom: none;
-}
-
-.gContextMenu li a {
-  display: block;
-  line-height: 1.6em;
-}
-
-.gHoverItem .gContextMenu {
-  display: block;
-}
-
-.gHoverItem .gContextMenu li {
-  text-align: left;
-}
-
-.gHoverItem .gContextMenu a:hover {
-  text-decoration: none;
-}
-
-/* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gViewMenu {
-  margin-bottom: 1em;
-}
-
-#gViewMenu a {
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
-  height: 28px !important;
-  width: 43px !important;
-}
-
-#gViewMenu #gHybridLink {
-  background-image: url('../images/ico-view-hybrid.png');
-}
-
-#gViewMenu #gSlideshowLink {
-  background-image: url('../images/ico-view-slideshow.png');
-}
-
-#gViewMenu .gFullSizeLink {
-  background-image: url('../images/ico-view-fullsize.png');
-}
-
-#gViewMenu #gCommentsLink {
-  background-image: url('../images/ico-view-comments.png');
-}
-
-#gViewMenu #gDigibugLink {
-  background-image: url('../images/ico-print.png');
-}
-
-/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gBreadcrumbs {
-  padding: 0 20px;
-}
-
-.gBreadcrumbs li {
-  background: transparent url('../images/ico-separator.gif') no-repeat scroll left center;
-  float: left;
-  padding: 10px 6px 10px 16px !important;
-}
-
-.gBreadcrumbs li.root {
-  background: transparent;
-}
-
-.gBreadcrumbs li a,
-.gBreadcrumbs li span {
-  display: block;
-}
-
-.gBreadcrumbs li.active,
-.gBreadcrumbs li.active span {
-  font-weight: bold;
-}
-
-#gDialog ul.gBreadcrumbs {
-  clear: both;
-  margin-left: 0;
-  padding-left: 0;
-}
-
-#gDialog .gBreadcrumbs li {
-  font-size: .9em;
-}
-
-/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gTagCloud ul {
-  text-align: justify;
-}
-
-#gTagCloud ul li {
-  display: inline;
-  line-height: 1.5em;
-  text-align: justify;
-}
-
-#gTagCloud ul li a {
-  text-decoration: none;
-}
-
-#gTagCloud ul li span {
-  display: none;
-}
-
-#gTagCloud ul li.size1 a {
-  color: #9cf;
-  font-size: 80%;
-  font-weight: 100;
-}
-
-#gTagCloud ul li.size2 a {
-  color: #69f;
-  font-size: 90%;
-  font-weight: 300;
-}
-
-#gTagCloud ul li.size3 a {
-  color: #69c;
-  font-size: 100%;
-  font-weight: 500;
-}
-
-#gTagCloud ul li.size4 a {
-  color: #369;
-  font-size: 110%;
-  font-weight: 700;
-}
-
-#gTagCloud ul li.size5 a {
-  color: #0e2b52;
-  font-size: 120%;
-  font-weight: 900;
-}
-
-#gTagCloud ul li.size6 a {
-  color: #0e2b52;
-  font-size: 130%;
-  font-weight: 900;
-}
-
-#gTagCloud ul li.size7 a {
-  color: #0e2b52;
-  font-size: 140%;
-  font-weight: 900;
-}
-
-#gTagCloud ul li a:hover {
-  color: #f30;
-  text-decoration: underline;
-}
-
-#gWelcomeMessage p {
-  padding-bottom: 1em;
-}
-
-/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gPager {
-  clear: both;
-  margin: 0;
-  padding: 5px 0 !important;
-  width: 100%;
-}
-
-.gPager li {
-  float: left;
-  margin: 0;
-  width: 30%;
-}
-
-.gPager .gInfo {
-  text-align: center;
-  width: 40%;
-}
-
-/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-#gHeader:after,
-#gAlbumGrid:after,
-.gPager:after,
-#gViewMenu:after {
-  clear: both;
-  content: ".";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
-
-/** *******************************************************************
- * 7) jQuery and jQuery UI
- *********************************************************************/
-
-/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-
-.sf-menu li li, .sf-menu li li ul li {
-  background-color: #bdd2ff;
-}
-
-.sf-menu li:hover {
-  background-color: #dfe9ff;
-}
-
-/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
-
-.gLoadingLarge {
-  background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
-  font-size: 0;
-}
-
-.gDialogLoadingLarge {
-  background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
-  font-size: 0;
-}
-
-.gLoadingSmall {
-  background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
-  font-size: 0;
-}
-
-.gDraggable {
-  cursor: move;
-}
-
-.gDropTarget {
-  background-color: #cfdeff;
-  border: 1px dotted #999;
-  height: 100px;
-  margin: 1em 0;
-}
-
-/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
-
-.ui-widget-overlay {
-  background: #000;
-  opacity: .7;
-}
-
-#gDialog {
-  text-align: left;
-}
-
-#gDialog li {
-  padding-left: 0;
-}
-
-#gDialog form input[type="text"],
-#gDialog form input[type="password"] {
-  width: 100%;
-}
-
-#gDialog #gLoginForm,
-#gDialog #gAddUserForm,
-#gDialog #gAddGroupForm {
-  margin: 0 auto;
-  width: 270px;
-}
-
-#gDialog fieldset {
-  border: none;
-}
-
-#gDialog legend {
-  display: none;
-}
-
-#gDialog p {
-	margin: 0;
-}
-
-/* jQuery UI ThemeRoller buttons */
-
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
-.gButtonSet {
-  padding-left: 1px;
-}
-
-.gButtonSet li {
-  float: left;
-}
-
-.gButtonSet .gButtonLink {
-  margin: 0;
-}
-
-.ui-icon-left .ui-icon {
-  float: left;
-  margin-right: .2em;
-}
-
-.ui-icon-right .ui-icon {
-  float: right;
-  margin-left: .2em;
-}
-
-.ui-icon-rotate-ccw {
-  background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
-  background-position: -208px -64px;
-}
-
-/* STUFF THAT NEEDS A HOME */
-
-#gMove ul {
-  padding-left: 1em;
-}
-
-#gMove .selected {
-  background: #999;
-}
-
-/* Server Add */
-
-#gServerAdd button {
-  margin-bottom: .5em;
-}
-
-#gServerAddTree {
-  cursor: pointer;
-  padding-left: 4px;
-  width: 95%;
-}
-
-#gServerAddTree li {
-  padding: 0;
-  float: none;
-}
-
-#gServerAddTree span.selected {
-  background: #ddd;
-}
-
-#gServerAddTree {
-  border: 1px solid #ccc;
-  height: 20em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding: .5em;
-}
-
-#gServerAdd ul ul li {
-  padding-left: 1.2em;
-}
-
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#gEditPermissionForm {
-	clear: both;
-}
-#gEditPermissionForm fieldset {
-	border: 1px solid #cccccc;
-	padding: 0;
-}
-
-#gPermissions .gDenied,
-#gPermissions .gAllowed {
-  text-align: center;
-  vertical-align: middle;
-}
-#gPermissions .gDenied {
-  background-color: #fcc;
-}
-#gPermissions .gAllowed {
-  background-color: #cfc;
-}
-
-/*************** STUFF THAT NEEDS A HOME ****************/
-
-.gProgressBar {
-  height: 1em;
-  width: 100%;
-  margin-top: .5em;
-  display: inline-block;
-}
-
-#gAddPhotos span {
-  clear: both;
-  display: block;
-}
-
-#gAddPhotosCanvas {
-  height: 325px;
-  width: 450px;
-  overflow: auto;
-}
-
-#gAddPhotosQueue .progressbar {
-  height: 4px;
-}
-
-#gAddPhotosQueue .title {
-  font-size: 1.25em;
-}
-
-#gAddPhotosQueue .status {
-  font-size: .75em;
-}
-
-#gAddPhotosQueue .box {
-  margin-bottom: 8px;
-  padding: 4px;
-}
-
-#gAddPhotosQueue .pending {
-  background-color: #e8e8e8;
-  border: 1px solid #d7d7d7;
-}
-
-#gAddPhotosQueue .error {
-  background-color: #fcc;
-  border: 1px solid #ebb;
-}
-
-#gAddPhotosQueue .uploading {
-  background-color: #ff9;
-  border: 1px solid #ee8;
-}
-
-#gAddPhotosQueue .complete {
-  background-color: #cfc;
-  border: 1px solid #beb;
-}
-
-#gAdminG2ImportNotes {
-  padding-bottom: 20px;
-}
-
-#gAdminG2ImportDetails {
-  padding-top: 20px;
-}
-
-#gAdminG2ImportDetails .gWarning {
-  margin-top: 4px;
-}
-
-#gAdminG2ImportDetails .gInfo {
-  padding: 2px;
-  border: 1px solid #999;
-  margin-bottom: 10px;
-}
-
-#gAdminG2ImportNotes p,
-#gAdminG2ImportDetails .gInfo p {
-  padding: 0;
-  margin: 0;
-}
-
-#gAdminG2ImportNotes ul li,
-#gAdminG2Import .gInfo ul li {
-  padding-left: 0;
-  margin-left: 20px;
-  list-style-type: disc;
-}
-
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
-
-.rtl {
-  direction: rtl;
-}
-
-.rtl caption,
-.rtl th,
-.rtl #gDialog {
-  text-align: right;
-}
-
-.rtl #gHeader #gQuickSearchForm,
-.rtl #gForgotPasswordLink,
-.rtl #gHeader #gLoginMenu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl #gDialog .gCancel,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
-.rtl .gShortForm li,
-.rtl #gHeader #gLogo img,
-.rtl #gContent #gAlbumGrid .gItem,
-.rtl #gSiteMenu,
-.rtl .gBreadcrumbs li,
-.rtl .gPager li,
-.rtl .gButtonSet li,
-.rtl .ui-icon-left .ui-icon {
-  float: right;
-}
-
diff --git a/themes/default/images/ico-album.png b/themes/default/images/ico-album.png
deleted file mode 100644
index affa1b84..00000000
--- a/themes/default/images/ico-album.png
+++ /dev/null
diff --git a/themes/default/images/ico-denied-gray.png b/themes/default/images/ico-denied-gray.png
deleted file mode 100644
index 56db3ff5..00000000
--- a/themes/default/images/ico-denied-gray.png
+++ /dev/null
diff --git a/themes/default/images/ico-denied-pale.png b/themes/default/images/ico-denied-pale.png
deleted file mode 100644
index 1e992230..00000000
--- a/themes/default/images/ico-denied-pale.png
+++ /dev/null
diff --git a/themes/default/images/ico-denied.png b/themes/default/images/ico-denied.png
deleted file mode 100644
index 08f24936..00000000
--- a/themes/default/images/ico-denied.png
+++ /dev/null
diff --git a/themes/default/images/ico-error.png b/themes/default/images/ico-error.png
deleted file mode 100644
index c37bd062..00000000
--- a/themes/default/images/ico-error.png
+++ /dev/null
diff --git a/themes/default/images/ico-info.png b/themes/default/images/ico-info.png
deleted file mode 100644
index 12cd1aef..00000000
--- a/themes/default/images/ico-info.png
+++ /dev/null
diff --git a/themes/default/images/ico-lock.png b/themes/default/images/ico-lock.png
deleted file mode 100644
index 2ebc4f6f..00000000
--- a/themes/default/images/ico-lock.png
+++ /dev/null
diff --git a/themes/default/images/ico-print.png b/themes/default/images/ico-print.png
deleted file mode 100644
index b82a8e1e..00000000
--- a/themes/default/images/ico-print.png
+++ /dev/null
diff --git a/themes/default/images/ico-separator.gif b/themes/default/images/ico-separator.gif
deleted file mode 100644
index 3de2d0d3..00000000
--- a/themes/default/images/ico-separator.gif
+++ /dev/null
diff --git a/themes/default/images/ico-success-gray.png b/themes/default/images/ico-success-gray.png
deleted file mode 100644
index 74b2032f..00000000
--- a/themes/default/images/ico-success-gray.png
+++ /dev/null
diff --git a/themes/default/images/ico-success-pale.png b/themes/default/images/ico-success-pale.png
deleted file mode 100644
index dc8d1ded..00000000
--- a/themes/default/images/ico-success-pale.png
+++ /dev/null
diff --git a/themes/default/images/ico-success.png b/themes/default/images/ico-success.png
deleted file mode 100644
index a9925a06..00000000
--- a/themes/default/images/ico-success.png
+++ /dev/null
diff --git a/themes/default/images/ico-view-comments.png b/themes/default/images/ico-view-comments.png
deleted file mode 100644
index e5d3630f..00000000
--- a/themes/default/images/ico-view-comments.png
+++ /dev/null
diff --git a/themes/default/images/ico-view-fullsize.png b/themes/default/images/ico-view-fullsize.png
deleted file mode 100644
index 0be23e9b..00000000
--- a/themes/default/images/ico-view-fullsize.png
+++ /dev/null
diff --git a/themes/default/images/ico-view-hybrid.png b/themes/default/images/ico-view-hybrid.png
deleted file mode 100644
index ee902e55..00000000
--- a/themes/default/images/ico-view-hybrid.png
+++ /dev/null
diff --git a/themes/default/images/ico-view-slideshow.png b/themes/default/images/ico-view-slideshow.png
deleted file mode 100644
index 82f61f63..00000000
--- a/themes/default/images/ico-view-slideshow.png
+++ /dev/null
diff --git a/themes/default/images/ico-warning.png b/themes/default/images/ico-warning.png
deleted file mode 100644
index 628cf2da..00000000
--- a/themes/default/images/ico-warning.png
+++ /dev/null
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
deleted file mode 100644
index e645eb71..00000000
--- a/themes/default/js/ui.init.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Initialize jQuery UI and Gallery Plugin elements
- */
-
-var short_forms = new Array(
-  "#gQuickSearchForm",
-  "#gAddTagForm",
-  "#gSearchForm"
-);
-
-$(document).ready(function() {
-
-  // Initialize Superfish menus
-  $("ul.gMenu").addClass("sf-menu");
-  $('ul.sf-menu').superfish({
-    delay: 500,
-    animation: {
-      opacity:'show',
-      height:'show'
-    },
-    speed: 'fast'
-  });
-  $("#gSiteMenu").css("display", "block");
-
-  // Initialize status message effects
-  $("#gMessage li").gallery_show_message();
-
-  // Initialize dialogs
-  $("#gLoginLink").addClass("gDialogLink");
-  $(".gDialogLink").gallery_dialog();
-
-  // Initialize view menu
-  if ($("#gViewMenu").length) {
-    $("#gViewMenu ul").removeClass("gMenu").removeClass("sf-menu");
-    $("#gViewMenu a").addClass("ui-icon");
-  }
-
-  // Initialize short forms
-  for (var i in short_forms) {
-    short_form_init(short_forms[i]);
-    $(short_forms[i]).addClass("gShortForm");
-  }
-  $(".gShortForm input[type=text]").addClass("ui-corner-left");
-  $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right");
-
-  // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
-
-  // Apply styles and icon classes to gContextMenu
-  if ($(".gContextMenu").length) {
-    $(".gContextMenu li").addClass("ui-state-default");
-    $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
-    $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
-    $(".gContextMenu a span").each(function() {
-      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
-      $(this).addClass(iconClass);
-    });
-  }
-
-  // Album view only
-  if ($("#gAlbumGrid").length) {
-    // Vertical align thumbnails/metadata in album grid
-    $(".gItem").gallery_valign();
-
-    // Initialize context menus
-    $(".gItem").hover(
-      function(){
-        // Insert invisible placeholder to hold the item's position in the grid
-        var placeHolder = $(this).clone();
-        $(placeHolder).attr("id", "gPlaceHolder");
-        $(placeHolder).css("visibility", "hidden");
-        $(this).after($(placeHolder));
-        // Style and position the item
-        $(this).addClass("gHoverItem");
-        var position = $(this).position();
-        $(this).css("position", "absolute");
-        $(this).css("top", position.top);
-        $(this).css("left", position.left);
-        $(this).css("z-index", "1000");
-        // Initialize the contextual menu
-        $(this).gallery_context_menu();
-        // Set height based on height of descendents
-        var title = $(this).find("h2");
-        var meta = $(this).find(".gMetadata");
-        var context_label = $(this).find(".gContextMenu li:first");
-        var item_ht = $(this).height();
-        var title_ht = $(title).gallery_height();
-        var meta_ht = $(meta).gallery_height();
-        var context_label_ht = $(context_label).gallery_height();
-        $(this).height(item_ht + title_ht + meta_ht + context_label_ht);
-      },
-      function() {
-        // Reset item height, position, and z-index
-        if ($(this).next().height()) {
-          var sib_height = $(this).next().height();
-        } else {
-          var sib_height = $(this).prev().height();
-        }
-        if ($.browser.msie && $.browser.version >= 8) {
-          sib_height = sib_height + 1;
-        }
-        $(this).css("height", sib_height);
-        $(this).css("position", "relative");
-        $(this).css("top", null);
-        $(this).css("left", null);
-        $(this).css("z-index", 1);
-        // Remove the placeholder and hover class from the item
-        $("#gPlaceHolder").remove();
-        $(this).removeClass("gHoverItem");
-      }
-    );
-  }
-
-  // Photo/Item item view
-  if ($("#gItem").length) {
-    // Ensure the resized image fits within its container
-    $("#gItem").gallery_fit_photo();
-
-    // Initialize context menus
-    var resize = $("#gItem").gallery_get_photo();
-    $(resize).hover(function(){
-      $(this).gallery_context_menu();
-    });
-
-    // Add scroll effect for links to named anchors
-    $.localScroll({
-      queue: true,
-      duration: 1000,
-      hash: true
-    });
-  }
-
-  // Initialize button hover effect
-  $.fn.gallery_hover_init();
-
-});
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
deleted file mode 100644
index 910814dd..00000000
--- a/themes/default/views/movie.html.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gItem">
-  <?= $theme->photo_top() ?>
-
-  <ul class="gPager">
-    <li>
-      <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? endif; ?>
-    </li>
-    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
-      <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? endif ?>
-    </li>
-  </ul>
-
-
-  <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
-
-  <div id="gInfo">
-    <h1><?= html::purify($item->title) ?></h1>
-       <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
-</div>
diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php
deleted file mode 100644
index 7cdc9bb0..00000000
--- a/themes/default/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="gPager">
-  <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t2("Photo %from_number of %count",
-                       "Photos %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="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
-  <? else: ?>
-    <a class="gButtonLink 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/default/views/photo.html.php b/themes/default/views/photo.html.php
deleted file mode 100644
index b0096043..00000000
--- a/themes/default/views/photo.html.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-
-<? if (access::can("view_full", $theme->item())): ?>
-<!-- Use javascript to show the full size as an overlay on the current page -->
-<script>
-  $(document).ready(function() {
-    $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
-      return false;
-    });
-  });
-</script>
-<? endif ?>
-
-<div id="gItem">
-  <?= $theme->photo_top() ?>
-
-  <ul class="gPager">
-    <li>
-      <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? endif; ?>
-    </li>
-    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
-      <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? endif ?>
-    </li>
-  </ul>
-
-  <div id="gPhoto">
-    <?= $theme->resize_top($item) ?>
-    <? if (access::can("view_full", $item)): ?>
-    <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>">
-      <? endif ?>
-      <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
-      <? if (access::can("view_full", $item)): ?>
-    </a>
-    <? endif ?>
-    <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
-  </div>
-
-  <div id="gInfo">
-    <h1><?= html::purify($item->title) ?></h1>
-    <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $theme->photo_bottom() ?>
-</div>
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
deleted file mode 100644
index 04379eb6..00000000
--- a/themes/default/views/sidebar.html.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->sidebar_top() ?>
-<div class="gToolbar">
-  <div id="gViewMenu" class="gButtonSet">
-    <? if ($page_type == "album"):?>
-      <?= $theme->album_menu() ?>
-    <? elseif ($page_type == "photo") : ?>
-      <?= $theme->photo_menu() ?>
-    <? elseif ($page_type == "movie") : ?>
-      <?= $theme->movie_menu() ?>
-    <? elseif ($page_type == "tag") : ?>
-      <?= $theme->tag_menu() ?>
-    <? endif ?>
-  </div>
-</div>
-
-<?= $theme->sidebar_blocks() ?>
-<?= $theme->sidebar_bottom() ?>
diff --git a/themes/default/css/fix-ie.css b/themes/wind/css/fix-ie.css
index eee88c15..fcebeea8 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -2,15 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-#gBanner,
-.gBreadcrumbs,
-#gAlbumGrid,
-#gPager,
-#gViewMenu  {
-  zoom: 1;
-}
-
-#gBanner {
+#g-banner {
   z-index: 2;
 }
 
@@ -19,19 +11,19 @@ input.submit {
   display: inline !important;
 }
 
-#gAddTagForm input.textbox {
+#g-add-tag-form input.textbox {
   width: 110px;
 }
 
-#gDialog a.gCancel {
+#g-dialog .g-cancel {
   display: inline-block !important;
   float: none !important;
 }
 
-.gPager .txtright {
+.g-pager .g-text-right {
   width: 29%;
 }
 
-.gPager .ui-icon-right {
+.g-pager .ui-icon-right {
   width: 60px;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
new file mode 100644
index 00000000..e46ba8e6
--- /dev/null
+++ b/themes/wind/css/screen.css
@@ -0,0 +1,445 @@
+/**
+ * Gallery 3 Wind Theme Screen Styles
+ *
+ * @requires YUI reset, font, grids CSS
+ *
+ * Sheet organization:
+ *  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)  jQuery and jQuery UI
+ *  7)  Right-to-left language styles
+ */
+
+/** *******************************************************************
+ * 1) Font sizes, base HTML elements
+ **********************************************************************/
+
+body, html {
+  background-color: #ccc;
+  font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+p {
+  margin-bottom: 1em;
+}
+
+em {
+  font-style: oblique;
+}
+
+h1, h2, h3, h4, h5, strong, th {
+  font-weight: bold;
+}
+
+h1 {
+  font-size: 1.7em;
+}
+
+#g-dialog h1 {
+  font-size: 1.1em;
+}
+
+h2 {
+  font-size: 1.4em;
+}
+
+#g-sidebar .g-block h2 {
+  font-size: 1.2em;
+}
+
+#g-sidebar .g-block li {
+  margin-bottom: .6em;
+}
+
+#g-content,
+#g-site-menu,
+h3 {
+  font-size: 1.2em;
+}
+
+#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,
+.g-menu a,
+#g-dialog a,
+.g-button,
+.g-button:hover,
+.g-button:active,
+a.ui-state-hover,
+input.ui-state-hover,
+button.ui-state-hover {
+  color: #5382bf !important;
+  cursor: pointer !important;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+a:hover,
+#g-dialog a:hover {
+  text-decoration: underline;
+}
+
+.g-menu a:hover {
+  text-decoration: none;
+}
+
+#g-dialog #g-action-status li {
+  width: 400px;
+  white-space: normal;
+  padding-left: 32px;
+}
+
+/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+table {
+  width: 100%;
+}
+
+#g-content table {
+  margin: 1em 0;
+}
+
+caption,
+th {
+  text-align: left;
+}
+
+th,
+td {
+  border: none;
+  border-bottom: 1px solid #ccc;
+  padding: .5em;
+}
+
+td {
+  vertical-align: top;
+}
+
+/** *******************************************************************
+ * 2) Reusable content blocks
+ *********************************************************************/
+
+.g-block h2 {
+  background-color: #e8e8e8;
+  padding: .3em .8em;
+}
+
+.g-block-content {
+  margin-top: 1em;
+}
+
+/*** ******************************************************************
+ * 3) Page layout containers
+ *********************************************************************/
+
+/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-view {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-bottom: none;
+}
+
+/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header {
+  margin-bottom: 1em;
+}
+
+#g-banner {
+  background-color: #e8e8e8;
+  border-bottom: 1px solid #ccc;
+  min-height: 5em;
+  padding: 1em 20px;
+  position: relative;
+}
+
+#g-content {
+  padding-left: 20px;
+  position: relative;
+  width: 696px;
+}
+
+#g-sidebar {
+  padding: 0 20px;
+  width: 220px;
+}
+
+#g-footer {
+  background-color: #e8e8e8;
+  border-top: 1px solid #ccc;
+  margin-top: 20px;
+  padding: 10px 20px;
+}
+
+/** *******************************************************************
+ * 4) Content blocks in specific layout containers
+ *********************************************************************/
+
+/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-banner #g-quick-search-form {
+  clear: right;
+  float: right;
+  margin-top: 1em;
+}
+
+#g-banner #g-quick-search-form input[type='text'] {
+  width: 17em;
+}
+
+#g-content .g-block h2 {
+  background-color: transparent;
+  padding-left: 0;
+}
+
+#g-sidebar .g-block-content {
+  padding-left: 1em;
+}
+
+/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-content #g-album-grid {
+  margin: 1em 0;
+  position: relative;
+  z-index: 1;
+}
+
+#g-content #g-album-grid .g-item {
+  background-color: #fff;
+  border: 1px solid #fff;
+  float: left;
+  padding: .6em 8px;
+  position: relative;
+  text-align: center;
+  width: 213px;
+  z-index: 1;
+}
+
+#g-content #g-album-grid .g-item h2 {
+  margin: 5px 0;
+}
+
+#g-content .g-photo h2,
+#g-content .g-item .g-metadata {
+  display: none;
+  margin-bottom: .6em;
+}
+
+#g-content #g-album-grid .g-album {
+  background-color: #e8e8e8;
+}
+
+#g-content #g-album-grid .g-album h2 span {
+  background: transparent url('../images/ico-album.png') no-repeat top left;
+  display: inline-block;
+  height: 16px;
+  margin-right: 5px;
+  width: 16px;
+}
+
+#g-content #g-album-grid .g-hover-item {
+  border: 1px solid #000;
+  position: absolute !important;
+  z-index: 1000 !important;
+}
+
+#g-content .g-hover-item h2,
+#g-content .g-hover-item .g-metadata {
+  display: block;
+}
+
+#g-content #g-album-grid #g-place-holder {
+  position: relative;
+  visibility: hidden;
+  z-index: 1;
+}
+
+/* Individual photo content ~~~~~~~~~~~~~~ */
+
+#g-item {
+  position: relative;
+  width: 100%;
+}
+
+#g-item #g-photo,
+#g-item #g-movie {
+  padding: 2.2em 0;
+  position: relative;
+}
+
+#g-item img.g-resize,
+#g-item a.g-movie object {
+  display: block;
+  margin: 0 auto;
+}
+
+/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-footer #g-credits li {
+  padding-right: 1.2em;
+}
+
+#g-content #g-search-results {
+  margin-top: 1em;
+  padding-top: 1em;
+}
+
+/* In-line editing  ~~~~~~~~~~~~~~~~~~~~~~ */
+#g-in-place-edit-message {
+  background-color: #FFF;
+}
+
+/** *******************************************************************
+ * 5) Navigation and menus
+ *********************************************************************/
+
+/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-banner #g-login-menu {
+  color: #999;
+  float: right;
+}
+
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
+/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-site-menu {
+  bottom: 0;
+  left: 140px;
+  position: absolute;
+}
+
+#g-site-menu ul {
+  margin-bottom: 0 !important;
+}
+
+/* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-context-menu {
+  background-color: #fff;
+  bottom: 0;
+  left: 0;
+  position: absolute;
+}
+
+.g-item .g-context-menu {
+  display: none;
+  margin-top: 2em;
+  width: 100%;
+}
+
+#g-item .g-context-menu ul {
+  display: none;
+}
+
+.g-context-menu li {
+  border-left: none;
+  border-right: none;
+  border-bottom: none;
+}
+
+.g-context-menu li a {
+  display: block;
+  line-height: 1.6em;
+}
+
+.g-hover-item .g-context-menu {
+  display: block;
+}
+
+.g-hover-item .g-context-menu li {
+  text-align: left;
+}
+
+.g-hover-item .g-context-menu a:hover {
+  text-decoration: none;
+}
+
+/* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-view-menu {
+  margin-bottom: 1em;
+}
+
+#g-view-menu a {
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+  height: 28px !important;
+  width: 43px !important;
+}
+
+#g-view-menu #g-slideshow-link {
+  background-image: url('../images/ico-view-slideshow.png');
+}
+
+#g-view-menu .g-fullsize-link {
+  background-image: url('../images/ico-view-fullsize.png');
+}
+
+#g-view-menu #g-comments-link {
+  background-image: url('../images/ico-view-comments.png');
+}
+
+#g-view-menu #g-print-digibug-link {
+  background-image: url('../images/ico-print.png');
+}
+
+/** *******************************************************************
+ * 6) jQuery and jQuery UI
+ *********************************************************************/
+
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
+.sf-menu li li,
+.sf-menu li li ul li {
+  background-color: #bdd2ff;
+}
+
+.sf-menu li:hover {
+  background-color: #dfe9ff;
+}
+
+/** *******************************************************************
+ * 7) Right to left language styles
+ *********************************************************************/
+
+.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;
+}
diff --git a/themes/wind/images/avatar.jpg b/themes/wind/images/avatar.jpg
new file mode 100644
index 00000000..acad9314
--- /dev/null
+++ b/themes/wind/images/avatar.jpg
diff --git a/themes/admin_default/images/ico-album.png b/themes/wind/images/ico-album.png
index affa1b84..affa1b84 100644
--- a/themes/admin_default/images/ico-album.png
+++ b/themes/wind/images/ico-album.png
diff --git a/themes/default/images/ico-help.png b/themes/wind/images/ico-help.png
index 5c870176..5c870176 100644
--- a/themes/default/images/ico-help.png
+++ b/themes/wind/images/ico-help.png
diff --git a/themes/admin_default/images/ico-print.png b/themes/wind/images/ico-print.png
index b82a8e1e..b82a8e1e 100644
--- a/themes/admin_default/images/ico-print.png
+++ b/themes/wind/images/ico-print.png
diff --git a/themes/admin_default/images/ico-view-comments.png b/themes/wind/images/ico-view-comments.png
index e5d3630f..e5d3630f 100644
--- a/themes/admin_default/images/ico-view-comments.png
+++ b/themes/wind/images/ico-view-comments.png
diff --git a/themes/admin_default/images/ico-view-fullsize.png b/themes/wind/images/ico-view-fullsize.png
index 0be23e9b..0be23e9b 100644
--- a/themes/admin_default/images/ico-view-fullsize.png
+++ b/themes/wind/images/ico-view-fullsize.png
diff --git a/themes/admin_default/images/ico-view-slideshow.png b/themes/wind/images/ico-view-slideshow.png
index 82f61f63..82f61f63 100644
--- a/themes/admin_default/images/ico-view-slideshow.png
+++ b/themes/wind/images/ico-view-slideshow.png
diff --git a/themes/default/images/select-photos-backg.png b/themes/wind/images/select-photos-backg.png
index 81c2d616..81c2d616 100644
--- a/themes/default/images/select-photos-backg.png
+++ b/themes/wind/images/select-photos-backg.png
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
new file mode 100644
index 00000000..be03b6a8
--- /dev/null
+++ b/themes/wind/js/ui.init.js
@@ -0,0 +1,111 @@
+/**
+ * Initialize jQuery UI and Gallery Plugins
+ */
+
+$(document).ready(function() {
+
+  // Initialize Superfish menus (hidden, then shown to address IE issue)
+  $("#g-site-menu .g-menu").hide().addClass("sf-menu");
+  $("#g-site-menu .g-menu").superfish({
+    delay: 500,
+    animation: {
+      opacity:'show',
+      height:'show'
+    },
+    pathClass: "g-selected",
+    speed: 'fast'
+  }).show();
+
+  // Initialize status message effects
+  $("#g-action-status li").gallery_show_message();
+
+  // Initialize dialogs
+  $(".g-dialog-link").gallery_dialog();
+
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
+  // Apply jQuery UI icon, hover, and rounded corner styles
+  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
+  if ($("#g-view-menu").length) {
+    $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
+    $("#g-view-menu a").addClass("ui-icon");
+  }
+
+  // Apply jQuery UI icon and hover styles to context menus
+  if ($(".g-context-menu").length) {
+    $(".g-context-menu li").addClass("ui-state-default");
+    $(".g-context-menu a").addClass("g-button ui-icon-left");
+    $(".g-context-menu a").prepend("<span class=\"ui-icon\"></span>");
+    $(".g-context-menu a span").each(function() {
+      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
+      $(this).addClass(iconClass);
+    });
+  }
+
+  // Album view only
+  if ($("#g-album-grid").length) {
+    // Set equal height for album items and vertically align thumbnails/metadata
+    $('.g-item').equal_heights().gallery_valign();
+
+    // Initialize thumbnail hover effect
+    $(".g-item").hover(
+      function() {
+        // Insert a placeholder to hold the item's position in the grid
+        var placeHolder = $(this).clone().attr("id", "g-place-holder");
+        $(this).after($(placeHolder));
+        // Style and position the hover item
+        var position = $(this).position();
+        $(this).css("top", position.top).css("left", position.left);
+        $(this).addClass("g-hover-item");
+        // Initialize the contextual menu
+        $(this).gallery_context_menu();
+        // Set the hover item's height
+        $(this).height("auto");
+        var context_menu = $(this).find(".g-context-menu");
+        var adj_height = $(this).height() + context_menu.height(); 
+        $(this).height(adj_height); 
+      },
+      function() {
+        // Reset item height and position
+        if ($(this).next().height()) {
+          var sib_height = $(this).next().height();
+        } else {
+          var sib_height = $(this).prev().height();
+        }
+        if ($.browser.msie && $.browser.version >= 8) {
+          sib_height = sib_height + 1;
+        }
+        $(this).css("height", sib_height);
+        $(this).css("position", "relative");
+        $(this).css("top", 0).css("left", 0);
+        // Remove the placeholder and hover class from the item
+        $(this).removeClass("g-hover-item");
+        $("#g-place-holder").remove();
+      }
+    );
+  }
+
+  // Photo/Item item view
+  if ($("#g-photo").length) {
+    // Ensure the resized image fits within its container
+    $("#g-photo").gallery_fit_photo();
+
+    // Initialize context menus
+    var resize = $("#g-photo").gallery_get_photo();
+    $(resize).hover(function(){
+      $(this).gallery_context_menu();
+    });
+
+    // Add scroll effect for links to named anchors
+    $.localScroll({
+      queue: true,
+      duration: 1000,
+      hash: true
+    });
+  }
+
+  // Initialize button hover effect
+  $.fn.gallery_hover_init();
+
+});
diff --git a/themes/default/theme.info b/themes/wind/theme.info
index 5f19d0d7..17ea7c20 100644
--- a/themes/default/theme.info
+++ b/themes/wind/theme.info
@@ -1,4 +1,4 @@
-name = "Gallery Default"
+name = "Gallery Wind"
 description = "A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience."
 version = 1
 author = "Gallery Team"
diff --git a/themes/default/thumbnail.png b/themes/wind/thumbnail.png
index c0594db2..c0594db2 100644
--- a/themes/default/thumbnail.png
+++ b/themes/wind/thumbnail.png
diff --git a/themes/default/views/album.html.php b/themes/wind/views/album.html.php
index 01f7be50..2c2b54eb 100644
--- a/themes/default/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -1,27 +1,27 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
-<div id="gInfo">
+<div id="g-info">
   <?= $theme->album_top() ?>
   <h1><?= html::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div>
+  <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="gAlbumGrid">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
-    <? $item_class = "gPhoto"; ?>
+    <? $item_class = "g-photo"; ?>
     <? if ($child->is_album()): ?>
-      <? $item_class = "gAlbum"; ?>
+      <? $item_class = "g-album"; ?>
     <? endif ?>
-  <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>">
+  <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
+      <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
+    <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
-    <ul class="gMetadata">
+    <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
@@ -30,7 +30,7 @@
   <? if ($user->admin || access::can("add", $item)): ?>
   <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
   <? else: ?>
   <li><?= t("There aren't any photos here yet!") ?></li>
   <? endif; ?>
@@ -38,4 +38,4 @@
 </ul>
 <?= $theme->album_bottom() ?>
 
-<?= $theme->pager() ?>
+<?= $theme->paginator() ?>
diff --git a/themes/default/views/block.html.php b/themes/wind/views/block.html.php
index e8cff833..699d7c22 100644
--- a/themes/default/views/block.html.php
+++ b/themes/wind/views/block.html.php
@@ -2,9 +2,9 @@
 <? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
 <? endif ?>
-<div id="<?= $css_id ?>" class="gBlock">
+<div id="<?= $css_id ?>" class="g-block">
   <h2><?= $title ?></h2>
-  <div class="gBlockContent">
+  <div class="g-block-content">
     <?= $content ?>
   </div>
 </div>
diff --git a/themes/default/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index 9ed9d69b..a8a4d362 100644
--- a/themes/default/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -1,24 +1,24 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAlbumHeader">
-  <div id="gAlbumHeaderButtons">
+<div id="g-album-header">
+  <div id="g-album-header-buttons">
     <?= $theme->dynamic_top() ?>
   </div>
   <h1><?= html::clean($title) ?></h1>
 </div>
 
-<ul id="gAlbumGrid">
+<ul id="g-album-grid" class="ui-helper-clearfix">
   <? foreach ($children as $i => $child): ?>
-  <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">
+  <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
+      <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
            alt="photo" src="<?= $child->thumb_url() ?>"
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
     <h2><?= html::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
-    <ul class="gMetadata">
+    <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
@@ -26,4 +26,4 @@
 </ul>
 <?= $theme->dynamic_bottom() ?>
 
-<?= $theme->pager() ?>
+<?= $theme->paginator() ?>
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
new file mode 100644
index 00000000..27c293ce
--- /dev/null
+++ b/themes/wind/views/movie.html.php
@@ -0,0 +1,18 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-item">
+  <?= $theme->photo_top() ?>
+
+  <?= $theme->paginator() ?>
+
+  <div id="g-movie" class="ui-helper-clearfix">
+    <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
+    <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
+  </div>
+
+  <div id="g-info">
+    <h1><?= html::purify($item->title) ?></h1>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
+  </div>
+
+  <?= $theme->photo_bottom() ?>
+</div>
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
new file mode 100644
index 00000000..378bd971
--- /dev/null
+++ b/themes/wind/views/no_sidebar.html.php
@@ -0,0 +1,6 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul class="g-message-block">
+  <li class="g-warning"><?= t("No active sidebar blocks.<br/>
+      <a href=\"%url\">Add blocks</a>",
+          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
+</ul>
diff --git a/themes/default/views/page.html.php b/themes/wind/views/page.html.php
index 19d8cc00..f41dcd27 100644
--- a/themes/default/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -27,6 +27,7 @@
     <?= $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 lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
@@ -37,7 +38,7 @@
         <? $new_width = $thumb_proportion * 213 ?>
         <? $new_height = $thumb_proportion * 240 ?>
     <style type="text/css">
-    #gContent #gAlbumGrid .gItem {
+    #g-content #g-album-grid .g-item {
       width: <?= $new_width ?>px;
       height: <?= $new_height ?>px;
       /* <?= $thumb_proportion ?> */
@@ -55,7 +56,6 @@
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
     <?= $theme->script("ui.init.js") ?>
@@ -73,28 +73,30 @@
 
   <body <?= $theme->body_attributes() ?>>
     <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
+    <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <div id="gBanner">
-          <?= $theme->header_top() ?>
+      <div id="g-header" class="ui-helper-clearfix">
+        <div id="g-banner">
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
-          <div id="gSiteMenu">
+          <?= $theme->user_menu() ?>
+          <?= $theme->header_top() ?>
+          <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>
           <?= $theme->header_bottom() ?>
         </div>
 
         <? if (!empty($parents)): ?>
-        <ul class="gBreadcrumbs">
+        <ul class="g-breadcrumbs">
+          <? $i = 0 ?>
           <? foreach ($parents as $parent): ?>
-          <li>
+          <li<? if ($i == 0) print " class=\"g-first\"" ?>>
             <!-- Adding ?show=<id> causes Gallery3 to display the page
                  containing that photo.  For now, we just do it for
                  the immediate parent so that when you go back up a
@@ -104,34 +106,35 @@
               <?= html::purify($parent->title) ?>
             </a>
           </li>
+          <? $i++ ?>
           <? endforeach ?>
-          <li class="active"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
-            <div id="gContent" class="yui-g">
+            <div id="g-content" class="yui-g">
               <?= $theme->messages() ?>
               <?= $content ?>
             </div>
           </div>
         </div>
-        <div id="gSidebar" class="yui-b">
+        <div id="g-sidebar" class="yui-b">
           <? if ($theme->page_type != "login"): ?>
           <?= new View("sidebar.html") ?>
           <? endif ?>
         </div>
       </div>
-      <div id="gFooter">
+      <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="gCredits">
+        <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>
diff --git a/themes/wind/views/paginator.html.php b/themes/wind/views/paginator.html.php
new file mode 100644
index 00000000..5d300cf4
--- /dev/null
+++ b/themes/wind/views/paginator.html.php
@@ -0,0 +1,86 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+// This is a generic paginator for album, photo and movie pages.  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               - "album", "movie", "photo" or "tag"
+//   $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 "album" and "tag" 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 "photo" and "movie" page types:
+//   $position                - the position number of this photo
+//
+?>
+
+<ul class="g-pager ui-helper-clearfix">
+  <li class="g-first">
+  <? if ($page_type == "album" || $page_type == "tag"): ?>
+    <? 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 == "album" || $page_type == "tag"): ?>
+        <?= /* @todo This message isn't easily localizable */
+            t2("Photo %from_number of %count",
+               "Photos %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 ?>
+    <? else: ?>
+      <?= t("No photos") ?>
+    <? 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 == "album" || $page_type == "tag"): ?>
+    <? 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>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
new file mode 100644
index 00000000..e0fae3f1
--- /dev/null
+++ b/themes/wind/views/photo.html.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<? if (access::can("view_full", $theme->item())): ?>
+<!-- Use javascript to show the full size as an overlay on the current page -->
+<script type="text/javascript">
+  $(document).ready(function() {
+    $(".g-fullsize-link").click(function() {
+      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      return false;
+    });
+  });
+</script>
+<? endif ?>
+
+<div id="g-item">
+  <?= $theme->photo_top() ?>
+
+  <?= $theme->paginator() ?>
+
+  <div id="g-photo">
+    <?= $theme->resize_top($item) ?>
+    <? if (access::can("view_full", $item)): ?>
+    <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
+      <? endif ?>
+      <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
+      <? if (access::can("view_full", $item)): ?>
+    </a>
+    <? endif ?>
+    <?= $theme->resize_bottom($item) ?>
+    <?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
+  </div>
+
+  <div id="g-info">
+    <h1><?= html::purify($item->title) ?></h1>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
+  </div>
+
+  <?= $theme->photo_bottom() ?>
+</div>
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
new file mode 100644
index 00000000..cd50fc01
--- /dev/null
+++ b/themes/wind/views/sidebar.html.php
@@ -0,0 +1,16 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->sidebar_top() ?>
+<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
+  <? if ($page_type == "album"):?>
+    <?= $theme->album_menu() ?>
+  <? elseif ($page_type == "photo") : ?>
+    <?= $theme->photo_menu() ?>
+  <? elseif ($page_type == "movie") : ?>
+    <?= $theme->movie_menu() ?>
+  <? elseif ($page_type == "tag") : ?>
+    <?= $theme->tag_menu() ?>
+  <? endif ?>
+</div>
+
+<?= $theme->sidebar_blocks() ?>
+<?= $theme->sidebar_bottom() ?>