commit fc45786608d2a765f2c8a8d6cb857b8d70b0327d
Author: Mathieu Schiano <mathieu.schianodischiabica@centrale-marseille.fr>
Date:   Sun Jan 24 19:00:51 2016 +0100

    Update rubik 4.2 -> 4.3

diff --git a/drupal7/sites/all/themes/rubik/core-rtl.css b/drupal7/sites/all/themes/rubik/core-rtl.css
deleted file mode 100644
index d1c94056..00000000
--- a/drupal7/sites/all/themes/rubik/core-rtl.css
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Generic ============================================================
- */
-.page-content dl dt {}
-.page-content dl dd,
-.page-content dl dl {
-  margin-left:0;
-  margin-right:20px;
-  }
-
-/**
- * Pagers =============================================================
- */
-.pager ul.pager-list { float:right; }
-.pager ul.pager-links { float:left; }
-
-/**
- * Menus, lists =======================================================
- */
-.admin-list li a span.icon {
-  left:auto;
-  right:10px;
-  }
-
-.node-type-list li,
-.admin-list li { padding:10px 50px 9px 5px; }
-
-/**
- * Tables =============================================================
- */
-table th { text-align:right; }
-table td.permission { padding-right:19px; }
-
-/**
- * Form layout: Default ===============================================
- */
-.form-layout-default { background-position:35% 0%; }
-
-.column-main { float:right; }
-
-  .column-main .column-wrapper {
-    padding-left:10px;
-    padding-right:0px;
-    }
-
-.column-side { float:left; }
-
-  .column-side .column-wrapper {
-    padding-left:0px;
-    padding-right:10px;
-    }
-
-/**
- * Forms ==============================================================
- */
-.page-content .form-item .description {
-  left:-15px;
-  right:auto;
-  }
-
-.collapsible .fieldset-title span.icon {
-  left:auto;
-  right:-20px;
-  background-image:url(images/sprite-rtl.png);
-  }
-
-html.js input.form-autocomplete { background-position: 2px 7px; }
-
-/**
- * Help pages =========================================================
- */
-.help-items { float:right; }
-
-/**
- * Admin toolbar ======================================================
- */
-body.rubik #admin-toolbar a.menu-hover span.menu-description {
-  padding-left:0px;
-  padding-right:50px;
-  }
-
-body.rubik #admin-toolbar a.menu-hover span.menu-description span.icon {
-  left:auto;
-  right:10px;
-  }
-/* Primary tabs =============== 
-ul.links li, ul.links li a {
-  float:left;
-}
-*/
\ No newline at end of file
diff --git a/drupal7/sites/all/themes/rubik/core.css b/drupal7/sites/all/themes/rubik/core.css
deleted file mode 100644
index 6a55573a..00000000
--- a/drupal7/sites/all/themes/rubik/core.css
+++ /dev/null
@@ -1,1224 +0,0 @@
-p:last-child { margin:0px; }
-
-hr { display:none; }
-
-/**
- * Toggleables ========================================================
- */
-.toggleable { display:none; }
-
-/**
- * Generic ============================================================
- */
-.page-content dl dt {}
-.page-content dl dd,
-.page-content dl dl {
-  margin-left:20px;
-  margin-bottom:10px;
-  }
-
-/**
- * Console ============================================================
- */
-div.messages {
-  color:#036;
-  background-color:#f8f8f8;
-  padding:9px 9px 9px 40px;
-  border:1px solid #ccc;
-  margin:0px 0px 10px;
-  }
-
-table tr.warning th,
-div.warning {
-  color:#a84;
-  background-color:#fff4c0;
-  }
-
-table tr.error th,
-div.error {
-  color:#965;
-  background-color:#ffe4e0;
-  }
-
-table tr.ok th,
-table tr.info th,
-div.status {
-  color:#687;
-  background-color:#ecf8f4;
-  }
-
-table tr.merge-down td {border-bottom: 0;}
-table tr.merge-up td {border-top: 0;}
-table td.status-description {
-  padding: 3px 40px;
-  font-size: .9em;
-  }
-
-  div.error   { border-color:#ffd4d0; }
-  div.warning { border-color:#ffe4b0; }
-  div.status  { border-color:#dce8e4; }
-
-/**
- * Pagers =============================================================
- */
-.pager {
-  font-weight:normal;
-  font-size:11px;
-  }
-
-  .pager ul.pager-list { float:left; }
-  .pager ul.pager-links { float:right; }
-
-/**
- * Menus, lists =======================================================
- */
-.admin-block-description,
-.help-items ul li,
-.confirmation ul li,
-.item-list ul li,
-.prose .item-list li,
-.menu li {
-  float:none;
-  display:block;
-  padding:5px 10px 4px;
-  border-bottom:1px solid #f4f4f4;
-  }
-
-  .admin-block-description,
-  .help-items ul li:last-child,
-  .confirmation ul li:last-child,
-  .item-list ul li:last-child,
-  .prose .item-list li:last-child,
-  .menu li:last-child {
-    border-bottom:0px;
-    padding-bottom:5px;
-    }
-
-  .item-list ul.ui-tabs-nav li:last-child {
-    padding-bottom:0;
-    }
-
-.admin-panel h3 span.icon,
-.admin-list li a span.icon {
-  position:absolute;
-  left:10px;
-  top:10px;
-  }
-
-  .admin-list-compact li a span.icon { top:5px; }
-
-.admin-panel h3,
-.node-type-list li,
-.admin-list li {
-  position:relative;
-  padding:10px 5px 9px 50px;
-  margin:0px;
-  min-height:30px;
-  border-bottom:1px solid #e8e8e8;
-  }
-
-  .admin-panel h3 {
-    background:#f4f4f4;
-    line-height:30px;
-    }
-
-  .admin-list-compact li { min-height:20px; }
-
-  .node-type-list li:last-child,
-  .admin-list li:last-child { border:0px; }
-
-/* Fix default spacing between the links displayed in "Operations" column. */
-td ul.links.inline.operations li:not(:last-child) {
-  padding: 0 10px 0 0;
-  margin: 0 8px 0 0;
-  border-right: 1px solid #DDD;
-  }
-
-/**
- * Tables =============================================================
- */
-.tabledrag-toggle-weight-wrapper {
-  float:right;
-  font-size:11px;
-  margin-bottom:-30px;
-  height:20px;
-  padding:5px;
-  }
-
-.tabledrag-toggle-weight-wrapper a {
-  display:block;
-  width:20px;
-  height:20px;
-  text-indent:-999px;
-  overflow:hidden;
-  background:url(images/bleeds.png) -40px -120px no-repeat;
-  }
-
-
-table {
-  width:100%;
-  margin:0px 0px 10px;
-  background-color:#fff;
-
-  border-collapse:collapse;
-  border-color:#ddd;
-  border-width:1px;
-  border-style:solid;
-  }
-
-  .fieldset table { margin:0px; }
-
-table td,
-table th {
-  vertical-align:top;
-  border-width:1px 0px;
-  border-style:solid;
-  border-color:#ddd;
-  padding:5px;
-  }
-
-table th {
-  font-size:11px;
-  text-align:left;
-  font-weight:normal;
-  color:#666;
-  background:#eee;
-  }
-
-  table thead th { border-top-color:#ccc; }
-
-table td.active { background:#e4f0f8; }
-table tr.odd td.active { background:#ecf8fc; }
-
-table tr.selected td.active,
-table tr.selected td {
-  background:#ffc;
-  border-color:#eeb;
-  }
-
-/* Block administration */
-table tr.region td { background:#f8f8f8; }
-
-/* Hide tabledrag markers */
-table tr.draggable span.tabledrag-changed { display:none; }
-
-table.field-multiple-table td { padding: 10px; }
-
-/* Stripe administrative tables */
-.page-admin table tr.even,
-.page-admin table tr.even td {
-  background-color: #f9f9f9;
-}
-.page-admin table tr.odd,
-.page-admin table tr.odd td {
-  background-color: #fff;
-}
-
-/* Use Drupal's default colors for Available Updates page statuses */
-.page-admin table tr.warning,
-.page-admin table tr.warning td {
-  background-color: #ffd;
-  color: #020;
-}
-.page-admin table tr.ok,
-.page-admin table tr.ok td {
-  background-color: #dfd;
-  color: #020;
-}
-.page-admin table tr.error,
-.page-admin table tr.error td {
-  background-color: #fcc;
-  color: #020;
-}
-
-/* Overrides the striping with core classes for errors and warnings */
-.page-admin table tr.error, .page-admin table tr.error td {
-  background: #FCC;
-}
-.page-admin table tr.warning, .page-admin table tr.warning td {
-  background: #FFD;
-}
-
-/**
- * Forms ==============================================================
- */
-.block,
-.item-list,
-.help-items ul,
-.form-item,
-.confirmation ul,
-.admin-list,
-.node-type-list,
-.admin-panel {
-  background:#fff;
-  margin:0px 0px 10px;
-
-  border-width:1px;
-  border-style:solid;
-  border-color:#ddd;
-  }
-
-  .form-item {
-    position:relative;
-    padding:9px;
-    }
-.form-wrapper {
-  margin-bottom: 10px;
-  }
-
-.media-widget.form-wrapper{
-  padding-bottom:10px;
-  }
-.form-wrapper .form-wrapper a.button{
-  margin-left:10px;
-  }
-
-  .admin-list { margin:0px; }
-
-table .form-item,
-table .item-list,
-.block .form-item,
-.block .item-list,
-.admin-panel .item-list,
-.admin-panel .admin-list,
-.fieldset .form-item,
-.fieldset .form-type-radio,
-.fieldset .form-type-checkbox,
-.form-item .form-item,
-.form-item .form-type-radio,
-.form.item .form-type-checkbox,
-.form-checkboxes .form-type-checkbox,
-.text-format-wrapper .fieldset .form-item {
-    background:transparent;
-    padding:0px;
-    border:0px;
-    }
-
-  table .form-item,
-  table .item-list,
-  .block .item-list,
-  .admin-panel .item-list,
-  .admin-panel .admin-list,
-  .fieldset .form-type-radio,
-  .fieldset .form-type-checkbox,
-  .form-item .form-type-radio,
-  .form.item .form-type-checkbox,
-  .form-checkboxes .form-type-checkbox { margin-bottom:0px; }
-
-.text-format-wrapper .form-item {
-  background:#fff;
-  margin:0px 0px 10px;
-
-  border-width:1px;
-  border-style:solid;
-  border-color:#ddd;
-  padding: 9px;
-  }
-
-.form-item label {
-  margin:0px;
-  padding:0px;
-  color:#666;
-  font-weight:bold;
-  font-size:10px;
-  }
-
-  .form-item label.option {
-    text-transform:none;
-    font-size:11px;
-    }
-
-	input.button-add {
-	  background-position:-801px 50%;
-	  padding-left:25px;
-	  }
-
-	input.button-add:active { background-position:-1201px 50%; }
-
-	input.button-remove {
-	  background-position:-1601px 50%;
-	  padding-left:25px;
-	  }
-
-	input.button-remove:active { background-position:-2001px 50%; }
-
-  .form-item label.option input { vertical-align:middle; }
-
-.page-content .password-description,
-.page-content .password-strength,
-.page-content .description,
-.page-content .form-item .description {
-  line-height:15px;
-  font-size:11px;
-  white-space:normal;
-  }
-
-  .admin-panel p.description {
-    background:#eee;
-    border-top:1px solid #ddd;
-    border-bottom:1px solid #fff;
-    line-height:20px;
-    font-size:11px;
-    padding:4px 9px;
-    margin:0px;
-    }
-
-.fieldset .description { margin:0px 0px 10px; }
-
-.page-content .form-item .description {
-  position:absolute;
-  bottom:100%;
-  right:-15px;
-  z-index:5;
-
-  color:#687;
-  background:url(images/popup.png) 50% 100% no-repeat;
-  border-top:1px solid #d8e4e0;
-
-  width:240px;
-  margin:0px 0px -15px;
-  padding:9px 10px 20px;
-  display:none;
-  }
-
-  .page-content .form-item.form-type-checkbox .description {
-    bottom: 150%;
-    }
-
-  .page-content .form-item:hover {
-    z-index:10;
-    height:auto; /* Fix for flicker in IE7 */
-    }
-
-  .page-content .form-item:hover > .description { display:block; }
-
-  .rubik-inline-field-descriptions .page-content .form-item .description {
-    display:block;
-    position:relative;
-    background:none;
-    margin:0;
-    padding:0.25em 0 0.75em;
-    border:none;
-    right:0;
-    width:100%;
-    z-index:0;
-    }
-
-input.form-submit, a.button, .form-actions #edit-cancel { display: inline-block;}
-
-input.teaser-button,
-input.form-submit, a.button,
-.form-actions #edit-cancel {
-  cursor:pointer;
-  padding:3px 10px;
-  color:#333;
-  font-size:13px;
-  text-align:center;
-  font-weight:normal;
-  border-width:1px;
-  border-style:solid;
-  border-color:#ddd #ddd #ccc;
-  background:#fff url(images/buttons.png) -1px 50% no-repeat;
-  }
-
-  input.form-submit:hover,
-  a.button:hover,
-  .form-actions #edit-cancel:hover {
-    border-color:#ace;
-    -webkit-box-shadow:#ace 0px 0px 5px;
-    }
-
-  input.form-submit:active,
-  a.button:active,
-  .form-actions #edit-cancel:active {
-    border-color:#666 #666 #555;
-    background:#666 url(images/buttons.png) -401px 50% no-repeat;
-    color:#222;
-    text-shadow:#999 0px 1px 0px;
-    }
-
-  input.button-yes, a.button-yes {
-    background-position:-2401px 50%;
-    padding-left:25px;
-    }
-
-  input.button-yes:active, a.button-yes:active { background-position:-2801px 50%; }
-
-  input.button-no, a.button-no{
-    background-position:-3201px 50%;
-    padding-left:25px;
-    }
-
-  input.button-no:active , a.button-no:active{ background-position:-3601px 50%; }
-
-  input.button.launcher , a.button.launcher {
-    background-position:-4800px 50%;
-    padding-left: 25px;
-  }
-
-  input.button.launcher:active , a.button.launcher:active {
-    background-position:-1200px 50%;
-  }
-
-  input.button.edit , a.button.edit {
-    background-position:-2400px 50%;
-    padding-left: 25px;
-  }
-
-  input.button.edit:active , a.button.edit:active {
-    background-position:-2800px 50%;
-  }
-
-  input.button.remove , a.button.remove {
-    background-position:-3200px 50%;
-    padding-left: 25px;
-  }
-
-  input.button.remove:active , a.button.remove:active {
-    background-position:-3600px 50%;
-  }
-  .media-widget a.button.remove {
-    padding-top: 4px;
-    padding-bottom: 4px;
-  }
-  .media-widget .preview {
-    min-height:35px;
-  }
-
-select.form-select {
-  height: 28px;
-}
-
-input.form-autocomplete,
-input.form-text,
-input.form-file,
-textarea.form-textarea,
-select.form-select {
-  padding:3px;
-  border-width:1px;
-  border-style:solid;
-  border-color:#ddd;
-  background:#fff;
-  color:#666;
-  max-width:100%;
-  }
-
-  input.form-autocomplete:hover,
-  input.form-text:hover,
-  input.form-file:hover,
-  textarea.form-textarea:hover,
-  select.form-select:hover,
-  input.form-autocomplete:focus,
-  input.form-text:focus,
-  input.form-file:focus,
-  textarea.form-textarea:focus,
-  select.form-select:focus {
-    color:#333;
-    border-color:#ace;
-    -webkit-box-shadow:#ace 0px 0px 5px;
-    }
-
-  input.fluid {
-    -moz-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
-    box-sizing: border-box;
-    width:100%;
-    }
-
-  input.form-file {
-    padding: 1px;
-    margin-right: 3px;
-  }
-
-  html.js input.form-autocomplete { background-position:100% 7px; }
-  html.js input.throbbing { background-position:100% -2px; }
-
-#search-block-form .form-wrapper.form-actions {
-  background: none;
-  border: none;
-  padding: 0;
-  margin-top: 0;
-}
-
-/* Fieldsets */
-.fieldset,
-.fieldset-title,
-.fieldset-title a,
-.fieldset-content { display:block; }
-
-.fieldset {
-  margin:0px 0px 10px;
-  display:block;
-  position:relative;
-  min-height:28px;
-  border: 1px solid #CCCCCC;
-  }
-fieldset legend {
-  display: block;
-  float: left;
-  width: 100%;
-}
-body.page-admin div.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane fieldset {
-  padding:0;
-}
-
-.fieldset-legend {
-  display:block;
-  }
-
-.container-inline .fieldset-legend .fieldset-content,
-.fieldset.titled .fieldset-content {
-  display:block;
-  padding-top:40px;
-  }
-
-.item-list h3,
-.block .block-title,
-.fieldset-title,
-.collapsible .fieldset-legend a {
-  display:block;
-  font-size:11px;
-  margin:0px;
-  padding:4px 9px 5px;
-  color:#333;
-  background:#f6f6f6;
-  }
-
-  .fieldset-legend,
-  .collapsible .fieldset-legend a { padding-bottom:4px; }
-
-  /* Explicit height for IE */
-  .collapsible .fieldset-legend a {
-    height:20px;
-    padding-left:28px;
-  }
-
-  .collapsible .fieldset-legend span.icon {
-    position:absolute;
-    left:6px;
-    top:6px;
-    background:url(images/bleeds.png) -80px -120px no-repeat;
-    width: 15px;
-    height: 15px;
-    display:block;
-    cursor:pointer;
-    }
-
-    html.js .collapsed .fieldset-legend span.icon { background-position:-60px -120px; }
-
-  .collapsed .fieldset-legend a {
-    background:#eee;
-    color:#484848;
-    }
-
-  .collapsed .fieldset-legend a:hover { color:#666; }
-
-  .collapsible .fieldset-legend {
-    padding:0px;
-    background:transparent;
-    }
-
-  .collapsed .fieldset-legend a { padding-bottom:4px; }
-
-.block .block-content,
-.container-inline .fieldset-content,
-.fieldset-content {
-  padding:10px 9px 9px;
-  background:#fff;
-  }
-
-
-  html.js .collapsed .fieldset-content { display:none; }
-
-  .fieldset .fieldset .fieldset-content { background:#fff; }
-
-/* Filter form */
-.filter-wrapper {
-  font-size:11px;
-  margin-top:-10px;
-  border-top:none;
-  }
-.text-format-wrapper .filter-wrapper {
-  border-top:1px solid #CCC;
-  margin-top: 0;
-}
-.text-format-wrapper .filter-wrapper .form-type-select .filter-list {
-  max-height: 22px;
-}
-.text-format-wrapper .filter-wrapper .form-type-select,
-.text-format-wrapper .filter-wrapper .filter-guidelines {
-  margin: 0;
-  overflow: auto;
-}
-
-.filter-wrapper .fieldset-content,
-.fieldset .fieldset.filter-wrapper .fieldset-content  {
-  background:#f8f8f8;
-  border-top:0px;
-  padding:5px 9px 4px;
-  }
-
-.filter-wrapper .form-type-select { padding:0px; }
-.filter-wrapper .form-type-select * {
-  float:left;
-  margin-right:5px;
-  }
-
-.filter-wrapper select {
-  padding:0px;
-  font-size:11px;
-  }
-
-.filter-wrapper .filter-help {
-  float:right;
-  font-size:11px;
-  margin:0;
-  padding:0;
-  }
-
-.form-type-date-popup label {
-  padding: 10px 10px 0 10px;
-}
-
-.form-type-date-popup .date-padding label {
-  padding: 0;
-}
-
-.form-type-date-popup .date-padding {
-  padding-top: 0;
-}
-
-/**
- * Form layout: Default ===============================================
- */
-.form-layout-default { background:url(images/vrule.png) 65% 0% repeat-y; }
-
-.column-main {
-  float:left;
-  width:65%;
-  }
-
-  .column-main .column-wrapper { padding-right:10px; }
-
-.column-side {
-  float:right;
-  width:34.99%;
-  }
-
-  .column-side .column-wrapper { padding-left:10px; }
-
-.column-footer { clear:both; }
-
-.form-wrapper.form-actions {
-  background:#eee;
-  border:1px solid #ddd;
-  padding:9px;
-  margin-top: 20px;
-  }
-
-  form .form-actions.container-inline {
-    background:transparent;
-    border:0px;
-    padding:0px;
-    }
-
-  .form-wrapper.form-actions input.form-submit, .form-wrapper.form-actions a.button { margin-right:5px; }
-
-  .form-layout-default .column-main .column-wrapper > .form-actions { display:none; }
-  .form-layout-default .column-side .form-actions { margin:0px 0px 10px; }
-  .form-layout-default .column-side .form-actions input.form-submit,
-  .form-layout-deafult .column-side .form-actions a.button {
-    margin:1px 5px 1px 0px;
-    }
-
-/**
- * "Boxes" aka generic wrappers =======================================
- */
-.box-title {
-  font-weight:normal;
-  font-size:10px;
-
-  background:#eee;
-  border:1px solid #ddd;
-  padding:4px 9px;
-  margin:0px 0px 10px;
-  }
-
-/**
- * System =============================================================
- */
-.admin .right {
-  padding-left:5px;
-  float:right;
-  }
-
-.admin .left {
-  padding-right:5px;
-  float:left;
-  }
-
-.admin .right,
-.admin .left {
-  box-sizing:border-box;
-  -moz-box-sizing:border-box;
-  -webkit-box-sizing:border-box;
-  width:50%;
-  margin:0px;
-  }
-
-/* admin/appearance */
-.theme-selector {
-  position:relative;
-  padding:9px 9px 9px 314px;
-  border:1px solid #ddd;
-  margin:10px 0px;
-  min-height:224px;
-  text-shadow:#fff 0px 1px 0px;
-  }
-
-.theme-selector img {
-  clip: rect(0px, 294px, 219px, 0px);
-  height: auto;
-  left: 10px;
-  position: absolute;
-  top: 10px;
-  width: 294px;
-  }
-
-.theme-selector .operations a { margin-right:20px; }
-
-.system-themes-list-disabled .theme-selector {
-  background:#eee;
-  color:#676767;
-  padding:9px 9px 9px 162px;
-  min-height:110px;
-  }
-
-.system-themes-list-disabled .theme-selector img {
-  width: 142px;
-}
-
-/* admin/content/node & admin/user/user */
-.exposed-filters .form-item label {
-  float:left;
-  width:120px;
-  }
-
-.exposed-filters .additional-filters {
-  padding:5px;
-  font-size:11px;
-  color:#666;
-  }
-
-/* update options */
-.admin-options {
-  background:#f8f8f8;
-  line-height:30px;
-  height:30px;
-  padding:9px;
-  border:1px solid #ddd;
-  margin:0px 0px 10px;
-  }
-
-.admin-options label,
-.admin-options .form-item {
-  margin-right:10px;
-  float:left;
-  }
-
-.admin-options .form-item {
-  padding:0px;
-  border:0px;
-  }
-
-/* dependency colors */
-.admin-dependencies,
-.admin-required { color: #666; }
-.admin-disabled { color: #900; }
-.admin-enabled { color: #099; }
-.admin-missing { color: #c30; }
-
-/* progressbar styles */
-.progress .bar {
-  -webkit-box-shadow:inset #ddd 0px 1px 3px;
-  -moz-box-shadow:inset #ddd 0px 1px 3px;
-  background:#eee;
-  border:1px solid #ccc;
-  }
-
-.progress .filled { background:#666; }
-
-/**
- * Help pages =========================================================
- */
-.help-items { float:left; width:25%; }
-.help-items ul { margin:10px 5px; }
-
-/**
- * Admin toolbar ======================================================
- */
-body.tao #admin-toolbar a.menu-hover span.menu-description { padding-left:50px; }
-
-body.tao #admin-toolbar a.menu-hover span.menu-description span.icon {
-  position:absolute;
-  left:10px;
-  top:0px;
-  }
-
-/**
- * Form description exceptions ========================================
- */
-
-/**
- * Some form elements are either too weirdly positioned or really benefit
- * from persistent descriptions. Reset for all of these.
- */
-.page-content .form-item-files-feeds,
-.page-content .form-item-files-feeds .description,
-.ctools-export-ui-row .form-item,
-.ctools-export-ui-row .form-item .description,
-.multiselect .form-item,
-.multiselect .form-item .description,
-.page-content table .form-item,
-.page-content table .form-item .description,
-.page-content .form-item .widget-edit .description,
-#upload-attachments .description,
-#views-ajax-pad .form-item,
-#views-ajax-pad .form-item .description {
-  width:auto;
-  padding:0px;
-  margin:0px;
-  border:0px;
-  background:transparent;
-  position:static;
-  display:block;
-  }
-
-.page-content .form-item-files-feeds:hover,
-.ctools-export-ui-row .form-item:hover,
-.multiselect .form-item:hover,
-.page-content table .form-item:hover,
-#views-ajax-pad .form-item:hover { position:static; }
-
-.page-content .form-item-files-feeds .description,
-.page-content table .form-item .description,
-#upload-attachments .description,
-#views-ajax-pad .form-item .description {
-  padding:0px;
-  color:#666;
-  display:block;
-  max-width:none;
-  }
-
-/**
- * Form containers ====================================================
- */
-.container-inline div {
-  display:inline;
-  border:0px;
-  padding:0px;
-  background:transparent;
-  }
-
-.container-inline { margin:0px 0px 10px; }
-
-/**
- * Vertical tabs=======================================================
- */
-.vertical-tabs {
-  background:#fff url(images/vtabs.png) 0px 0px repeat-y;
-  border:1px solid #ddd;
-  margin:0px 0px 10px;
-  position:relative;
-  }
-
-.vertical-tabs .fieldset-content,
-.vertical-tabs fieldset.titled .fieldset-content {
-  border:0px;
-  padding:10px;
-  }
-.vertical-tabs .fieldset-content .fieldset-content {
-  margin-top: 20px;
-}
-
-.vertical-tabs-list li a {
-  display:block;
-  text-shadow:#fff 0px 1px 0px;
-  padding:5px 10px 4px 10px;
-  border-bottom:1px solid #ddd;
-  color:#666;
-  }
-
-.vertical-tabs-list .selected a {
-  background:#fff;
-  color:#333;
-  }
-
-.vertical-tabs-list .summary { font-size:11px; }
-
-.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane .fieldset legend {
-  display: block;
-}
-
-.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane fieldset.collapsible {
-  border: 1px solid #CCCCCC;
-  margin: 1em 0;
-  position: relative;
-  padding-top: 0;
-}
-
-/**
- * Action links =======================================================
- */
-.action-links a {
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  border-radius:5px;
-
-  margin:0px 5px 0px 0px;
-  padding:0px 5px 0px 25px;
-  background:#999 url(images/buttons.png) -800px 50% no-repeat;
-  color:#fff;
-  text-shadow:#666 0px 1px 0px;
-  }
-
-  .action-links a:active {
-    color:#222;
-    background-color:#666;
-    background-position:-1200px 50%;
-    text-shadow:#999 0px 1px 0px;
-    }
-
-/* color module fix */
-#palette .form-item {
-  width: 20em !important;
-  height: 2em;
-  line-height: 2em;
-  margin: 0.5em 0;
-  padding: 0.2em;
-}
-
-#palette .lock {
-  z-index: 2;
-}
-.page-content .color-form .form-item:hover {
-  height: 2em;
-}
-/* panels stylizer color fix */
-div.ctools-modal-content #palette .form-item label {
-  clear: none;
-  float: left;
-  width: 14em;
-}
-div.ctools-modal-content .color-form .form-item input {
-  margin-top: 0;
-}
-
-/**
- * ORPHANED MARKUP ====================================================
- * The following selectors target markup generated by Drupal that have
- * exactly 1 or extremely few instances. It will make a great future
- * hitlist of markup to consolidate and generalize.
- */
-.compact-link {
-  font-size:11px;
-  height:20px;
-  margin:0px 0px 10px;
-  }
-
-.compact-link a {
-  float:left;
-  line-height:18px;
-  padding:0px 9px;
-  border:1px solid #ddd;
-  color:#666;
-  background:#fff;
-  }
-
-/**
- * Display Suite ====================================================
- */
-
-.field-formatter-settings-edit-form.ds-ft-processed {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 0.5em 1em 0;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group {
-  overflow: auto;
-  margin-bottom: 1em !important;
-  border-bottom: 1px solid #CCC;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi {
-  border-bottom: 0;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item {
-  margin: 0.25em 1em 0.5em 0 !important;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item .description {
-  max-width: 120px !important;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item.form-type-checkbox {
-  clear: both;
-  margin-right: 0 !important;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.ow .form-type-textfield,
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fis .form-type-textfield,
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi .form-type-textfield {
-  clear: left;
-}
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.ow .form-type-textfield ~ .form-type-textfield,
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fis .form-type-textfield ~ .form-type-textfield,
-.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi .form-type-textfield ~ .form-type-textfield {
-  clear: none;
-}
-
-/**
- * Search API ====================================================
- */
-
-#facetapi-facet-display-form .fieldset-content > .form-item {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  float: left;
-  width: 50% !important;
-}
-
-#facetapi-facet-display-form .fieldset-content .facetapi-sort-table {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 0 !important;
-  position: static !important;
-  width: 50% !important;
-  z-index: 1 !important;
-}
-
-/**
- * Sidebar Scroll ====================================================
- */
-
-#content .column-side .column-wrapper {
-  padding-bottom: 5px;
-}
-#content .column-side .column-wrapper.fixed {
-  background-color: #FFF;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -m-box-sizing: border-box;
-  box-sizing: border-box;
-  display: inline-block;
-  position: fixed;
-  top: 5px;
-  z-index: 12;
-}
-
-.admin-menu #content .column-side .column-wrapper.fixed {
-  top: 40px;
-}
-
-/**
- * Watchdog/dblog =================================================
- */
-
-#admin-dblog td {border-color: #ccc;}
-#admin-dblog .dblog-notice td, #admin-dblog .dblog-notice .active {background-color:#ECF8FC;}
-#admin-dblog .dblog-info td, #admin-dblog .dblog-info .active {background-color: #DFF2BF;}
-#admin-dblog .dblog-warning td, #admin-dblog .dblog-warning .active {background-color: #FEEFB3;}
-#admin-dblog .dblog-error td, #admin-dblog .dblog-error .active {background-color: #FFBABA;}
-
-/**
- * Adminimal Administration Menu ===============================================
- */
-body.adminimal-menu { margin-top: 29px!important; }
-
-/**
- * Breakpoints ===============================================
- */
-
-#breakpoints-admin-breakpoints #edit-buttons input,
-#breakpoints-admin-breakpoints  #edit-buttons a {
-  margin-bottom: 1em;
-  margin-right: 1em;
-}
-
-.breakpoints-group-operations-link {
-  display: inline-block;
-  cursor:pointer;
-  padding:3px 10px;
-  color:#333;
-  font-size:13px;
-  text-align:center;
-  font-weight:normal;
-  border-width:1px;
-  border-style:solid;
-  border-color:#ddd #ddd #ccc;
-  background:#fff url(images/buttons.png) -1px 50% no-repeat;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-box-shadow: #ddd 0 1px 1px;
-  -moz-box-shadow: #ddd 0 1px 1px;
-  box-shadow: #ddd 0 1px 1px;
-}
-
-.breakpoints-group-operations-link:hover {
-  border-color:#ace;
-  -webkit-box-shadow:#ace 0 0 5px;
-  -moz-box-shadow:#ace 0 0 5px;
-  box-shadow:#ace 0 0 5px;
-}
-
-.breakpoints-group-operations-link:active {
-  border-color:#666 #666 #555;
-  background:#666 url(images/buttons.png) -401px 50% no-repeat;
-  color:#222;
-  text-shadow:#999 0 1px 0;
-}
-
-/**
- * Media ====================================================
- */
-
-.page-media-browser {overflow:hidden;}
-
-.page-media-browser #block-system-main {border: none;}
-
-.media-widget .preview {
-  background-color: #CCC;
-  min-width: 50px;
-  min-height: 50px;
-}
-
-.media-widget .preview .media-item {margin: 0;}
-.media-widget .preview.launcher > .form-item {padding: 0; border: 0;}
-.media-widget.form-wrapper {margin-bottom: 0;}
-.media-widget > .form-item:last-child {display: none;}
-.field-widget-media-generic > div > .form-item {
-  border: 0;
-  padding: 0;
-}
-
-.field-widget-media-generic .field-multiple-table thead .field-label {padding-left: 5px;}
-
-.media-item .label-wrapper label {display: block;}
-
-#media-browser-page {overflow: hidden;}
-#media-browser-page .form-actions {margin-bottom: 0;}
-
-#media-browser-tabset {border: none;}
-#media-browser-tabset #branding {padding: 8px 10px 2px 10px; height: 20px;}
-#media-browser-tabset #branding h1 {margin-top: -3px;}
-
-#media-tabs-wrapper .tabs.primary {margin-right: 10px;}
-
-.media-browser-tab.ui-tabs-panel {border: none; padding-bottom: 0;}
-
-.view-media-default #edit-filename-wrapper {max-width: 200px;}
-
-
diff --git a/drupal7/sites/all/themes/rubik/css/core-rtl.css b/drupal7/sites/all/themes/rubik/css/core-rtl.css
new file mode 100644
index 00000000..13093d26
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/core-rtl.css
@@ -0,0 +1,79 @@
+
+/**
+ * @file
+ * Base Rubik styles for RTL languages.
+ */
+
+/* Generic. */
+.page-content dl dd,
+.page-content dl dl {
+  margin-left:0;
+  margin-right:20px;
+}
+/* Pagers. */
+.pager ul.pager-list {
+  float:right;
+}
+.pager ul.pager-links {
+  float:left;
+}
+/* Menus, lists. */
+.admin-list li a span.icon {
+  left:auto;
+  right:10px;
+}
+.node-type-list li,
+.admin-list li {
+  padding:10px 50px 9px 5px;
+}
+/* Tables. */
+table th {
+  text-align:right;
+}
+table td.permission {
+  padding-right:19px;
+}
+/* Form layout: Default. */
+.form-layout-default {
+  background-position:35% 0%;
+}
+.column-main {
+  float:right;
+}
+.column-main .column-wrapper {
+  padding-left:10px;
+  padding-right:0px;
+}
+.column-side {
+  float:left;
+}
+.column-side .column-wrapper {
+  padding-left:0px;
+  padding-right:10px;
+}
+/* Forms. */
+.page-content .form-item .description {
+  left:-15px;
+  right:auto;
+}
+.collapsible .fieldset-title span.icon {
+  left:auto;
+  right:-20px;
+  background-image:url(../images/sprite-rtl.png);
+}
+html.js input.form-autocomplete {
+  background-position: 2px 7px;
+}
+/* Help pages. */
+.help-items {
+  float:right;
+}
+/* Admin toolbar. */
+body.rubik #admin-toolbar a.menu-hover span.menu-description {
+  padding-left:0px;
+  padding-right:50px;
+}
+body.rubik #admin-toolbar a.menu-hover span.menu-description span.icon {
+  left:auto;
+  right:10px;
+}
diff --git a/drupal7/sites/all/themes/rubik/css/core.css b/drupal7/sites/all/themes/rubik/css/core.css
new file mode 100644
index 00000000..36c2f9f3
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/core.css
@@ -0,0 +1,1279 @@
+
+/**
+ * Base Rubik styles.
+ */
+
+/*******************************************************************************
+ * General styles
+ ******************************************************************************/
+p:last-child {
+  margin: 0;
+}
+hr {
+  display: none;
+}
+/* Toggleables. */
+.toggleable {
+  display: none;
+}
+/* Generic. */
+.page-content dl dd,
+.page-content dl dl {
+  margin-left: 20px;
+  margin-bottom: 10px;
+}
+/* Console. */
+div.messages {
+  color: #036;
+  background-color: #f8f8f8;
+  padding: 9px 9px 9px 40px;
+  border: 1px solid #ccc;
+  margin: 0 0 10px;
+}
+table tr.warning th,
+div.warning {
+  color: #a84;
+  background-color: #fff4c0;
+}
+table tr.error th,
+div.error {
+  color: #965;
+  background-color: #ffe4e0;
+}
+table tr.ok th,
+table tr.info th,
+div.status {
+  color: #687;
+  background-color: #ecf8f4;
+}
+table tr.merge-down td {border-bottom: 0;}
+table tr.merge-up td {border-top: 0;}
+table td.status-description {
+  padding: 3px 40px;
+  font-size: .9em;
+}
+div.error   {
+  border-color: #ffd4d0;
+}
+div.warning {
+  border-color: #ffe4b0;
+}
+div.status  {
+  border-color: #dce8e4;
+}
+/* Pagers. */
+.pager {
+  font-weight: normal;
+  font-size: 11px;
+}
+.pager ul.pager-list {
+  float: left;
+}
+.pager ul.pager-links {
+  float: right;
+}
+/* General styles end */
+
+/*******************************************************************************
+ * Menus, lists
+ ******************************************************************************/
+.admin-block-description,
+.help-items ul li,
+.confirmation ul li,
+.item-list ul li,
+.prose .item-list li,
+.menu li {
+  float: none;
+  display: block;
+  padding: 5px 10px 4px;
+  border-bottom: 1px solid #f4f4f4;
+}
+.admin-block-description,
+.help-items ul li:last-child,
+.confirmation ul li:last-child,
+.item-list ul li:last-child,
+.prose .item-list li:last-child,
+.menu li:last-child {
+  border-bottom: 0;
+  padding-bottom: 5px;
+}
+.item-list ul.ui-tabs-nav li:last-child {
+  padding-bottom: 0;
+}
+.admin-panel h3 span.icon,
+.admin-list li a span.icon {
+  position: absolute;
+  left: 10px;
+  top: 10px;
+}
+.admin-list-compact li a span.icon {
+  top: 5px;
+}
+.admin-panel h3,
+.node-type-list li,
+.admin-list li {
+  position: relative;
+  padding: 10px 5px 9px 50px;
+  margin: 0;
+  min-height: 30px;
+  border-bottom: 1px solid #e8e8e8;
+}
+.admin-panel h3 {
+  background: #f4f4f4;
+  line-height: 30px;
+}
+.admin-list-compact li {
+  min-height: 20px;
+}
+.node-type-list li:last-child,
+.admin-list li:last-child {
+  border: 0;
+}
+/* Fix default spacing between the links displayed in "Operations" column. */
+td ul.links.inline.operations li:not(:last-child) {
+  padding: 0 10px 0 0;
+  margin: 0 8px 0 0;
+  border-right: 1px solid #DDD;
+}
+/* Menus, lists end */
+
+/*******************************************************************************
+ * Tables
+ ******************************************************************************/
+.tabledrag-toggle-weight-wrapper {
+  float: right;
+  font-size: 11px;
+  margin-bottom: -30px;
+  height: 20px;
+  padding: 5px;
+}
+.tabledrag-toggle-weight-wrapper a {
+  display: block;
+  width: 20px;
+  height: 20px;
+  text-indent: -999px;
+  overflow: hidden;
+  background: url(../images/bleeds.png) -40px -120px no-repeat;
+}
+table {
+  width: 100%;
+  margin: 0 0 10px;
+  background-color: #fff;
+  border-collapse: collapse;
+  border-color: #ddd;
+  border-width: 1px;
+  border-style: solid;
+}
+.fieldset table {
+  margin: 0;
+}
+table td,
+table th {
+  vertical-align: top;
+  border-width: 1px 0;
+  border-style: solid;
+  border-color: #ddd;
+  padding: 5px;
+}
+table th {
+  font-size: 11px;
+  text-align: left;
+  font-weight: normal;
+  color: #666;
+  background: #eee;
+}
+  table thead th {
+    border-top-color: #ccc;
+  }
+table td.active {
+  background: #e4f0f8;
+}
+table tr.odd td.active {
+  background: #ecf8fc;
+}
+table tr.selected td.active,
+table tr.selected td {
+  background: #ffc;
+  border-color: #eeb;
+}
+/* Block administration */
+table tr.region td {
+  background: #f8f8f8;
+}
+/* Hide tabledrag markers */
+table tr.draggable span.tabledrag-changed {
+  display: none;
+}
+table.field-multiple-table td {
+  padding: 10px;
+}
+/* Stripe administrative tables */
+.page-admin table tr.even,
+.page-admin table tr.even td {
+  background-color: #f9f9f9;
+}
+.page-admin table tr.odd,
+.page-admin table tr.odd td {
+  background-color: #fff;
+}
+.page-admin table tr:hover,
+.page-admin table tr:hover td {
+  background-color: #EEE;
+}
+/* Use Drupal's default colors for Available Updates page statuses */
+.page-admin table tr.warning,
+.page-admin table tr.warning td {
+  background-color: #ffd;
+  color: #020;
+}
+.page-admin table tr.ok,
+.page-admin table tr.ok td {
+  background-color: #dfd;
+  color: #020;
+}
+.page-admin table tr.error,
+.page-admin table tr.error td {
+  background-color: #fcc;
+  color: #020;
+}
+/* Overrides the striping with core classes for errors and warnings */
+.page-admin table tr.error,
+.page-admin table tr.error td {
+  background: #FCC;
+}
+.page-admin table tr.warning,
+.page-admin table tr.warning td {
+  background: #FFD;
+}
+/* Tables end */
+
+/*******************************************************************************
+ * Forms
+ ******************************************************************************/
+.block,
+.item-list,
+.help-items ul,
+.form-item,
+.confirmation ul,
+.admin-list,
+.node-type-list,
+.admin-panel {
+  background: #fff;
+  margin: 0 0 10px;
+
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+}
+.form-item {
+  position: relative;
+  padding: 9px;
+}
+.form-wrapper {
+  margin-bottom: 10px;
+}
+.media-widget.form-wrapper{
+  padding-bottom: 10px;
+}
+.form-wrapper .form-wrapper a.button{
+  margin-left: 10px;
+}
+.admin-list {
+  margin: 0;
+}
+table .form-item,
+table .item-list,
+.block .form-item,
+.block .item-list,
+.admin-panel .item-list,
+.admin-panel .admin-list,
+.fieldset .form-item,
+.fieldset .form-type-radio,
+.fieldset .form-type-checkbox,
+.form-item .form-item,
+.form-item .form-type-radio,
+.form.item .form-type-checkbox,
+.form-checkboxes .form-type-checkbox,
+.text-format-wrapper .fieldset .form-item {
+  background: transparent;
+  padding: 0;
+  border: 0;
+}
+table .form-item,
+table .item-list,
+.block .item-list,
+.admin-panel .item-list,
+.admin-panel .admin-list,
+.fieldset .form-type-radio,
+.fieldset .form-type-checkbox,
+.form-item .form-type-radio,
+.form.item .form-type-checkbox,
+.form-checkboxes .form-type-checkbox {
+  margin-bottom: 0;
+}
+.text-format-wrapper .form-item {
+  background: #fff;
+  margin: 0 0 10px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+  padding: 9px;
+}
+.form-item label {
+  margin: 0;
+  padding: 0;
+  color: #666;
+  font-weight: bold;
+  font-size: 10px;
+}
+.form-item label.option {
+  text-transform: none;
+  font-size: 11px;
+}
+input.button-add {
+  background-position: -801px 50%;
+  padding-left: 25px;
+}
+input.button-add:active {
+  background-position: -1201px 50%;
+}
+input.button-remove {
+  background-position: -1601px 50%;
+  padding-left: 25px;
+}
+input.button-remove:active {
+  background-position: -2001px 50%;
+}
+.form-item label.option input {
+  vertical-align: middle;
+}
+.page-content .password-description,
+.page-content .password-strength,
+.page-content .description,
+.page-content .form-item .description {
+  line-height: 15px;
+  font-size: 11px;
+  white-space: normal;
+}
+.admin-panel p.description {
+  background: #eee;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #fff;
+  line-height: 20px;
+  font-size: 11px;
+  padding: 4px 9px;
+  margin: 0;
+}
+.fieldset .description {
+  margin: 0 0 10px;
+}
+.page-content .form-item .description {
+  position: absolute;
+  bottom: 100%;
+  right: -15px;
+  z-index: 5;
+  color: #687;
+  background: url(../images/popup.png) 50% 100% no-repeat;
+  border-top: 1px solid #d8e4e0;
+  width: 240px;
+  margin: 0 0 -15px;
+  padding: 9px 10px 20px;
+  display: none;
+}
+.page-content .form-item.form-type-checkbox .description {
+  bottom: 150%;
+}
+.page-content .form-item:hover {
+  z-index: 10;
+  height: auto; /* Fix for flicker in IE7 */
+}
+.page-content .form-item:hover > .description {
+  display: block;
+}
+.rubik-inline-field-descriptions .page-content .form-item .description {
+  display: block;
+  position: relative;
+  background: none;
+  margin: 0;
+  padding: 0.25em 0 0.75em;
+  border: none;
+  right: 0;
+  width: 100%;
+  z-index: 0;
+}
+a.button,
+input.form-submit,
+.form-actions #edit-cancel {
+  display: inline-block
+}
+a.button,
+input.teaser-button,
+input.form-submit,
+.form-actions #edit-cancel {
+  cursor: pointer;
+  padding: 3px 10px;
+  color: #333;
+  font-size: 13px;
+  text-align: center;
+  font-weight: normal;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd #ddd #ccc;
+  background: #fff url(../images/buttons.png) -1px 50% no-repeat;
+}
+input.form-submit:hover,
+a.button:hover,
+.form-actions #edit-cancel:hover {
+  border-color: #ace;
+  -webkit-box-shadow: #ace 0 0 5px;
+     -moz-box-shadow: #ace 0 0 5px;
+          box-shadow: #ace 0 0 5px;
+}
+input.form-submit:active,
+a.button:active,
+.form-actions #edit-cancel:active {
+  border-color: #666 #666 #555;
+  background: #666 url(../images/buttons.png) -401px 50% no-repeat;
+  color: #222;
+  text-shadow: #999 0 1px 0;
+}
+input.button-yes,
+a.button-yes {
+  background-position: -2401px 50%;
+  padding-left: 25px;
+}
+input.button-yes:active,
+a.button-yes:active {
+  background-position: -2801px 50%;
+}
+input.button-no,
+a.button-no{
+  background-position: -3201px 50%;
+  padding-left: 25px;
+}
+input.button-no:active,
+a.button-no:active{
+  background-position: -3601px 50%;
+}
+input.button.launcher,
+a.button.launcher {
+  background-position: -4800px 50%;
+  padding-left: 25px;
+}
+input.button.launcher:active,
+a.button.launcher:active {
+  background-position: -1200px 50%;
+}
+input.button.edit,
+a.button.edit {
+  background-position: -2400px 50%;
+  padding-left: 25px;
+}
+input.button.edit:active,
+a.button.edit:active {
+  background-position: -2800px 50%;
+}
+input.button.remove,
+a.button.remove {
+  background-position: -3200px 50%;
+  padding-left: 25px;
+}
+input.button.remove:active,
+a.button.remove:active {
+  background-position: -3600px 50%;
+}
+.media-widget a.button.remove {
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+.media-widget .preview {
+  min-height: 35px;
+}
+select:not([multiple]).form-select {
+  height: 28px;
+}
+input.form-autocomplete,
+input.form-text,
+input.form-file,
+textarea.form-textarea,
+select.form-select {
+  padding: 3px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd;
+  background: #fff;
+  color: #666;
+  max-width: 100%;
+}
+input.form-autocomplete:hover,
+input.form-text:hover,
+input.form-file:hover,
+textarea.form-textarea:hover,
+select.form-select:hover,
+input.form-autocomplete:focus,
+input.form-text:focus,
+input.form-file:focus,
+input.form-checkbox:focus,
+input.form-radio:focus,
+textarea.form-textarea:focus,
+select.form-select:focus {
+  color: #333;
+  border-color: #ace;
+  -webkit-box-shadow: #ace 0 0 5px;
+     -moz-box-shadow: #ace 0 0 5px;
+          box-shadow: #ace 0 0 5px;
+}
+input.fluid {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  width: 100%;
+}
+input.form-file {
+  padding: 1px;
+  margin-right: 3px;
+}
+html.js input.form-autocomplete {
+  background-position: 100% 7px;
+}
+html.js input.throbbing {
+  background-position: 100% -2px;
+}
+#search-block-form .form-wrapper.form-actions {
+  background: none;
+  border: none;
+  padding: 0;
+  margin-top: 0;
+}
+/* Fieldsets */
+.fieldset,
+.fieldset-title,
+.fieldset-title a,
+.fieldset-content {
+  display: block;
+}
+.fieldset {
+  margin: 0 0 10px;
+  display: block;
+  position: relative;
+  min-height: 28px;
+  border: 1px solid #CCCCCC;
+}
+fieldset legend {
+  display: block;
+  float: left;
+  width: 100%;
+}
+.fieldset-content .fieldset {
+  margin: 0;
+}
+.fieldset-content .fieldset + .fieldset,
+.fieldset-content .fieldset + .form-wrapper {
+  margin-top: 10px;
+}
+body.page-admin div.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane fieldset {
+  padding: 0;
+}
+.fieldset-legend {
+  display: block;
+}
+.container-inline .fieldset-legend .fieldset-content,
+.fieldset.titled > .fieldset-content {
+  display: block;
+  padding-top: 40px;
+}
+.item-list h3,
+.block .block-title,
+.fieldset-title,
+.collapsible .fieldset-legend a {
+  display: block;
+  font-size: 11px;
+  margin: 0;
+  padding: 4px 9px 5px;
+  color: #333;
+  background: #f6f6f6;
+}
+.fieldset-legend,
+.collapsible .fieldset-legend a {
+  padding-bottom: 4px;
+}
+/* Explicit height for IE */
+.collapsible .fieldset-legend a {
+  height: 20px;
+  padding-left: 28px;
+}
+.collapsible .fieldset-legend span.icon {
+  position: absolute;
+  left: 6px;
+  top: 6px;
+  background: url(../images/bleeds.png) -80px -120px no-repeat;
+  width: 15px;
+  height: 15px;
+  display: block;
+  cursor: pointer;
+}
+html.js .collapsed .fieldset-legend span.icon {
+  background-position: -60px -120px;
+}
+.collapsed .fieldset-legend a {
+  background: #eee;
+  color: #484848;
+}
+.collapsed .fieldset-legend a:hover {
+  color: #666;
+}
+.collapsible .fieldset-legend {
+  padding: 0;
+  background: transparent;
+}
+.collapsed .fieldset-legend a {
+  padding-bottom: 4px;
+}
+.block .block-content,
+.container-inline .fieldset-content,
+.fieldset-content {
+  padding: 10px 9px 9px;
+  background: #fff;
+}
+html.js .collapsed .fieldset-content {
+  display: none;
+}
+.fieldset .fieldset .fieldset-content {
+  background: #fff;
+}
+/* Filter form */
+.filter-wrapper {
+  font-size: 11px;
+  margin-top: -10px;
+  border-top: none;
+}
+.text-format-wrapper .filter-wrapper {
+  border-top: 1px solid #CCC;
+  margin-top: 0;
+}
+.text-format-wrapper .filter-wrapper .form-type-select .filter-list {
+  max-height: 22px;
+}
+.text-format-wrapper .filter-wrapper .form-type-select,
+.text-format-wrapper .filter-wrapper .filter-guidelines {
+  margin: 0;
+  overflow: auto;
+}
+.filter-wrapper .fieldset-content,
+.fieldset .fieldset.filter-wrapper .fieldset-content  {
+  background: #f8f8f8;
+  border-top: 0;
+  padding: 5px 9px 4px;
+}
+.filter-wrapper .form-type-select {
+  padding: 0;
+}
+.filter-wrapper .form-type-select * {
+  float: left;
+  margin-right: 5px;
+}
+.filter-wrapper select {
+  padding: 0;
+  font-size: 11px;
+}
+.filter-wrapper .filter-help {
+  float: right;
+  font-size: 11px;
+  margin: 0;
+  padding: 0;
+}
+.form-type-date-popup label {
+  padding: 10px 10px 0 10px;
+}
+.form-type-date-popup .date-padding label {
+  padding: 0;
+}
+.form-type-date-popup .date-padding {
+  padding-top: 0;
+}
+/* Form containers. */
+.container-inline div {
+  display: inline;
+  border: 0;
+  padding: 0;
+  background: transparent;
+}
+.container-inline {
+  margin: 0 0 10px;
+}
+/* Forms end */
+
+/*******************************************************************************
+ * Form layout: default
+ ******************************************************************************/
+.form-layout-default {
+  background: url(../images/vrule.png) 65% 0% repeat-y;
+}
+.column-main {
+  float: left;
+  width: 65%;
+}
+.column-main .column-wrapper {
+  padding-right: 10px;
+}
+.column-side {
+  float: right;
+  width: 34.99%;
+}
+.column-side .column-wrapper {
+  padding-left: 10px;
+}
+.column-footer {
+  clear: both;
+}
+.form-wrapper.form-actions {
+  background: #eee;
+  border: 1px solid #ddd;
+  padding: 9px;
+  margin-top: 10px;
+  margin-bottom: 0;
+}
+form .form-actions.container-inline {
+  background: transparent;
+  border: 0;
+  padding: 0;
+}
+.form-wrapper.form-actions input.form-submit,
+.form-wrapper.form-actions a.button {
+  margin-right: 5px;
+}
+.form-layout-default .column-main .column-wrapper > .form-actions {
+  display: none;
+}
+.form-layout-default .column-side .form-actions {
+  margin: 0 0 10px;
+}
+.form-layout-default .column-side .form-actions input.form-submit,
+.form-layout-deafult .column-side .form-actions a.button {
+  margin: 1px 5px 1px 0;
+}
+/* "Boxes" aka generic wrappers. */
+.box-title {
+  font-weight: normal;
+  font-size: 10px;
+  background: #eee;
+  border: 1px solid #ddd;
+  padding: 4px 9px;
+  margin: 0 0 10px;
+}
+/* Form layout: default end */
+
+/*******************************************************************************
+ * System
+ ******************************************************************************/
+.admin .right {
+  padding-left: 5px;
+  float: right;
+}
+.admin .left {
+  padding-right: 5px;
+  float: left;
+}
+.admin .right,
+.admin .left {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  width: 50%;
+  margin: 0;
+}
+/* admin/appearance */
+.theme-selector {
+  position: relative;
+  padding: 9px 9px 9px 314px;
+  border: 1px solid #ddd;
+  margin: 10px 0;
+  min-height: 224px;
+  text-shadow: #fff 0 1px 0;
+}
+.theme-selector img {
+  clip: rect(0px, 294px, 219px, 0);
+  height: auto;
+  left: 10px;
+  position: absolute;
+  top: 10px;
+  width: 294px;
+}
+.theme-selector .operations a {
+  margin-right: 20px;
+}
+.system-themes-list-disabled .theme-selector {
+  background: #eee;
+  color: #676767;
+  padding: 9px 9px 9px 162px;
+  min-height: 110px;
+}
+.system-themes-list-disabled .theme-selector img {
+  width: 142px;
+}
+/* admin/content/node & admin/user/user */
+.exposed-filters .form-item label {
+  float: left;
+  width: 120px;
+}
+.exposed-filters .additional-filters {
+  padding: 5px;
+  font-size: 11px;
+  color: #666;
+}
+/* Update options. */
+.admin-options {
+  background: #f8f8f8;
+  line-height: 30px;
+  height: 30px;
+  padding: 9px;
+  border: 1px solid #ddd;
+  margin: 0 0 10px;
+}
+.admin-options label,
+.admin-options .form-item {
+  margin-right: 10px;
+  float: left;
+}
+.admin-options .form-item {
+  padding: 0;
+  border: 0;
+}
+/* Dependency colors. */
+.admin-dependencies,
+.admin-required {
+  color: #666;
+}
+.admin-disabled {
+  color: #900;
+}
+.admin-enabled {
+  color: #099;
+}
+.admin-missing {
+  color: #c30;
+}
+/* Progressbar styles. */
+.progress .bar {
+  -webkit-box-shadow: inset #ddd 0 1px 3px;
+     -moz-box-shadow: inset #ddd 0 1px 3px;
+          background: #eee;
+  border: 1px solid #ccc;
+}
+.progress .filled {
+  background: #666;
+}
+/* Help pages. */
+.help-items {
+  float: left; width: 25%;
+}
+.help-items ul {
+  margin: 10px 5px;
+}
+/* System end */
+
+/*******************************************************************************
+ * Admin toolbar
+ ******************************************************************************/
+body.tao #admin-toolbar a.menu-hover span.menu-description {
+  padding-left: 50px;
+}
+body.tao #admin-toolbar a.menu-hover span.menu-description span.icon {
+  position: absolute;
+  left: 10px;
+  top: 0;
+}
+/* Admin toolbar end */
+
+
+/*******************************************************************************
+ * Form description exceptions
+ *
+ * Some form elements are either too weirdly positioned or really benefit
+ * from persistent descriptions. Reset for all of these.
+ ******************************************************************************/
+.page-content .form-item-files-feeds,
+.page-content .form-item-files-feeds .description,
+.ctools-export-ui-row .form-item,
+.ctools-export-ui-row .form-item .description,
+.multiselect .form-item,
+.multiselect .form-item .description,
+.page-content table .form-item,
+.page-content table .form-item .description,
+.page-content .form-item .widget-edit .description,
+#upload-attachments .description,
+#views-ajax-pad .form-item,
+#views-ajax-pad .form-item .description {
+  width: auto;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  background: transparent;
+  position: static;
+  display: block;
+}
+.page-content .form-item-files-feeds:hover,
+.ctools-export-ui-row .form-item:hover,
+.multiselect .form-item:hover,
+.page-content table .form-item:hover,
+#views-ajax-pad .form-item:hover {
+  position: static;
+}
+.page-content .form-item-files-feeds .description,
+.page-content table .form-item .description,
+#upload-attachments .description,
+#views-ajax-pad .form-item .description {
+  padding: 0;
+  color: #666;
+  display: block;
+  max-width: none;
+}
+/* Form description exceptions end */
+
+/*******************************************************************************
+ * Vertical tabs
+ ******************************************************************************/
+.vertical-tabs {
+  background: #fff url(../images/vtabs.png) 0 0 repeat-y;
+  border: 1px solid #ddd;
+  margin: 0 0 10px;
+  position: relative;
+}
+.vertical-tabs .fieldset-content,
+.vertical-tabs fieldset.titled .fieldset-content {
+  border: 0;
+  padding: 10px;
+}
+.vertical-tabs .fieldset-content .fieldset-content {
+  margin-top: 20px;
+}
+.vertical-tabs-list li a {
+  display: block;
+  text-shadow: #fff 0 1px 0;
+  padding: 5px 10px 4px 10px;
+  border-bottom: 1px solid #ddd;
+  color: #666;
+}
+.vertical-tabs-list .selected a {
+  background: #fff;
+  color: #333;
+}
+.vertical-tabs-list .summary {
+  font-size: 11px;
+}
+.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane .fieldset legend {
+  display: block;
+}
+.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane fieldset.collapsible {
+  border: 1px solid #CCCCCC;
+  margin: 1em 0;
+  position: relative;
+  padding-top: 0;
+}
+/* Vertical tabs end */
+
+/* Action links. */
+.action-links a {
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  margin: 0 5px 0 0;
+  padding: 0 5px 0 25px;
+  background: #999 url(../images/buttons.png) -800px 50% no-repeat;
+  color: #fff;
+  text-shadow: #666 0 1px 0;
+}
+.action-links a:active {
+  color: #222;
+  background-color: #666;
+  background-position: -1200px 50%;
+  text-shadow: #999 0 1px 0;
+}
+/* Color module fix. */
+#palette .form-item {
+  width: 20em !important;
+  height: 2em;
+  line-height: 2em;
+  margin: 0.5em 0;
+  padding: 0.2em;
+}
+#palette .lock {
+  z-index: 2;
+}
+.page-content .color-form .form-item:hover {
+  height: 2em;
+}
+/* Panels stylizer color fix. */
+div.ctools-modal-content #palette .form-item label {
+  clear: none;
+  float: left;
+  width: 14em;
+}
+div.ctools-modal-content .color-form .form-item input {
+  margin-top: 0;
+}
+/**
+ * ORPHANED MARKUP ====================================================
+ * The following selectors target markup generated by Drupal that have
+ * exactly 1 or extremely few instances. It will make a great future
+ * hitlist of markup to consolidate and generalize.
+ */
+.compact-link {
+  font-size: 11px;
+  height: 20px;
+  margin: 0 0 10px;
+}
+.compact-link a {
+  float: left;
+  line-height: 18px;
+  padding: 0 9px;
+  border: 1px solid #ddd;
+  color: #666;
+  background: #fff;
+}
+
+/*******************************************************************************
+ * Display suit
+ ******************************************************************************/
+.field-formatter-settings-edit-form.ds-ft-processed {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  padding: 0.5em 1em 0;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group {
+  overflow: auto;
+  margin-bottom: 1em !important;
+  border-bottom: 1px solid #CCC;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi {
+  border-bottom: 0;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item {
+  margin: 0.25em 1em 0.5em 0 !important;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item .description {
+  max-width: 120px !important;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group > .form-item.form-type-checkbox {
+  clear: both;
+  margin-right: 0 !important;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.ow .form-type-textfield,
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fis .form-type-textfield,
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi .form-type-textfield {
+  clear: left;
+}
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.ow .form-type-textfield ~ .form-type-textfield,
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fis .form-type-textfield ~ .form-type-textfield,
+.field-formatter-settings-edit-form.ds-ft-processed .ft-group.fi .form-type-textfield ~ .form-type-textfield {
+  clear: none;
+}
+/* Display suit end */
+
+/*******************************************************************************
+ * Search API
+ ******************************************************************************/
+#facetapi-facet-display-form .fieldset-content > .form-item {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  float: left;
+  width: 50% !important;
+}
+#facetapi-facet-display-form .fieldset-content .facetapi-sort-table {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-top: 0 !important;
+  position: static !important;
+  width: 50% !important;
+  z-index: 1 !important;
+}
+/* Search API end */
+
+/*******************************************************************************
+ * Sidebar scroll
+ ******************************************************************************/
+#content .column-side .column-wrapper {
+  padding-bottom: 5px;
+}
+#content .column-side .column-wrapper.fixed {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  display: inline-block;
+  position: fixed;
+  top: 5px;
+  z-index: 11;
+  /* Necessary to avoid overlap with the left column upon scrolling. */
+  margin-left: 1px;
+}
+.admin-menu #content .column-side .column-wrapper.fixed {
+  top: 40px;
+}
+/* Sidebar scroll end */
+
+/*******************************************************************************
+ * Watchdog/dblog
+ ******************************************************************************/
+#admin-dblog td {
+  border-color: #ccc;
+}
+#admin-dblog .dblog-notice td,
+#admin-dblog .dblog-notice .active {
+  background-color: #ECF8FC;
+}
+#admin-dblog .dblog-info td,
+#admin-dblog .dblog-info .active {
+  background-color: #DFF2BF;
+}
+#admin-dblog .dblog-warning td,
+#admin-dblog .dblog-warning .active {
+  background-color: #FEEFB3;
+}
+#admin-dblog .dblog-error td,
+#admin-dblog .dblog-error .active {
+  background-color: #FFBABA;
+}
+/* Watchdog/dblog end */
+
+/*******************************************************************************
+ * Breakpoints
+ ******************************************************************************/
+#breakpoints-admin-breakpoints #edit-buttons input,
+#breakpoints-admin-breakpoints #edit-buttons a {
+  margin-bottom: 1em;
+  margin-right: 1em;
+}
+.breakpoints-group-operations-link {
+  display: inline-block;
+  cursor: pointer;
+  padding: 3px 10px;
+  color: #333;
+  font-size: 13px;
+  text-align: center;
+  font-weight: normal;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ddd #ddd #ccc;
+  background: #fff url(../images/buttons.png) -1px 50% no-repeat;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  -webkit-box-shadow: #ddd 0 1px 1px;
+     -moz-box-shadow: #ddd 0 1px 1px;
+          box-shadow: #ddd 0 1px 1px;
+}
+.breakpoints-group-operations-link:hover {
+  border-color: #ace;
+  -webkit-box-shadow: #ace 0 0 5px;
+     -moz-box-shadow: #ace 0 0 5px;
+          box-shadow: #ace 0 0 5px;
+}
+.breakpoints-group-operations-link:active {
+  border-color: #666 #666 #555;
+  background: #666 url(../images/buttons.png) -401px 50% no-repeat;
+  color: #222;
+  text-shadow: #999 0 1px 0;
+}
+/* Breakpoints end */
+
+/*******************************************************************************
+ * Media
+ ******************************************************************************/
+.page-media-browser {
+  overflow: hidden;
+}
+.page-media-browser #block-system-main {
+  border: none;
+}
+.media-widget .preview {
+  background-color: #CCC;
+  min-width: 50px;
+  min-height: 50px;
+}
+.media-widget .preview .media-item {
+  margin: 0;
+}
+.media-widget .preview.launcher > .form-item {
+  padding: 0; border: 0;
+}
+.media-widget.form-wrapper {
+  margin-bottom: 0;
+}
+.media-widget > .form-item:last-child {display: none;}
+.field-widget-media-generic > div > .form-item {
+  border: 0;
+  padding: 0;
+}
+.field-widget-media-generic .field-multiple-table thead .field-label {
+  padding-left: 5px;
+}
+.media-item .label-wrapper label {
+  display: block;
+}
+#media-browser-page {
+  overflow: hidden;
+}
+#media-browser-page .form-actions {
+  margin-bottom: 0;
+}
+#media-browser-tabset {
+  border: none;
+}
+#media-browser-tabset #branding {
+  padding: 8px 10px 2px 10px; height: 20px;
+}
+#media-browser-tabset #branding h1 {
+  margin-top: -3px;
+}
+#media-tabs-wrapper .tabs.primary {
+  margin-right: 10px;
+}
+.media-browser-tab.ui-tabs-panel {
+  border: none; padding-bottom: 0;
+}
+.view-media-default #edit-filename-wrapper {
+  max-width: 200px;
+}
+/* Media end */
+
+
+/*******************************************************************************
+ * Other contrib modules
+ ******************************************************************************/
+/* CTools */
+td.ctools-export-ui-operations {
+  position: relative;
+}
+/* Adminimal Administration Menu. */
+body.adminimal-menu {
+  margin-top: 29px!important;
+}
+body.adminimal-menu .admin-menu-search > .form-item {
+  border: none;
+  position: static;
+}
+body.adminimal-menu #admin-menu-search input[type="text"] {
+  height: 28px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+body.adminimal-menu #admin-menu-search input[type="text"]:hover,
+body.adminimal-menu #admin-menu-search input[type="text"]:focus {
+  outline: none;
+  -webkit-box-shadow: 0 0 0;
+     -moz-box-shadow: 0 0 0;
+          box-shadow: 0 0 0;
+}
+body.adminimal-menu #admin-menu-search input[type="text"]:focus {
+  background: #666;
+}
+/* Other contrib modules end */
diff --git a/drupal7/sites/all/themes/rubik/icons.css b/drupal7/sites/all/themes/rubik/css/icons.css
similarity index 73%
rename from drupal7/sites/all/themes/rubik/icons.css
rename to drupal7/sites/all/themes/rubik/css/icons.css
index 20918028..0225c021 100644
--- a/drupal7/sites/all/themes/rubik/icons.css
+++ b/drupal7/sites/all/themes/rubik/css/icons.css
@@ -1,6 +1,9 @@
+
 /**
- * Icons
+ * @file
+ * Icon styles.
  */
+
 .help-content span.icon,
 .page-title span.icon,
 .admin-toolbar-menu span.icon,
@@ -8,148 +11,147 @@
 .admin-panel span.icon,
 .admin-list span.icon,
 .links span.icon {
-  width:30px;
-  height:30px;
-  display:block;
-
-  background-color:transparent;
-  background-image:url(images/icons.png);
-  background-repeat:no-repeat;
-  }
+  width: 30px;
+  height: 30px;
+  display: block;
+  background-color: transparent;
+  background-image: url(../images/icons.png);
+  background-repeat: no-repeat;
+}
 
 /**
  * Create content
  */
-.path-node-add span.icon                        { background-position:0px -240px; }
-.path-node-add-page span.icon                   { background-position:-30px -240px; }
-.path-node-add-forum span.icon                  { background-position:-60px -240px; }
-.path-node-add-blog span.icon                   { background-position:-90px -240px; }
-.path-node-add-story span.icon                  { background-position:-120px -240px; }
-.path-node-add-poll span.icon                   { background-position:-150px -240px; }
+.path-node-add span.icon                        { background-position: 0 -240px; }
+.path-node-add-page span.icon                   { background-position: -30px -240px; }
+.path-node-add-forum span.icon                  { background-position: -60px -240px; }
+.path-node-add-blog span.icon                   { background-position: -90px -240px; }
+.path-node-add-story span.icon                  { background-position: -120px -240px; }
+.path-node-add-poll span.icon                   { background-position: -150px -240px; }
 
 /**
  * Admin
  */
-.path-admin span.icon                           { background-position:0px 0px; }
-.path-admin- span.icon                          { background-position:-60px -150px; }
+.path-admin span.icon                           { background-position: 0 0; }
+.path-admin- span.icon                          { background-position: -60px -150px; }
 
 /**
  * Appearance
  */
-.path-admin-appearance- span.icon               { background-position:-120px -30px; }
+.path-admin-appearance- span.icon               { background-position: -120px -30px; }
 
 /**
  * Modules
  */
-.path-admin-modules- span.icon                  { background-position:-210px -30px; }
+.path-admin-modules- span.icon                  { background-position: -210px -30px; }
 
 /**
  * Help
  */
-.path-admin-help span.icon                      { background-position:-150px -120px; }
+.path-admin-help span.icon                      { background-position: -150px -120px; }
 
 /**
  * Content
  */
-.path-admin-content span.icon                   { background-position:-30px 0px; }
-.path-admin-content- span.icon                  { background-position:0px -30px; }
-.path-admin-content-forum span.icon             { background-position:-90px -120px; }
-.path-admin-content-book span.icon              { background-position:-90px -60px; }
-.path-admin-content-comment span.icon           { background-position:-90px -30px; }
+.path-admin-content span.icon                   { background-position: -30px 0; }
+.path-admin-content- span.icon                  { background-position: 0 -30px; }
+.path-admin-content-forum span.icon             { background-position: -90px -120px; }
+.path-admin-content-book span.icon              { background-position: -90px -60px; }
+.path-admin-content-comment span.icon           { background-position: -90px -30px; }
 
 /**
  * Building
  */
-.path-admin-structure span.icon                 { background-position:-60px 0px; }
-.path-admin-structure- span.icon                { background-position:-30px -150px; }
-.path-admin-structure-menu span.icon            { background-position:-150px -30px; }
-.path-admin-structure-contact span.icon         { background-position:-60px -90px; }
-.path-admin-structure-block span.icon           { background-position:-180px -30px; }
-.path-admin-structure-types span.icon           { background-position:-30px -30px; }
-.path-admin-structure-taxonomy span.icon        { background-position:-60px -30px; }
-.path-admin-structure-trigger span.icon         { background-position:-180px -60px; }
+.path-admin-structure span.icon                 { background-position: -60px 0; }
+.path-admin-structure- span.icon                { background-position: -30px -150px; }
+.path-admin-structure-menu span.icon            { background-position: -150px -30px; }
+.path-admin-structure-contact span.icon         { background-position: -60px -90px; }
+.path-admin-structure-block span.icon           { background-position: -180px -30px; }
+.path-admin-structure-types span.icon           { background-position: -30px -30px; }
+.path-admin-structure-taxonomy span.icon        { background-position: -60px -30px; }
+.path-admin-structure-trigger span.icon         { background-position: -180px -60px; }
 
 /**
  * User
  */
-.path-admin-people span.icon                    { background-position:-90px 0px; }
-.path-admin-people- span.icon                   { background-position:-210px -90px; }
-.path-admin-people-permissions span.icon        { background-position:-30px -90px; }
-.path-admin-people-permissions-roles span.icon  { background-position:-30px -120px; }
+.path-admin-people span.icon                    { background-position: -90px 0; }
+.path-admin-people- span.icon                   { background-position: -210px -90px; }
+.path-admin-people-permissions span.icon        { background-position: -30px -90px; }
+.path-admin-people-permissions-roles span.icon  { background-position: -30px -120px; }
 
 /**
  * Reports
  */
-.path-admin-reports span.icon                   { background-position:-120px 0px; }
-.path-admin-reports- span.icon                  { background-position:0px -150px; }
-.path-admin-reports-dblog span.icon             { background-position:-210px -420px; }
-.path-admin-reports-hits span.icon              { background-position:-120px -420px; }
-.path-admin-reports-search span.icon            { background-position:0px -420px; }
-.path-admin-reports-access-denied span.icon     { background-position:-180px -420px; }
-.path-admin-reports-page-not-found span.icon    { background-position:-90px -420px; }
-.path-admin-reports-referrers span.icon         { background-position:-150px -420px; }
-.path-admin-reports-pages span.icon             { background-position:-30px -240px }
-.path-admin-reports-visitors span.icon          { background-position:-60px -420px; }
-.path-admin-reports-settings span.icon          { background-position:-90px -330px; }
-.path-admin-reports-updates span.icon           { background-position:-150px -60px; }
-.path-admin-reports-status span.icon            { background-position:-60px -60px; }
+.path-admin-reports span.icon                   { background-position: -120px 0; }
+.path-admin-reports- span.icon                  { background-position: 0 -150px; }
+.path-admin-reports-dblog span.icon             { background-position: -210px -420px; }
+.path-admin-reports-hits span.icon              { background-position: -120px -420px; }
+.path-admin-reports-search span.icon            { background-position: 0 -420px; }
+.path-admin-reports-access-denied span.icon     { background-position: -180px -420px; }
+.path-admin-reports-page-not-found span.icon    { background-position: -90px -420px; }
+.path-admin-reports-referrers span.icon         { background-position: -150px -420px; }
+.path-admin-reports-pages span.icon             { background-position: -30px -240px }
+.path-admin-reports-visitors span.icon          { background-position: -60px -420px; }
+.path-admin-reports-settings span.icon          { background-position: -90px -330px; }
+.path-admin-reports-updates span.icon           { background-position: -150px -60px; }
+.path-admin-reports-status span.icon            { background-position: -60px -60px; }
 
 /**
  * Configuration
  */
-.path-admin-config span.icon                    { background-position:-150px 0px; }
-.path-admin-config- span.icon                   { background-position:-210px -120px; }
-.path-admin-config-people- span.icon            { background-position:0px -180px; }
-.path-admin-config-people-accounts span.icon    { background-position:-60px -120px; }
-.path-admin-config-people-ip-blocking span.icon { background-position:0px -120px; }
-
-.path-admin-config-content- span.icon           { background-position:-60px -180px; }
-.path-admin-config-content-formats span.icon    { background-position:-210px -60px; }
-
-.path-admin-config-regional- span.icon          { background-position:-210px -180px; }
-.path-admin-config-regional-settings span.icon  { background-position:-60px -390px; }
-.path-admin-config-regional-date-time span.icon { background-position:-150px -360px; }
-.path-admin-config-regional-language span.icon  { background-position:-60px -330px; }
-.path-admin-config-regional-translate span.icon { background-position:0px -90px; }
-
-.path-admin-config-system- span.icon            { background-position:-30px -180px; }
-.path-admin-config-system-site-information span.icon { background-position:-120px -330px; }
-.path-admin-config-system-actions span.icon     { background-position:-180px -60px; }
-.path-admin-config-system-statistics span.icon  { background-position:-90px -330px; }
-.path-admin-config-system-cron span.icon        { background-position:-30px -390px; }
-
-.path-admin-config-search- span.icon            { background-position:-180px -180px; }
-.path-admin-config-search-path span.icon        { background-position:-120px -90px; }
-.path-admin-config-search-clean-urls span.icon  { background-position:-60px -360px; }
-.path-admin-config-search-settings span.icon    { background-position:-30px -60px; }
-
-.path-admin-config-services- span.icon          { background-position:0px -210px; }
-.path-admin-config-services-rss-publishing span.icon { background-position:-180px -330px; }
-.path-admin-config-services-aggregator span.icon { background-position:-120px -120px; }
-
-.path-admin-config-user-interface- span.icon    { background-position:-90px -180px; }
-.path-admin-config-user-interface-shortcut span.icon { background-position:-180px -120px; }
-
-.path-admin-config-media- span.icon             { background-position:-150px -180px; }
-.path-admin-config-media-file-system span.icon  { background-position:-180px -360px; }
-.path-admin-config-media-image-styles span.icon { background-position:0px -390px; }
-.path-admin-config-media-image-toolkit span.icon { background-position:-210px -330px; }
-
-.path-admin-config-development- span.icon       { background-position:-120px -180px; }
-.path-admin-config-development-performance span.icon { background-position:0px -60px; }
-.path-admin-config-development-maintenance span.icon { background-position:-180px -90px; }
-.path-admin-config-development-logging span.icon{ background-position:-120px -60px; }
-
-.path-admin-config-workflow- span.icon          { background-position:-30px -210px; }
+.path-admin-config span.icon                    { background-position: -150px 0; }
+.path-admin-config- span.icon                   { background-position: -210px -120px; }
+.path-admin-config-people- span.icon            { background-position: 0 -180px; }
+.path-admin-config-people-accounts span.icon    { background-position: -60px -120px; }
+.path-admin-config-people-ip-blocking span.icon { background-position: 0 -120px; }
+
+.path-admin-config-content- span.icon           { background-position: -60px -180px; }
+.path-admin-config-content-formats span.icon    { background-position: -210px -60px; }
+
+.path-admin-config-regional- span.icon          { background-position: -210px -180px; }
+.path-admin-config-regional-settings span.icon  { background-position: -60px -390px; }
+.path-admin-config-regional-date-time span.icon { background-position: -150px -360px; }
+.path-admin-config-regional-language span.icon  { background-position: -60px -330px; }
+.path-admin-config-regional-translate span.icon { background-position: 0 -90px; }
+
+.path-admin-config-system- span.icon            { background-position: -30px -180px; }
+.path-admin-config-system-site-information span.icon { background-position: -120px -330px; }
+.path-admin-config-system-actions span.icon     { background-position: -180px -60px; }
+.path-admin-config-system-statistics span.icon  { background-position: -90px -330px; }
+.path-admin-config-system-cron span.icon        { background-position: -30px -390px; }
+
+.path-admin-config-search- span.icon            { background-position: -180px -180px; }
+.path-admin-config-search-path span.icon        { background-position: -120px -90px; }
+.path-admin-config-search-clean-urls span.icon  { background-position: -60px -360px; }
+.path-admin-config-search-settings span.icon    { background-position: -30px -60px; }
+
+.path-admin-config-services- span.icon          { background-position: 0 -210px; }
+.path-admin-config-services-rss-publishing span.icon { background-position: -180px -330px; }
+.path-admin-config-services-aggregator span.icon { background-position: -120px -120px; }
+
+.path-admin-config-user-interface- span.icon    { background-position: -90px -180px; }
+.path-admin-config-user-interface-shortcut span.icon { background-position: -180px -120px; }
+
+.path-admin-config-media- span.icon             { background-position: -150px -180px; }
+.path-admin-config-media-file-system span.icon  { background-position: -180px -360px; }
+.path-admin-config-media-image-styles span.icon { background-position: 0 -390px; }
+.path-admin-config-media-image-toolkit span.icon { background-position: -210px -330px; }
+
+.path-admin-config-development- span.icon       { background-position: -120px -180px; }
+.path-admin-config-development-performance span.icon { background-position: 0 -60px; }
+.path-admin-config-development-maintenance span.icon { background-position: -180px -90px; }
+.path-admin-config-development-logging span.icon{ background-position: -120px -60px; }
+
+.path-admin-config-workflow- span.icon          { background-position: -30px -210px; }
 
 /* Contrib, @TODO */
-.path-admin-config-development-devel span.icon  { background-position:-30px -330px; }
+.path-admin-config-development-devel span.icon  { background-position: -30px -330px; }
 
 /* Deprecated, @TODO */
 .path-admin-settings-wysiwyg span.icon,
 .path-admin-settings-fckeditor span.icon,
-.path-admin-settings-tinymce span.icon          { background-position:-150px -330px; }
-.path-admin-settings-uploads span.icon          { background-position:-210px -360px; }
-.path-admin-settings-error-reporting span.icon  { background-position:-90px -360px; }
-.path-admin-settings-blogapi span.icon          { background-position:-30px -360px; }
-.path-admin-settings-throttle span.icon         { background-position:-150px -90px; }
+.path-admin-settings-tinymce span.icon          { background-position: -150px -330px; }
+.path-admin-settings-uploads span.icon          { background-position: -210px -360px; }
+.path-admin-settings-error-reporting span.icon  { background-position: -90px -360px; }
+.path-admin-settings-blogapi span.icon          { background-position: -30px -360px; }
+.path-admin-settings-throttle span.icon         { background-position: -150px -90px; }
diff --git a/drupal7/sites/all/themes/rubik/ie.css b/drupal7/sites/all/themes/rubik/css/ie.css
similarity index 58%
rename from drupal7/sites/all/themes/rubik/ie.css
rename to drupal7/sites/all/themes/rubik/css/ie.css
index 825cb3a0..b9f6b7ba 100644
--- a/drupal7/sites/all/themes/rubik/ie.css
+++ b/drupal7/sites/all/themes/rubik/css/ie.css
@@ -1,10 +1,12 @@
+
 /**
- * Add outline to filefield attach and space the button
+ * Styles loaded conditionally to support IE7.
  */
+
+/* Add outline to filefield attach and space the button. */
 .form-type-managed-file input.form-file {
   border: thin solid #DDDDDD !important;
 }
-
 .form-type-managed-file input.submit {
   margin-left: 5px;
 }
diff --git a/drupal7/sites/all/themes/rubik/jquery.ui.theme.css b/drupal7/sites/all/themes/rubik/css/jquery.ui.theme.css
similarity index 81%
rename from drupal7/sites/all/themes/rubik/jquery.ui.theme.css
rename to drupal7/sites/all/themes/rubik/css/jquery.ui.theme.css
index 621cb327..54f63a88 100644
--- a/drupal7/sites/all/themes/rubik/jquery.ui.theme.css
+++ b/drupal7/sites/all/themes/rubik/css/jquery.ui.theme.css
@@ -1,22 +1,26 @@
+
 /**
  * @file
- * Seven styles for jQuery UI.
+ * Rubik styles for jQuery UI.
+ *
+ * Cloned from the core Seven theme.
  * Overrides /misc/ui/ui.theme.css.
  */
 
-/**
+/*******************************************************************************
  * Component containers
- */
+ ******************************************************************************/
 .ui-widget {
   background: #fff;
 }
 .ui-widget-content {
   border: solid 1px #ccc;
 }
+/* Component containers end */
 
-/**
+/*******************************************************************************
  * Interaction states
- */
+ ******************************************************************************/
 .ui-state-default,
 .ui-state-hover,
 .ui-state-focus,
@@ -26,10 +30,11 @@
 .ui-state-active {
   font-weight: bold;
 }
+/* Interaction states end */
 
-/**
+/*******************************************************************************
  * Interaction cues
- */
+ ******************************************************************************/
 .ui-state-highlight,
 .ui-widget-content .ui-state-highlight {
   color: #840;
@@ -52,11 +57,12 @@
   opacity: .7;
   filter: Alpha(Opacity=70);
 }
+/* Interaction cues end */
 
-/**
+/*******************************************************************************
  * Icons
- */
-/* states and images */
+ ******************************************************************************/
+/* States and images. */
 .ui-icon {
   display: block;
   text-indent: -99999px;
@@ -64,32 +70,31 @@
   height: 16px;
   overflow: hidden;
   background-repeat: no-repeat;
-  background-image: url(images/ui-icons-222222-256x240.png);
+  background-image: url(../images/ui-icons-222222-256x240.png);
 }
 .ui-widget-content .ui-icon,
 .ui-widget-header .ui-icon {
-  background-image: url(images/ui-icons-222222-256x240.png);
+  background-image: url(../images/ui-icons-222222-256x240.png);
 }
 .ui-state-default .ui-icon {
-  background-image: url(images/ui-icons-888888-256x240.png);
+  background-image: url(../images/ui-icons-888888-256x240.png);
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon,
 .ui-state-active .ui-icon {
-  background-image: url(images/ui-icons-454545-256x240.png);
+  background-image: url(../images/ui-icons-454545-256x240.png);
 }
 .ui-state-highlight .ui-icon {
-  background-image: url(images/ui-icons-800000-256x240.png);
+  background-image: url(../images/ui-icons-800000-256x240.png);
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-  background-image: url(images/ui-icons-ffffff-256x240.png);
+  background-image: url(../images/ui-icons-ffffff-256x240.png);
 }
 .ui-widget p .ui-icon {
   margin: 2px 3px 0 0;
 }
-
-/* positioning */
+/* Positioning. */
 .ui-icon-carat-1-ne { background-position: -16px 0; }
 .ui-icon-carat-1-e { background-position: -32px 0; }
 .ui-icon-carat-1-se { background-position: -48px 0; }
@@ -263,10 +268,11 @@
 .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
 .ui-icon-grip-diagonal-se { background-position: -80px -224px; }
 .ui-icon-carat-1-n { background-position: 0 0; }
+/* Icons end */
 
-/**
+/*******************************************************************************
  * Accordion
- */
+ ******************************************************************************/
 .ui-accordion {
   border: none;
 }
@@ -291,10 +297,11 @@
   border: solid 1px #ccc;
   border-top: 0;
 }
+/* Accordion end */
 
-/**
+/*******************************************************************************
  * Tabs
- */
+ ******************************************************************************/
 .ui-tabs {
   padding: 0;
 }
@@ -303,12 +310,12 @@
   margin: 0;
   line-height: 20px;
   border-bottom: solid 1px #ccc;
-  -moz-border-radius-bottomleft: 0;
   -webkit-border-bottom-left-radius: 0;
-  border-bottom-left-radius: 0;
-  -moz-border-radius-bottomright: 0;
+      -moz-border-radius-bottomleft: 0;
+          border-bottom-left-radius: 0;
   -webkit-border-bottom-right-radius: 0;
-  border-bottom-right-radius: 0;
+      -moz-border-radius-bottomright: 0;
+          border-bottom-right-radius: 0;
 }
 .ui-tabs .ui-tabs-nav li {
   padding: 0 1em 0 10px;
@@ -318,37 +325,39 @@
 .ui-tabs .ui-tabs-nav li a {
   float: none;
   padding: 0 10px;
-  -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
-  border-radius: 10px;
+     -moz-border-radius: 10px;
+          border-radius: 10px;
 }
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
   color: #fff;
   background: #666;
   font-weight: normal;
 }
+/* Tabs end */
 
-/**
+/*******************************************************************************
  * Overlays
- */
+ ******************************************************************************/
 .ui-widget-overlay {
   background: #000;
   opacity: .70;
   filter: Alpha(Opacity=70);
 }
+/* Overlays end */
 
-/**
+/*******************************************************************************
  * Dialogs
- */
+ ******************************************************************************/
 .ui-dialog {
   background: white;
   padding: 0 0 10px 0; 
-  border-radius: 6px 6px 5px 5px;
-  box-shadow: #111 0px 0px 10px;
-  -moz-border-radius: 6px 6px 5px 5px;
-  -moz-box-shadow: #111 0px 0px 10px;
   -webkit-border-radius: 6px 6px 5px 5px;
-  -webkit-box-shadow: #111 0px 0px 10px;
+     -moz-border-radius: 6px 6px 5px 5px;
+          border-radius: 6px 6px 5px 5px;
+  -webkit-box-shadow: #111 0 0 10px;
+     -moz-box-shadow: #111 0 0 10px;
+          box-shadow: #111 0 0 10px;
   border: 0;
 }
 .ui-dialog .ui-dialog-titlebar {
@@ -363,23 +372,25 @@
   padding: 4px 17px;
   color: #5a5a5a;
   text-align: center;
-  font-family: "Lucida Grande", Verdana, sans-serif;
+  font-family: "Lucida Grande",
+  Verdana,
+  sans-serif;
   font-weight: normal;
   font-size: 1em;
   border: 1px solid #e4e4e4;
   border-bottom: 1px solid #b4b4b4;
   border-left-color: #D2D2D2;
   border-right-color: #D2D2D2;
-  background: url(images/buttons.png) 0 0 repeat-x;
-  -moz-border-radius: 20px;
+  background: url(../images/buttons.png) 0 0 repeat-x;
   -webkit-border-radius: 20px;
-  border-radius: 20px;
+     -moz-border-radius: 20px;
+          border-radius: 20px;
 }
 .ui-dialog .ui-dialog-buttonpane button:active {
   background: #666;
   color: #fff;
   border-color: #555;
-  text-shadow: #222 0px -1px 0px;
+  text-shadow: #222 0 -1px 0;
 }
 .overlay {
   padding-right: 26px;
@@ -387,10 +398,11 @@
 .overlay .ui-dialog-titlebar {
   background: transparent;
 }
+/* Dialogs end */
 
-/**
+/*******************************************************************************
  * Slider
- */
+ ******************************************************************************/
 .ui-slider {
   border: solid 1px #ccc;
 }
@@ -402,10 +414,10 @@
   border-bottom: 1px solid #b4b4b4;
   border-left-color: #D2D2D2;
   border-right-color: #D2D2D2;
-  background: url(images/buttons.png) 0 0 repeat-x;
-  -moz-border-radius: 4px;
+  background: url(../images/buttons.png) 0 0 repeat-x;
   -webkit-border-radius: 4px;
-  border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
 }
 .ui-slider a.ui-state-active,
 .ui-slider .ui-slider-handle:active {
@@ -413,26 +425,29 @@
   color: #fff;
   border: solid 1px #555;
 }
+/* Slider end */
 
-/**
+/*******************************************************************************
  * Progress Bar
- */
+ ******************************************************************************/
 .ui-progressbar {
   background: #e4e4e4;
   height: 1.4em;
 }
 .ui-progressbar .ui-progressbar-value {
-  background: #0072b9 url(../../misc/progress.gif);
+  background: #0072b9 url(../images/progress.gif);
   height: 1.5em;
 }
+/* Progress Bar end */
 
-/**
+/*******************************************************************************
  * Date Picker
- */
+ ******************************************************************************/
 .ui-datepicker {
   border: none;
 }
-.ui-datepicker td span, .ui-datepicker td a {
+.ui-datepicker td span,
+.ui-datepicker td a {
   text-align: center;
 }
 .ui-datepicker .ui-state-highlight {
@@ -448,4 +463,5 @@
   bottom: 100%;
   right: -50%;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
+/* Date Picker end */
diff --git a/drupal7/sites/all/themes/rubik/css/overlay-child.css b/drupal7/sites/all/themes/rubik/css/overlay-child.css
new file mode 100644
index 00000000..1bec0094
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/overlay-child.css
@@ -0,0 +1,94 @@
+
+/**
+ * @file
+ * Overlay child overrides.
+ */
+
+html.js {
+  background: transparent !important;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+html.js body {
+  background: transparent !important;
+  padding: 20px 40px;
+}
+#overlay {
+  display: block;
+  position: relative;
+}
+#overlay-titlebar {
+  position: relative;
+  z-index: 100;
+}
+#overlay-title {
+  display: none;
+}
+#overlay-close-wrapper {
+  position: absolute;
+  right: 0;
+  width: 30px;
+}
+#overlay-close,
+#overlay-close:hover {
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  background: #444 url(../images/buttons.png) -4000px 50% no-repeat;
+  display: block;
+  position: absolute;
+  height: 20px;
+  width: 20px;
+  margin: 5px;
+  padding: 0;
+}
+#overlay-close:active {
+  background: #333 url(../images/buttons.png) -4400px 50% no-repeat;
+}
+#overlay-content {
+  background: #fff;
+  position: relative;
+  padding: 0 0 10px;
+  min-height: 400px;
+  -webkit-border-radius: 6px 6px 5px 5px;
+     -moz-border-radius: 6px 6px 5px 5px;
+          border-radius: 6px 6px 5px 5px;
+  -webkit-box-shadow: #111 0 0 10px;
+     -moz-box-shadow: #111 0 0 10px;
+          box-shadow: #111 0 0 10px;
+}
+#overlay-content .limiter {
+  margin: 0 20px;
+}
+#branding {
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+#branding .limiter {
+  margin-left: 0;
+}
+#branding .breadcrumb-depth-0 a,
+#branding .breadcrumb-depth-0 span {
+  -webkit-border-radius: 5px 0 0 0;
+     -moz-border-radius: 5px 0 0 0;
+          border-radius: 5px 0 0 0;
+}
+/* Tabs on the overlay. */
+#overlay-tabs {
+  display: none;
+}
+/* Shortcut integration. */
+#overlay-titlebar .add-or-remove-shortcuts {
+  position: absolute;
+  top: 5px;
+  right: 25px;
+  padding: 0;
+}
+#overlay-titlebar .add-or-remove-shortcuts a {
+  background-color: #444;
+}
+#overlay-titlebar .add-or-remove-shortcuts a:active {
+  background-color: #333;
+  text-shadow: #555 0 1px 0;
+}
diff --git a/drupal7/sites/all/themes/rubik/print.css b/drupal7/sites/all/themes/rubik/css/print.css
similarity index 68%
rename from drupal7/sites/all/themes/rubik/print.css
rename to drupal7/sites/all/themes/rubik/css/print.css
index 14dfb9a6..6f823e49 100644
--- a/drupal7/sites/all/themes/rubik/print.css
+++ b/drupal7/sites/all/themes/rubik/css/print.css
@@ -1,3 +1,9 @@
+
+/**
+ * @file
+ * Contains styles used for printing.
+ */
+
 #skip-to-nav,
 #navigation,
 #toolbar,
@@ -22,7 +28,9 @@ body {
 table {
   border: 1px solid #333;
 }
-.field-label-inline .field-label, .field-label-inline .field-items, .field-label-inline .field-items .field-item {
+.field-label-inline .field-label,
+.field-label-inline .field-items,
+.field-label-inline .field-items .field-item {
   float: none;
   display: inline;
-}
\ No newline at end of file
+}
diff --git a/drupal7/sites/all/themes/rubik/css/shortcut.css b/drupal7/sites/all/themes/rubik/css/shortcut.css
new file mode 100644
index 00000000..007cf5d8
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/shortcut.css
@@ -0,0 +1,98 @@
+
+/**
+ * @file
+ * Styles for the core Shortcut module elements.
+ */
+
+/*******************************************************************************
+ * General shortcuts styling
+ ******************************************************************************/
+.add-or-remove-shortcuts a {
+  float: left;
+  display: block;
+  margin: 0 5px 0 0;
+  padding: 0;
+  background: #999 url(../images/buttons.png) -800px 50% no-repeat;
+  color: #fff;
+  text-shadow: #666 0 1px 0;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+.remove-shortcut a {
+  background-position: -1600px 50%;
+}
+.add-or-remove-shortcuts a:active {
+  color: #222;
+  background-color: #666;
+  background-position: -1200px 50%;
+  text-shadow: #999 0 1px 0;
+}
+.remove-shortcut a:active {
+  background-position: -2000px 50%;
+}
+.add-or-remove-shortcuts a span.icon {
+  width: 20px;
+  height: 20px;
+  float: left;
+}
+.add-or-remove-shortcuts a span.text {
+  float: left;
+  display: none;
+  padding: 0 5px;
+}
+.add-or-remove-shortcuts a:focus span.text,
+.add-or-remove-shortcuts a:hover span.text {
+  display: block;
+}
+/* General shortcuts styling end */
+
+/*******************************************************************************
+ * Toolbar styles
+ * Unchanged from core shortcut.css styles.
+ ******************************************************************************/
+div#toolbar a#edit-shortcuts {
+  float: right;
+  padding: 5px 10px 5px 5px;
+  line-height: 24px;
+  color: #bbb;
+}
+div#toolbar a#edit-shortcuts:focus,
+div#toolbar a#edit-shortcuts:hover,
+div#toolbar a#edit-shortcuts.active {
+  color:  #fff;
+}
+div#toolbar div.toolbar-shortcuts ul {
+  padding: 5px 0 2px 0;
+  height: 28px;
+  line-height: 24px;
+  float: left;
+  margin-left: 5px;
+}
+div#toolbar div.toolbar-shortcuts ul li a {
+  padding: 0 5px;
+  margin-right: 5px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+div#toolbar div.toolbar-shortcuts ul li a:focus,
+div#toolbar div.toolbar-shortcuts ul li a:hover,
+div#toolbar div.toolbar-shortcuts ul li a.active:focus {
+  background: #555;
+}
+div#toolbar div.toolbar-shortcuts ul li a.active:hover,
+div#toolbar div.toolbar-shortcuts ul li a.active {
+  background: #000;
+}
+div#toolbar div.toolbar-shortcuts span.icon {
+  float: left;
+  background: #444;
+  width: 30px;
+  height: 30px;
+  margin-right: 5px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+/* Toolbar styles end */
diff --git a/drupal7/sites/all/themes/rubik/css/style-rtl.css b/drupal7/sites/all/themes/rubik/css/style-rtl.css
new file mode 100644
index 00000000..8a7f776c
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/style-rtl.css
@@ -0,0 +1,169 @@
+
+/**
+ * @file
+ * Main theme stylesheet for RTL languages.
+ */
+
+/*******************************************************************************
+ * Branding
+ ******************************************************************************/
+#branding a {
+  float: right;
+}
+#branding ul.links {
+  float: left;
+}
+#branding .breadcrumb {
+  float: right;
+}
+#branding .breadcrumb a,
+#branding .breadcrumb strong {
+  float: right;
+}
+#branding .breadcrumb a,
+#branding .breadcrumb strong {
+  background: url(../images/bleeds-rtl.png) 0 -60px no-repeat;
+}
+#branding ul.links a {
+  background: url(../images/bleeds-rtl.png) 100% -30px no-repeat;
+}
+#branding ul.links a:hover {
+  background-position: 100% -90px;
+}
+#branding .breadcrumb-depth-0 a,
+#branding .breadcrumb-depth-0 strong {
+  padding-right: 10px;
+}
+#branding .breadcrumb a:hover {
+  background-position: 0% -90px;
+}
+ul.primary-tabs.links li{float: left !important;}
+#branding .breadcrumb-link {float: right;}
+/* Branding end */
+
+/*******************************************************************************
+ * Page title
+ ******************************************************************************/
+#page-title .page-title span.icon {
+  float: right;
+  margin-left: 10px;
+  margin-right: 0;
+}
+/* Page title end */
+
+/*******************************************************************************
+ * Tabs
+ ******************************************************************************/
+ul.primary-tabs {
+  left: 60px;
+  right: auto;
+  float: left;
+}
+ul.primary-tabs li {
+  padding-left: 0;
+  padding-right: 5px;
+}
+ul.primary-tabs li.active a,
+ul.primary-tabs li.active a.active {
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+ul.secondary-tabs {
+  float: left;
+}
+/* Tabs end */
+
+/*******************************************************************************
+ * Footer
+ ******************************************************************************/
+#footer .footer-message {
+  float: right;
+}
+#footer .feed-icons {
+  float: left;
+}
+#footer .feed-icons a,
+#footer .feed-icons label {
+  float: right;
+}
+/* Footer end */
+
+/*******************************************************************************
+ * Help
+ ******************************************************************************/
+a#help-toggler {
+  left: 30px;
+  right: auto;
+}
+#help-text.with-tabs {
+  -webkit-border-radius: 2px 0 0 2px;
+     -moz-border-radius: 2px 0 0 2px;
+          border-radius: 2px 0 0 2px;
+}
+#help-text .breadcrumb-link {
+  padding-left: 0;
+  padding-right: 20px;
+}
+/* Help end */
+
+/*******************************************************************************
+ * Content
+ ******************************************************************************/
+#help-text,
+.help-page,
+div.comment,
+div.node {
+  background-position: 35% 0%;
+}
+#help-text .column-main .column-wrapper {
+  padding-left: 0;
+  padding-right: 59px;
+}
+#help-text .column-main .column-wrapper span.icon {
+  left: auto;
+  right: 15px;
+}
+/* Content end */
+
+/*******************************************************************************
+ * System
+ ******************************************************************************/
+.admin .right {
+  padding-left: 0;
+  padding-right: 5px;
+  float: left;
+  margin-left: 0 !important;
+}
+.admin .left {
+  padding-left: 5px;
+  padding-right: 0;
+  float: right;
+  margin-right: 0 !important;
+}
+/* admin/content/node & admin/user/user */
+#content dl.multiselect,
+#content dl.multiselect dt,
+#content dl.multiselect dd {
+  margin: 0 0 0 10px;
+}
+/* Update options. */
+.admin-options label,
+.admin-options .form-item {
+  margin-left: 10px;
+  margin-right: 0;
+  float: right;
+}
+/* Tabs and shortcut icons. */
+#page-title .page-title {
+  float: right;
+}
+.add-or-remove-shortcuts,
+.action-links {
+  float: right;
+}
+.tabledrag-toggle-weight-wrapper {
+  float: left;
+  text-align: right;
+}
+/* System end */
diff --git a/drupal7/sites/all/themes/rubik/css/style.css b/drupal7/sites/all/themes/rubik/css/style.css
new file mode 100644
index 00000000..bf1b7cf4
--- /dev/null
+++ b/drupal7/sites/all/themes/rubik/css/style.css
@@ -0,0 +1,505 @@
+
+/**
+ * @file
+ * Main theme stylesheet.
+ */
+
+/*******************************************************************************
+ * General styles
+ ******************************************************************************/
+body,
+input,
+textarea,
+select,
+.ui-widget,
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+  font-family: "Lucida", "Lucida Grande", "Trebuchet MS", Tahoma, Verdana, sans-serif;
+}
+html {
+  overflow-y: scroll;
+}
+body.tao {
+  color: #333;
+  background: #fff;
+}
+a {
+  color: #008eb1;
+  text-decoration: none;
+}
+.limiter {
+  margin: 0 30px;
+}
+/* Skip to content link. */
+#skip-link {
+  width: 200px;
+  height: 0;
+  left: 50%;
+  margin-left: -100px;
+}
+#skip-link a:hover,
+#skip-link a:active,
+#skip-link a:focus {
+  left: 0;
+  z-index: 20;
+  text-align: center;
+  width: 200px;
+  background: #333;
+  color: #fff;
+  opacity: .9;
+  padding: 10px 0;
+  -webkit-border-radius: 0 0 5px 5px;
+     -moz-border-radius: 0 0 5px 5px;
+          border-radius: 0 0 5px 5px;
+}
+/* "Rounded" elements. */
+a.button,
+.compact-link a,
+input.form-submit,
+input.teaser-button,
+.form-actions #edit-cancel {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+/* "Popped" elements. */
+input.teaser-button,
+input.form-submit,
+a.button,
+.form-actions #edit-cancel {
+  -webkit-box-shadow: #ddd 0 1px 1px;
+     -moz-box-shadow: #ddd 0 1px 1px;
+          box-shadow: #ddd 0 1px 1px;
+}
+/* "Embossed" elements. */
+table th {
+  text-shadow: #fff 0 1px 0;
+}
+/* General styles end */
+
+/*******************************************************************************
+ * Branding
+ ******************************************************************************/
+#branding {
+  background: url(../images/bleeds.png) 0 -30px repeat-x;
+  color: #ccc;
+  font-size: 11px;
+  height: 30px;
+  overflow: hidden;
+}
+#branding ul.links {
+  float: right;
+}
+#branding ul.links a {
+  background: url(../images/bleeds.png) 0% -30px no-repeat;
+  color: #fff;
+  float: left;
+  padding: 5px 10px;
+}
+#branding ul.links a:hover {
+  background-position: 0% -90px;
+}
+#branding .breadcrumb {
+  padding: 0;
+  float: left;
+  font-weight: normal;
+}
+#branding .breadcrumb-link {
+  float: left;
+  position: relative;
+}
+#branding .breadcrumb-depth-0 {
+  z-index: 10;
+}
+#branding .breadcrumb-depth-1 {
+  z-index: 9;
+}
+#branding .breadcrumb-depth-2 {
+  z-index: 8;
+}
+#branding .breadcrumb-depth-3 {
+  z-index: 7;
+}
+#branding .breadcrumb-depth-4 {
+  z-index: 6;
+}
+#branding .breadcrumb-depth-5 {
+  z-index: 5;
+}
+#branding .breadcrumb-depth-6 {
+  z-index: 4;
+}
+#branding .breadcrumb-depth-7 {
+  z-index: 3;
+}
+#branding .breadcrumb-depth-8 {
+  z-index: 2;
+}
+#branding .breadcrumb-link > a,
+#branding .breadcrumb-link > strong {
+  color: #fff;
+  font-weight: normal;
+  float: left;
+  margin-right: -10px;
+  padding: 5px 20px;
+  background: url(../images/bleeds.png) 100% -60px no-repeat;
+}
+#branding .breadcrumb-depth-0 a,
+#branding .breadcrumb-depth-0 strong {
+  padding-left: 10px;
+}
+#branding .breadcrumb a:hover {
+  background-position: 100% -90px;
+}
+/* Branding end */
+
+/*******************************************************************************
+ * Page title
+ ******************************************************************************/
+#page-title {
+  background: #fff url(../images/bleeds.png) 0 -350px repeat-x;
+}
+#page-title .limiter {
+  position: relative;
+}
+#page-title .page-title {
+  float: left;
+  padding: 15px 10px 15px 0;
+  line-height: 30px;
+  min-height: 30px;
+  -webkit-text-shadow: #fff 0 1px 0;
+          text-shadow: #fff 0 1px 0;
+  letter-spacing: -1px;
+  font-weight: normal;
+  font-size: 20px;
+}
+#page-title .page-title span.icon {
+  float: left;
+  margin-right: 10px;
+}
+.add-or-remove-shortcuts,
+.action-links {
+  float: left;
+  font-size: 11px;
+}
+.add-or-remove-shortcuts {
+  padding: 20px 0;
+}
+.action-links {
+  padding: 20px 0 20px 10px;
+}
+.action-links a {
+  background-color: #7bc;
+  text-shadow: #38a 0 1px 0;
+}
+.add-or-remove-shortcuts a {
+  background-color: #999;
+  text-shadow: #666 0 1px 0;
+}
+/* Page title end */
+
+
+/*******************************************************************************
+ * Tabs
+ ******************************************************************************/
+.tabs {
+  float: right;
+  right: 0;
+}
+.primary-tabs {
+  height: 30px;
+  margin: 15px 0 0;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+div.pager {
+  margin: 10px 0 0;
+  height: 30px;
+}
+.pager li,
+.primary-tabs li {
+  height: 30px;
+  position: relative;
+  background: #eee url(../images/bleeds.png) 50% 0 no-repeat;
+  margin-bottom: 10px;
+}
+.pager a,
+.pager span,
+.primary-tabs a {
+  float: left;
+  text-align: center;
+  min-width: 70px;
+  padding: 5px 10px;
+  color: #333;
+  text-shadow: #fff 0 1px 0;
+}
+.pager a,
+.pager span {
+  min-width: 10px;
+  padding: 5px 15px;
+}
+.pager li:hover,
+.primary-tabs li:hover {
+  background-color: #f8f8f8;
+}
+.pager li:first-child,
+.primary-tabs li.first-row-link {
+  background-position: 0% 0;
+  -webkit-border-radius: 5px 0 0 5px;
+     -moz-border-radius: 5px 0 0 5px;
+          border-radius: 5px 0 0 5px;
+}
+.pager li:last-child,
+.primary-tabs li.last-row-link {
+  background-position: 100% 0;
+  -webkit-border-radius: 0 5px 5px 0;
+     -moz-border-radius: 0 5px 5px 0;
+          border-radius: 0 5px 5px 0;
+}
+/* This style is necessary in case there is only one tab that goes to the
+second row. */
+.primary-tabs li.first-row-link.last-row-link {
+  background-position: 0% 0;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+.pager li.pager-current,
+.primary-tabs li.active {
+  background-color: #7bc;
+}
+.pager li.pager-current span,
+.primary-tabs li.active a {
+  color: #fff;
+  text-shadow: #38a 0 1px 0;
+}
+/* Secondary tabs, nested */
+.secondary-tabs {
+  min-width: 150px;
+  float: left;
+  position: relative;
+  margin: 5px 5px 5px 0;
+  font-size: 11px;
+  background: #59a url(../images/buttons.png) -800px 50% no-repeat;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  z-index: 1;
+}
+.secondary-tabs:hover {
+  background: #59a;
+  opacity: .9;
+}
+ul.secondary-tabs li,
+ul.secondary-tabs li a {
+  background: transparent;
+  float: none;
+  height: auto;
+  text-align: left;
+  margin-bottom: 0;
+}
+.secondary-tabs a {
+  color: #fff;
+  text-shadow: #38a 0 1px 0;
+  display: none;
+  padding: 0 10px 0 25px;
+}
+.secondary-tabs:hover a,
+.secondary-tabs .active a {
+  display: block;
+}
+.secondary-tabs li:hover,
+.secondary-tabs li.active {
+  background: transparent;
+}
+.secondary-tabs a:hover {
+  background: #389 url(../images/buttons.png) -800px 50% no-repeat;
+}
+.secondary-tabs li:last-child a:hover {
+  -webkit-border-radius: 0 0 3px 3px;
+     -moz-border-radius: 0 0 3px 3px;
+          border-radius: 0 0 3px 3px;
+}
+.secondary-tabs li:first-child a:hover {
+  -webkit-border-radius: 3px 3px 0 0;
+     -moz-border-radius: 3px 3px 0 0;
+          border-radius: 3px 3px 0 0;
+}
+ul.secondary.tabs {
+  position: static;
+  float: right;
+  font-size: 0.923em;
+  padding: 0 3px 5px;
+  line-height: 1.385em;
+  overflow: hidden;
+  background-color: #fff;
+}
+ul.secondary.tabs li {
+  margin: 0 5px;
+  float: none;
+  display: inline;
+}
+/* Tabs end */
+
+/*******************************************************************************
+ * Content
+ ******************************************************************************/
+.help-page,
+div.comment,
+div.node {
+  border-style: solid;
+  border-width: 1px;
+  border-color: #ddd;
+  background: #fff url(../images/vrule.png) 65% 0% repeat-y;
+  margin: 0 0 10px;
+}
+/* Make large images display within the parent container. This will prevent
+messing up the layout if a wide image needs to be displayed in content. */
+#page img {
+  max-width: 100%;
+}
+#help-text .column-main .column-wrapper,
+.help-page .column-main .column-wrapper,
+div.comment .column-main .column-wrapper,
+div.node .column-main .column-wrapper {
+  padding: 19px;
+}
+#help-text .column-main .column-wrapper {
+  padding-left: 59px;
+  position: relative;
+}
+#help-text .column-main .column-wrapper span.icon {
+  position: absolute;
+  top: 15px;
+  left: 15px;
+}
+#help-text .column-side .column-wrapper,
+.help-page .column-side .column-wrapper,
+div.comment .column-side .column-wrapper,
+div.node .column-side .column-wrapper {
+  padding: 9px;
+  font-size: 11px;
+}
+#help-text .column-side .help-links,
+.help-page .column-side .help-page-links,
+.node-submitted,
+.comment-submitted {
+  padding: 10px;
+  background: #f8f8f8;
+}
+.comment-links,
+.node-links {
+  padding: 10px 0;
+}
+.help-page .help-page-links ul.links {
+  -webkit-column-count: 2;
+     -moz-column-count: 2;
+}
+.column-side ul.links li,
+.column-side ul.links a,
+.column-side ul.links span {
+  display: block;
+  float: none;
+}
+.column-side ul.links a,
+.column-side ul.links span {
+  padding: 0 10px;
+  display: block;
+  float: none;
+}
+.column-side ul.links span a {
+  padding: 0;
+  display: inline;
+}
+.column-side ul.links a.active,
+.column-side ul.links a:hover {
+  background: #fff;
+}
+.comment-links ul.links a:hover {
+  background: #f4f4f4;
+}
+.comment-title,
+.node-title {
+  margin: 0 0 20px;
+  font-weight: normal;
+  font-size: 16px;
+}
+/* Content end */
+
+/*******************************************************************************
+ * Fixes for other modules
+ ******************************************************************************/
+/* Fix rules action links. */
+.rules-elements-table ul.rules-operations a {
+  text-shadow: none;
+  color: #666;
+}
+/* Fix the position of Rules table drag toggle. It uses "position: absolute", so
+it is necessary to set "position: relative" to the parent, so that the button
+stays in the same frame. */
+#rules-form-wrapper {
+  position: relative;
+}
+/* Fix the padding of Rules table drag toggle. Out of the box it is optimized
+for display in table headers, while in Rules it is displayed outside of the
+tables, in the same line as table heading. */
+#rules-form-wrapper .rules-elements-table .tabledrag-toggle-weight-wrapper {
+  padding-top: 0;
+  padding-right: 0;
+}
+/* Views exposed filters forms. */
+div.views-exposed-form {
+  margin-bottom: 20px;
+}
+div.views-exposed-form div.form-item {
+  border: 0;
+  padding: 0;
+}
+div.views-exposed-form div.views-submit-button {
+  margin-right: 1em;
+}
+div.views-exposed-form input.form-text,
+div.views-exposed-form input.form-autocomplete {
+  height: 28px;
+}
+/* Views header on administrative pages (displayed while editing a view). */
+.views-display-top {
+  padding: 10px;
+}
+/* CTools toggle in views display columns. This is displayed while editing or
+creating a view. */
+.views-display-column > .ctools-toggle {
+  margin-top: 14px;
+}
+.views-display-column > .ctools-toggle.ctools-toggle-collapsed {
+  margin-top: 11px;
+}
+/* Module filter "clear" link. */
+.module-filter-clear a {
+  margin: 3px 0 0 -35px;
+}
+/* Fix Workbench Moderation links. */
+.view-workbench-moderation tbody .views-field-moderation-actions li {
+  float: none;
+  margin-bottom: 5px;
+  margin-right: 3px;
+  overflow: auto;
+}
+.view-workbench-moderation tbody .views-field-moderation-actions li a {
+  background-color: #7bc;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  color: #fff;
+  display: block;
+  padding: 0 7px;
+  text-shadow: #38a 0 1px 0;
+}
+.view-workbench-moderation tbody .views-field-moderation-actions li a:hover {
+  background-color: #52a8be;
+  color: #fff;
+}
+/* Fixes for other modules end */
diff --git a/drupal7/sites/all/themes/rubik/views-admin.rubik.css b/drupal7/sites/all/themes/rubik/css/views-admin.rubik.css
similarity index 74%
rename from drupal7/sites/all/themes/rubik/views-admin.rubik.css
rename to drupal7/sites/all/themes/rubik/css/views-admin.rubik.css
index 861a2008..8dae2e95 100644
--- a/drupal7/sites/all/themes/rubik/views-admin.rubik.css
+++ b/drupal7/sites/all/themes/rubik/css/views-admin.rubik.css
@@ -1,85 +1,91 @@
-/* Custom CSS for making Views 3 play nice with Rubik */
+
+/**
+ * @file
+ * Custom styles for making Views 3 play nice with Rubik.
+ */
 
 .views-displays .secondary .action-list input.form-submit {
-  box-shadow: none;
-  -moz-box-shadow: none;
   -webkit-box-shadow: none;
-  border-radius: 0;
-  -moz-border-radius: 0;
+     -moz-box-shadow: none;
+          box-shadow: none;
   -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
 }
 .views-displays .secondary .open > a:hover {
   color: #59A;
 }
-
-.views-ui-display-tab-actions .ctools-button-processed li a, .views-ui-display-tab-actions .ctools-button-processed input {
+.views-ui-display-tab-actions .ctools-button-processed li a,
+.views-ui-display-tab-actions .ctools-button-processed input {
   border: none;
-  box-shadow: none;
-  -moz-box-shadow: none;
   -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
 }
-
 #ctools-button-9 {
    z-index: 1;
+   top: 12px;
 }
-
 #views-ui-edit-form div#edit-actions.form-actions.form-wrapper {
    float: right;
 }
-
 #views-ui-edit-form div h1.unit-title.clearfix {
    clear: both;
    float: left;
 }
-
 #views-ui-edit-form .tabs {
   float: left;
   background-color: transparent;
 }
-
 #views-ui-edit-form .tabs li {
   display: block;
   float: left;
 }
-
+#views-ui-edit-form .views-display-top .tabs li li{
+  float: none;
+}
+#views-ui-edit-form .views-display-top ul.secondary.tabs {
+  overflow: inherit;
+  padding-bottom: 0;
+  padding-left: 0;
+}
+#views-ui-edit-form .views-display-top ul.secondary.tabs li {
+  margin-bottom: 0;
+  margin: 0 10px 0 0;
+}
+#views-ui-edit-form .views-display-top ul.secondary.tabs li a.active {
+  border-color: #666;
+}
 #views-ui-edit-form .pager {
   margin: 0;
   height: auto;
 }
-
 .views-displays {
    clear: both;
 }
-
 .views-display-setting .label {
   margin-right: 3pt; /* LTR */
 }
-
 .views-admin a:hover {
    text-decoration: none;
 }
-
 .views-display-setting .views-ajax-link {
   margin-left: 0.2083em;
   margin-right: 0.2083em;
 }
-
 .views-ui-display-tab-bucket > h3,
 .views-ui-display-tab-bucket > .views-display-setting {
   padding: 2px 6px 4px;
 }
-
 /* Hide 'remove' checkboxes. This might be scoped too widely. */
 .form-type-checkbox.remove {
   display: none;
 }
-
 .views-ui-display-tab-bucket .views-display-setting {
   color: #666666;
   font-size: 12px;
   padding-bottom: 2px;
 }
-
 .views-ui-display-tab-bucket h1,
 .views-ui-display-tab-bucket h2,
 .views-ui-display-tab-bucket h3,
@@ -88,11 +94,9 @@
   margin-bottom: 0;
   margin-top: 0;
 }
-
 #edit-display-settings-main {
   margin-top: 15px;
 }
-
 input.form-autocomplete,
 input.form-text,
 input.form-file,
@@ -104,7 +108,6 @@ select.form-select {
   background: #fff;
   color: #333;
 }
-
 input.form-text:focus,
 input.form-file:focus,
 textarea.form-textarea:focus,
@@ -112,7 +115,6 @@ select.form-select:focus {
   color: #000;
   border-color: #ace;
 }
-
 #views-ui-preview-form .form-type-textfield {
   margin-top: 2px;
 }
@@ -136,38 +138,32 @@ select.form-select:focus {
 #views-ui-preview-form .form-type-textfield label {
   height: auto;
 }
-
 #edit-display-preview-controls .form-type-textfield label {
   display: inline-block;
   font-weight: normal;
   height: inherit;
   margin-right: 0.75em;
 }
-
 #edit-display-preview-controls > .form-type-textfield {
    margin-top: 6px;
 }
-
 #edit-display-preview-controls .arguments-preview,
 #edit-display-preview-controls .form-type-textfield {
   margin-left: 14px;
 }
-
 #edit-display-preview-controls > div,
 #edit-display-preview-controls > input {
   float: left;
 }
-
 #edit-display-preview-controls .form-item {
   margin-bottom: 0;
   padding-bottom: 0;
   padding-top: 0;
 }
-
-/* Labels are outside the .form-item wrapper */
+/* Labels are outside the .form-item wrapper. */
 .views-exposed-form .views-exposed-widget label {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
   color: #999;
   font-weight: bold;
   font-size: 10px;
@@ -177,83 +173,70 @@ select.form-select:focus {
   border: 0;
   padding: 0;
 }
-
-/** collapsible within dependent **/
+/* Collapsible within dependent. */
 #edit-options .collapsible .collapsible,
 #edit-options .collapsible {
    float: none;
 }
-
-.dependent-options, .dependent-options.form-item, .form-item-options-expose-required, .form-item-options-expose-label {
+.dependent-options,
+.dependent-options.form-item,
+.form-item-options-expose-required,
+.form-item-options-expose-label {
   margin-left: 1.5em;
 }
-
 #views-ajax-popup {
   border: 0;
 }
-
 .views-ui-dialog .ui-dialog-titlebar {
   border: none;
 }
 .views-ui-dialog .ui-dialog-titlebar-close {
-  -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
-  border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
   border: 0;
-  background: #444 url(images/buttons.png) -4000px 50% no-repeat;
+  background: #444 url(../images/buttons.png) -4000px 50% no-repeat;
   display: block;
   position: absolute;
   height: 20px;
   width: 20px;
   margin: 5px;
-  padding: 0px;
-  right: 0px;
+  padding: 0;
+  right: 0;
   left: auto;
 }
-
 .views-ui-dialog #views-ajax-title {
   color:#fff;
   font-size: 100%;
   font-weight: normal;
   text-transform: uppercase;
-  background: url(images/bleeds.png) 0px -30px repeat-x;
-  border-radius: 6px 6px 5px 5px;
+  background: url(../images/bleeds.png) 0 -30px repeat-x;
   border: 0;  
-  -moz-border-radius: 6px 6px 5px 5px;
-  -webkit-border-radius: 6px 6px 5px 5px;
-  border-bottom-right-radius: 0;
-  -moz-border-bottom-right-radius: 0;
-  -webkit-border-bottom-right-radius: 0;
-  border-radius-bottom-left: 0;
-  -moz-border-bottom-left-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
   padding: 5px 10px;  
   margin-bottom: 10px;
 }
-
 .views-ui-dialog .views-override {
   background: transparent; 
   padding: 0 0 8px;
 }
-
 .views-ui-dialog #views-ajax-body {
   margin: 0 20px;
 }
-
 .views-ui-dialog .scroll {
   border: none;
   padding: 8px 10px 8px 0;
 }
-
-/** form buttons **/
+/* Form buttons. */
 .views-ui-dialog .form-buttons {
   background: #EEE;
   border: 1px solid #DDD;
   padding: 9px;
   margin-top: 10px;
 }
-
-/* Filtering options */
+/* Filtering options. */
 .views-filterable-options .form-type-checkbox  {
-  padding: 5px 8px !important;
+  padding: 5px 8px!important;
 }
diff --git a/drupal7/sites/all/themes/rubik/images/progress.gif b/drupal7/sites/all/themes/rubik/images/progress.gif
new file mode 100644
index 00000000..f84a9de5
Binary files /dev/null and b/drupal7/sites/all/themes/rubik/images/progress.gif differ
diff --git a/drupal7/sites/all/themes/rubik/js/rubik.js b/drupal7/sites/all/themes/rubik/js/rubik.js
index 279bbd5e..9d4978f7 100644
--- a/drupal7/sites/all/themes/rubik/js/rubik.js
+++ b/drupal7/sites/all/themes/rubik/js/rubik.js
@@ -9,7 +9,7 @@ Drupal.behaviors.rubik.attach = function(context, settings) {
   $('div.form:has(div.column-main div.form-actions):not(.rubik-processed)', context).each(function() {
     var form = $(this);
     var offset = $('div.column-side div.form-actions', form).height() + $('div.column-side div.form-actions', form).offset().top;
-    $(window).scroll(function () {
+    $(window).scroll(function() {
       if ($(this).scrollTop() > offset) {
         $('div.column-main .column-wrapper > div.form-actions#edit-actions', form).show();
       }
@@ -50,33 +50,81 @@ Drupal.behaviors.rubik.attach = function(context, settings) {
     $(this).parents('.secondary-tabs').toggleClass('focused');
   });
 
-  // Sticky sidebar
-  // Disable this functionality if the user chooses.
-  var disableSticky = settings.rubik.disable_sticky;
-  if ($('#content .column-side .column-wrapper').length !== 0 && !disableSticky) {
-    var rubikColumn = $('#content .column-side .column-wrapper', context);
-    if(rubikColumn && rubikColumn.offset()){
+  // Sticky sidebar functionality.
+  var disableSticky = (settings.rubik !== undefined) ? settings.rubik.disable_sticky : false;
+  if ($('#content .column-side .column-wrapper').length !== 0 ) {
+
+    // Move fields to sidebar if it exists.
+    $('.rubik_sidebar_field', context).once('rubik', function() {
+      $('.column-side .column-wrapper').append($(this));
+    });
+
+    // Check if the sidebar should be made sticky.
+    if (!disableSticky) {
+      var rubikColumn = $('#content .column-side .column-wrapper', context);
+      if (rubikColumn && rubikColumn.offset()) {
         var rubikStickySidebar = rubikColumn.offset().top;
-        $(window).scroll(function(){
-          if( $(window).scrollTop() > rubikStickySidebar ) {
+        $(window).scroll(function() {
+          if ($(window).scrollTop() > rubikStickySidebar) {
             rubikColumn.each(function() {
               $(this).addClass("fixed");
               $(this).width($(this).parent().width());
             });
-          } else {
+          }
+          else {
             rubikColumn.each(function() {
               $(this).removeClass("fixed");
               $(this).width($(this).parent().width());
             });
           }
         });
+      }
     }
 
-    // Move fields to sidebar.
-    $('.rubik_sidebar_field', context).once('rubik', function() {
-      $('.column-side .column-wrapper').append($(this));
-    });
   }
   
+  // Cache the primary tabs.
+  var $primaryTabsWrap = $('.primary-tabs');
+  if ($primaryTabsWrap.length) {
+    var $primaryTabs = $primaryTabsWrap.find('> li');
+    // Trigger adjusting function upon first page load.
+    adjustPrimaryTabs();
+    // Trigger adjusting function upon any screen resizing.
+    $(window).resize(function() {
+      adjustPrimaryTabs();
+    });
+  }
+
+  function adjustPrimaryTabs() {
+    // Get the position of whole element.
+    var parentPosition = $primaryTabs.offset().top;
+    // Complicated count.
+    var count = [];
+    var rowNumber = 1;
+    // Remove remainings of other classes we attached.
+    $primaryTabs.removeClass('last-row-link');
+    $primaryTabs.removeClass('first-row-link');
+    // Loop through and compare the position of each tab.
+    $primaryTabs.each(function(index) {
+      var $this = $(this);
+      // New row.
+      if (count[rowNumber] != $this.offset().top) {
+        // Increase the count for this row.
+        rowNumber++;
+        count[rowNumber] = $this.offset().top;
+        // Add "first" class to this element.
+        $this.addClass('first-row-link');
+        // Add "last" class to the previous element, if there is one.
+        if ($this.prev('li').length) {
+          $this.prev('li').addClass('last-row-link');
+        }
+      }
+      // Add "last" class if this is the last element.
+      if (index === ($primaryTabs.length - 1)) {
+        $this.addClass('last-row-link');
+      }
+    });
+  }
+
 };
 })(jQuery);
diff --git a/drupal7/sites/all/themes/rubik/overlay-child.css b/drupal7/sites/all/themes/rubik/overlay-child.css
deleted file mode 100644
index ac783eb0..00000000
--- a/drupal7/sites/all/themes/rubik/overlay-child.css
+++ /dev/null
@@ -1,99 +0,0 @@
-html.js {
-  background:transparent !important;
-  overflow-y:scroll;
-  overflow-x:hidden;
-  }
-
-html.js body {
-  background: transparent !important;
-  padding:20px 40px;
-  }
-
-#overlay {
-  display:block;
-  position:relative;
-  }
-
-#overlay-titlebar {
-  position:relative;
-  z-index:100;
-  }
-
-#overlay-title { display:none; }
-
-#overlay-close-wrapper {
-  position:absolute;
-  right:0px;
-  width:30px;
-  }
-
-#overlay-close,
-#overlay-close:hover {
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  border-radius:5px;
-
-  background:#444 url(images/buttons.png) -4000px 50% no-repeat;
-  display: block;
-  position: absolute;
-  height: 20px;
-  width: 20px;
-  margin: 5px;
-  padding: 0px;
-  }
-
-  #overlay-close:active { background:#333 url(images/buttons.png) -4400px 50% no-repeat; }
-
-#overlay-content {
-  background:#fff;
-  position:relative;
-  padding:0px 0px 10px;
-  min-height:400px;
-
-  border-radius:6px 6px 5px 5px;
-  box-shadow:#111 0px 0px 10px;
-  -moz-border-radius:6px 6px 5px 5px;
-  -moz-box-shadow:#111 0px 0px 10px;
-  -webkit-border-radius:6px 6px 5px 5px;
-  -webkit-box-shadow:#111 0px 0px 10px;
-  }
-
-#overlay-content .limiter { margin:0px 20px; }
-
-#branding {
-  border-radius:5px 5px 0px 0px;
-  -moz-border-radius:5px 5px 0px 0px;
-  -webkit-border-radius:5px 5px 0px 0px;
-  }
-
-  #branding .limiter { margin-left:0px; }
-
-  #branding .breadcrumb-depth-0 a,
-  #branding .breadcrumb-depth-0 span {
-    border-radius:5px 0px 0px 0px;
-    -moz-border-radius:5px 0px 0px 0px;
-    -webkit-border-radius:5px 0px 0px 0px;
-    }
-
-/**
- * Tabs on the overlay.
- */
-#overlay-tabs { display:none; }
-
-/**
- * Shortcut integration.
- */
-#overlay-titlebar .add-or-remove-shortcuts {
-  position:absolute;
-  top:5px;
-  right:25px;
-  padding:0px;
-  }
-
-#overlay-titlebar .add-or-remove-shortcuts a { background-color:#444; }
-
-#overlay-titlebar .add-or-remove-shortcuts a:active {
-  background-color:#333;
-  text-shadow:#555 0px 1px 0px;
-  }
-
diff --git a/drupal7/sites/all/themes/rubik/rubik.info b/drupal7/sites/all/themes/rubik/rubik.info
index e33db8af..81414388 100644
--- a/drupal7/sites/all/themes/rubik/rubik.info
+++ b/drupal7/sites/all/themes/rubik/rubik.info
@@ -10,11 +10,11 @@ regions[page_top] = Page top
 regions[page_bottom] = Page bottom
 
 scripts[] = js/rubik.js
-stylesheets[screen][] = core.css
-stylesheets[screen][] = icons.css
-stylesheets[screen][] = style.css
-stylesheets[screen][] = jquery.ui.theme.css
-stylesheets[print][] = print.css
+stylesheets[screen][] = css/core.css
+stylesheets[screen][] = css/icons.css
+stylesheets[screen][] = css/style.css
+stylesheets[screen][] = css/jquery.ui.theme.css
+stylesheets[print][] = css/print.css
 
 ; Support shortcut module links
 settings[shortcut_module_link] = 1
@@ -33,9 +33,9 @@ settings[rubik_show_branding] = 1
 ; is displayed at the top of the page, in #branding section.
 features[] = secondary_menu
 
-; Information added by Drupal.org packaging script on 2015-01-22
-version = "7.x-4.2"
+; Information added by Drupal.org packaging script on 2015-10-24
+version = "7.x-4.3"
 core = "7.x"
 project = "rubik"
-datestamp = "1421901484"
+datestamp = "1445682840"
 
diff --git a/drupal7/sites/all/themes/rubik/shortcut.css b/drupal7/sites/all/themes/rubik/shortcut.css
deleted file mode 100644
index 597f04da..00000000
--- a/drupal7/sites/all/themes/rubik/shortcut.css
+++ /dev/null
@@ -1,95 +0,0 @@
-.add-or-remove-shortcuts a {
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  border-radius:5px;
-
-  float:left;
-  display:block;
-
-  margin:0px 5px 0px 0px;
-  padding:0px;
-  background:#999 url(images/buttons.png) -800px 50% no-repeat;
-  color:#fff;
-  text-shadow:#666 0px 1px 0px;
-  }
-
-  .remove-shortcut a { background-position:-1600px 50%; }
-
-.add-or-remove-shortcuts a:active {
-  color:#222;
-  background-color:#666;
-  background-position:-1200px 50%;
-  text-shadow:#999 0px 1px 0px;
-  }
-
-  .remove-shortcut a:active { background-position:-2000px 50%; }
-
-.add-or-remove-shortcuts a span.icon {
-  width:20px;
-  height:20px;
-  float:left;
-  }
-
-.add-or-remove-shortcuts a span.text {
-  float:left;
-  display:none;
-  padding:0px 5px;
-  }
-
-.add-or-remove-shortcuts a:focus span.text,
-.add-or-remove-shortcuts a:hover span.text { display:block; }
-
-/**
- * Toolbar styles =====================================================
- * Unchanged from core shortcut.css styles.
- */
-div#toolbar a#edit-shortcuts {
-  float:right;
-  padding:5px 10px 5px 5px;
-  line-height:24px;
-  color:#bbb;
-  }
-
-div#toolbar a#edit-shortcuts:focus,
-div#toolbar a#edit-shortcuts:hover,
-div#toolbar a#edit-shortcuts.active {
-  color: #fff;
-  }
-
-div#toolbar div.toolbar-shortcuts ul {
-  padding:5px 0px 2px 0px;
-  height:28px;
-  line-height:24px;
-  float:left;
-  margin-left:5px;
-  }
-
-div#toolbar div.toolbar-shortcuts ul li a {
-  padding:0px 5px;
-  margin-right:5px;
-  border-radius:5px;
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  }
-
-div#toolbar div.toolbar-shortcuts ul li a:focus,
-div#toolbar div.toolbar-shortcuts ul li a:hover,
-div#toolbar div.toolbar-shortcuts ul li a.active:focus {
-  background:#555;
-  }
-
-div#toolbar div.toolbar-shortcuts ul li a.active:hover,
-div#toolbar div.toolbar-shortcuts ul li a.active {
-  background:#000;
-  }
-
-div#toolbar div.toolbar-shortcuts span.icon {
-  float:left;
-  background:#444;
-  width:30px;
-  height:30px;
-  margin-right:5px;
-  border-radius:5px;
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  }
diff --git a/drupal7/sites/all/themes/rubik/style-rtl.css b/drupal7/sites/all/themes/rubik/style-rtl.css
deleted file mode 100644
index cee0be86..00000000
--- a/drupal7/sites/all/themes/rubik/style-rtl.css
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Branding ===========================================================
- */
-#branding a { float:right; }
-
-#branding ul.links { float:left; }
-
-#branding .breadcrumb { float:right; }
-
-#branding .breadcrumb a,
-#branding .breadcrumb strong { float:right; }
-
-#branding .breadcrumb a, #branding .breadcrumb strong {
-  background: url(images/bleeds-rtl.png) 0 -60px no-repeat;
-}
-
-#branding ul.links a {
-  background: url(images/bleeds-rtl.png) 100% -30px no-repeat;
-}
-
-#branding ul.links a:hover { background-position:100% -90px; }
-
-#branding .breadcrumb-depth-0 a,
-    #branding .breadcrumb-depth-0 strong { padding-right:10px; }
-
-#branding .breadcrumb a:hover { background-position:0% -90px; }
-ul.primary-tabs.links li{float:left !important;}
-#branding .breadcrumb-link {float: right;}
-/**
- * Page title =========================================================
- */
-  #page-title .page-title span.icon {
-    float:right;
-    margin-left:10px;
-    margin-right:0;
-    }
-
-/**
- * Tabs ===============================================================
- */
-ul.primary-tabs {
-  left:60px;
-  right:auto;
-  float: left;
-  }
-
-ul.primary-tabs li {
-  padding-left:0;
-  padding-right:5px;
-}
-
-ul.primary-tabs li.active a,
-ul.primary-tabs li.active a.active {
-  -moz-border-radius:3px 0px 0px 3px;
-  }
-
-  ul.secondary-tabs { float:left; }
-
-/**
- * Footer =============================================================
- */
-#footer .footer-message {
-  float:right;
-  }
-
-#footer .feed-icons {
-  float:left;
-  }
-
-  #footer .feed-icons label,
-  #footer .feed-icons a {
-    float:right;
-    }
-
-/**
- * Help ===============================================================
- */
-a#help-toggler {
-  left:30px;
-  right:auto;
-  }
-
-  #help-text.with-tabs {
-    -moz-border-radius:2px 0px 0px 2px;
-    }
-
-  #help-text .breadcrumb-link {
-    padding-left:0;
-    padding-right:20px;
-    }
-
-/**
- * Content ============================================================
- */
-#help-text,
-.help-page,
-div.comment,
-div.node { background-position:35% 0%; }
-
-#help-text .column-main .column-wrapper {
-  padding-left:0px;
-  padding-right:59px;
-  }
-
-  #help-text .column-main .column-wrapper span.icon {
-    left:auto;
-    right:15px;
-    }
-
-/**
- * System =============================================================
- */
-.admin .right {
-padding-left: 0;
-padding-right: 5px;
-float: left;
-margin-left: 0 !important;
-}
-
-.admin .left {
-padding-left: 5px;
-padding-right: 0;
-float: right;
-margin-right: 0 !important;
-}
-/* admin/content/node & admin/user/user */
-#content dl.multiselect,
-#content dl.multiselect dt,
-#content dl.multiselect dd { margin:0px 0px 0px 10px; }
-
-/* update options */
-.admin-options label,
-.admin-options .form-item {
-  margin-left:10px;
-  margin-right:0px;
-  float:right;
-  }
-
-/* tabs and shortcut icons */
-#page-title .page-title {
-float: right;
-}
-
-.add-or-remove-shortcuts, .action-links {
-float: right;
-}
-
-.tabledrag-toggle-weight-wrapper {
-  float: left;
-  text-align: right;
-}
diff --git a/drupal7/sites/all/themes/rubik/style.css b/drupal7/sites/all/themes/rubik/style.css
deleted file mode 100644
index a10db1f8..00000000
--- a/drupal7/sites/all/themes/rubik/style.css
+++ /dev/null
@@ -1,477 +0,0 @@
-body,
-input,
-textarea,
-select,
-.ui-widget,
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button { font-family:"Lucida","Lucida Grande","Trebuchet MS",Tahoma,Verdana,sans-serif; }
-
-html { overflow-y:scroll; }
-
-body.tao {
-  color:#333;
-  background:#fff;
-  }
-
-a {
-  color:#008eb1;
-  text-decoration:none;
-  }
-
-.limiter { margin:0px 30px; }
-
-/**
- * Skip to content link ===============================================
- */
-#skip-link {
-  width:200px;
-  height:0px;
-  left:50%;
-  margin-left:-100px;
-  }
-
-#skip-link a:hover,
-#skip-link a:active,
-#skip-link a:focus {
-  left:0px;
-  z-index:20;
-  text-align:center;
-  width:200px;
-  background:#333;
-  color:#fff;
-  opacity:.9;
-  padding:10px 0px;
-
-  border-radius:0px 0px 5px 5px;
-  -moz-border-radius:0px 0px 5px 5px;
-  -webkit-border-radius:0px 0px 5px 5px;
-  }
-
-/**
- * "Rounded" elements =================================================
- */
-.compact-link a,
-input.teaser-button,
-input.form-submit,
-a.button,
-.form-actions #edit-cancel {
-  -moz-border-radius:3px;
-  -webkit-border-radius:3px;
-  }
-
-/**
- * "Popped" elements ==================================================
- */
-input.teaser-button,
-input.form-submit,
-a.button,
-.form-actions #edit-cancel {
-  box-shadow:#ddd 0px 1px 1px;
-  -moz-box-shadow:#ddd 0px 1px 1px;
-  -webkit-box-shadow:#ddd 0px 1px 1px;
-  }
-
-/**
- * "Embossed" elements ================================================
- */
-table th {
-  text-shadow:#fff 0px 1px 0px;
-  }
-
-/**
- * Branding ===========================================================
- */
-#branding {
-  background:url(images/bleeds.png) 0px -30px repeat-x;
-  color:#ccc;
-  font-size:11px;
-  height:30px;
-  overflow:hidden;
-  }
-
-#branding ul.links { float:right; }
-
-#branding ul.links a {
-  background:url(images/bleeds.png) 0% -30px no-repeat;
-  color:#fff;
-  float:left;
-  padding:5px 10px;
-  }
-
-#branding ul.links a:hover { background-position:0% -90px; }
-
-#branding .breadcrumb {
-  padding:0px;
-  float:left;
-  font-weight:normal;
-  }
-
-  #branding .breadcrumb-link {
-    float:left;
-    position:relative;
-    }
-
-  #branding .breadcrumb-depth-0 { z-index:10; }
-  #branding .breadcrumb-depth-1 { z-index:9; }
-  #branding .breadcrumb-depth-2 { z-index:8; }
-  #branding .breadcrumb-depth-3 { z-index:7; }
-  #branding .breadcrumb-depth-4 { z-index:6; }
-  #branding .breadcrumb-depth-5 { z-index:5; }
-  #branding .breadcrumb-depth-6 { z-index:4; }
-  #branding .breadcrumb-depth-7 { z-index:3; }
-  #branding .breadcrumb-depth-8 { z-index:2; }
-
-  #branding .breadcrumb-link > a,
-  #branding .breadcrumb-link > strong {
-    color:#fff;
-    font-weight:normal;
-    float:left;
-    margin-right:-10px;
-    padding:5px 20px;
-    background:url(images/bleeds.png) 100% -60px no-repeat;
-    }
-
-    #branding .breadcrumb-depth-0 a,
-    #branding .breadcrumb-depth-0 strong { padding-left:10px; }
-
-  #branding .breadcrumb a:hover { background-position:100% -90px; }
-
-/**
- * Page title =========================================================
- */
-#page-title { background:#fff url(images/bleeds.png) 0px -350px repeat-x; }
-#page-title .limiter { position:relative; }
-
-  #page-title .page-title {
-    float:left;
-    padding:15px 10px 15px 0px;
-    line-height:30px;
-    min-height:30px;
-
-    text-shadow:#fff 0px 1px 0px;
-    -webkit-text-shadow:#fff 0px 1px 0px;
-
-    letter-spacing:-1px;
-    font-weight:normal;
-    font-size:20px;
-    }
-
-  #page-title .page-title span.icon {
-    float:left;
-    margin-right:10px;
-    }
-
-  .add-or-remove-shortcuts,
-  .action-links {
-    float:left;
-    font-size:11px;
-    }
-
-    .add-or-remove-shortcuts { padding:20px 0px; }
-    .action-links { padding:20px 0px 20px 10px; }
-
-  .action-links a {
-    background-color:#7bc;
-    text-shadow:#38a 0px 1px 0px;
-    }
-
-  .add-or-remove-shortcuts a {
-    background-color:#999;
-    text-shadow:#666 0px 1px 0px;
-    }
-
-/**
- * Tabs ===============================================================
- */
-.tabs {
-  float:right;
-  right:0px;
-  }
-
-.primary-tabs {
-  float:left;
-  height:30px;
-  margin:15px 0px 0px;
-  border-radius:5px;
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-  }
-
-div.pager {
-  margin:10px 0px 0px;
-  height:30px;
-  }
-
-.pager li,
-.primary-tabs li {
-  height:30px;
-  position:relative;
-  background:#eee url(images/bleeds.png) 50% 0px no-repeat;
-  }
-
-.pager a,
-.pager span,
-.primary-tabs a {
-  float:left;
-  text-align:center;
-  min-width:70px;
-  padding:5px 10px;
-  color:#333;
-  text-shadow:#fff 0px 1px 0px;
-  }
-
-.pager a,
-.pager span {
-  min-width:10px;
-  padding:5px 15px;
-  }
-
-.pager li:hover,
-.primary-tabs li:hover { background-color:#f8f8f8; }
-
-.pager li:first-child,
-.primary-tabs li:first-child {
-  border-radius:5px 0px 0px 5px;
-  -moz-border-radius:5px 0px 0px 5px;
-  -webkit-border-radius:5px 0px 0px 5px;
-  background-position:0% 0px;
-  }
-
-.pager li:last-child,
-.primary-tabs li:last-child {
-  border-radius:0px 5px 5px 0px;
-  -moz-border-radius:0px 5px 5px 0px;
-  -webkit-border-radius:0px 5px 5px 0px;
-  background-position:100% 0px;
-  }
-
-.pager li.pager-current,
-.primary-tabs li.active { background-color:#7bc; }
-
-.pager li.pager-current span,
-.primary-tabs li.active a {
-  color:#fff;
-  text-shadow:#38a 0px 1px 0px;
-  }
-
-/* Secondary tabs, nested */
-.secondary-tabs {
-  min-width:150px;
-  float:left;
-  position:relative;
-  margin:5px 5px 5px 0px;
-  font-size:11px;
-  background:#59a url(images/buttons.png) -800px 50% no-repeat;
-  border-radius:3px;
-  -moz-border-radius:3px;
-  -webkit-border-radius:3px;
-  z-index: 1;
-  }
-
-.secondary-tabs:hover {
-  background:#59a;
-  opacity:.9;
-  }
-
-ul.secondary-tabs li,
-ul.secondary-tabs li a {
-  background:transparent;
-  float:none;
-  height:auto;
-  text-align:left;
-  }
-
-.secondary-tabs a {
-  color:#fff;
-  text-shadow:#38a 0px 1px 0px;
-  display:none;
-  padding:0px 10px 0px 25px;
-  }
-
-  .secondary-tabs:hover a,
-  .secondary-tabs .active a { display:block; }
-
-  .secondary-tabs li:hover,
-  .secondary-tabs li.active { background:transparent; }
-  .secondary-tabs a:hover { background:#389 url(images/buttons.png) -800px 50% no-repeat; }
-
-  .secondary-tabs li:last-child a:hover {
-    border-radius:0px 0px 3px 3px;
-    -moz-border-radius:0px 0px 3px 3px;
-    -webkit-border-radius:0px 0px 3px 3px;
-    }
-
-  .secondary-tabs li:first-child a:hover {
-    border-radius:3px 3px 0px 0px;
-    -moz-border-radius:3px 3px 0px 0px;
-    -webkit-border-radius:3px 3px 0px 0px;
-    }
-
-ul.secondary.tabs {
-    position: static;
-    float: right;
-    font-size: 0.923em;
-    padding: 0 3px 5px;
-    line-height: 1.385em;
-    overflow: hidden;
-    background-color: #fff;
-    }
-
-  ul.secondary.tabs li {
-    margin: 0 5px;
-    float: none;
-    display: inline;
-    }
-/**
- * Content ============================================================
- */
-.help-page,
-div.comment,
-div.node {
-  border-style:solid;
-  border-width:1px;
-  border-color:#ddd;
-
-  background:#fff url(images/vrule.png) 65% 0% repeat-y;
-  margin:0px 0px 10px;
-  }
-
-/* Make large images display within the parent container. This will prevent
-messing up the layout if a wide image needs to be displayed in content. */
-#page img { max-width: 100%; }
-
-#help-text .column-main .column-wrapper,
-.help-page .column-main .column-wrapper,
-div.comment .column-main .column-wrapper,
-div.node .column-main .column-wrapper { padding:19px; }
-
-  #help-text .column-main .column-wrapper {
-    padding-left:59px;
-    position:relative;
-    }
-
-    #help-text .column-main .column-wrapper span.icon {
-      position:absolute;
-      top:15px;
-      left:15px;
-      }
-
-#help-text .column-side .column-wrapper,
-.help-page .column-side .column-wrapper,
-div.comment .column-side .column-wrapper,
-div.node .column-side .column-wrapper {
-  padding:9px;
-  font-size:11px;
-  }
-
-#help-text .column-side .help-links,
-.help-page .column-side .help-page-links,
-.node-submitted,
-.comment-submitted {
-  padding:10px;
-  background:#f8f8f8;
-  }
-
-.comment-links,
-.node-links { padding:10px 0px; }
-
-.help-page .help-page-links ul.links {
-  -moz-column-count:2;
-  -webkit-column-count:2;
-  }
-
-.column-side ul.links li,
-.column-side ul.links a,
-.column-side ul.links span {
-  display:block;
-  float:none;
-  }
-
-.column-side ul.links a,
-.column-side ul.links span {
-  padding:0px 10px;
-  display:block;
-  float:none;
-  }
-
-  .column-side ul.links span a {
-    padding:0px;
-    display:inline;
-    }
-
-  .column-side ul.links a.active,
-  .column-side ul.links a:hover { background:#fff; }
-  .comment-links ul.links a:hover { background:#f4f4f4; }
-
-.comment-title,
-.node-title {
-  margin:0px 0px 20px;
-  font-weight:normal;
-  font-size:16px;
-  }
-
-/**
- * Fixes for other modules ===============================================
- */
-/* Fix rules action links. */
-.rules-elements-table ul.rules-operations a {
-  text-shadow: none;
-  color: #666;
-}
-/* Fix the position of Rules table drag toggle. It uses "position: absolute", so
-it is necessary to set "position: relative" to the parent, so that the button
-stays in the same frame. */
-#rules-form-wrapper {
-  position: relative;
-}
-/* Fix the padding of Rules table drag toggle. Out of the box it is optimized
-for display in table headers, while in Rules it is displayed outside of the
-tables, in the same line as table heading. */
-#rules-form-wrapper .rules-elements-table .tabledrag-toggle-weight-wrapper {
-  padding-top: 0;
-  padding-right: 0;
-}
-/* Views exposed filters forms. */
-div.views-exposed-form {
-  margin-bottom: 20px;
-}
-div.views-exposed-form div.form-item {
-  border: 0;
-  padding: 0;
-}
-div.views-exposed-form div.views-submit-button {
-  margin-right: 1em;
-}
-div.views-exposed-form input.form-text,
-div.views-exposed-form select.form-select,
-div.views-exposed-form input.form-autocomplete {
-  height: 28px;
-}
-/* Module filter "clear" link. */
-.module-filter-clear a {
-  margin: 3px 0 0 -35px;
-}
-
-/* Fix Workbench Moderation links. */
-.view-workbench-moderation tbody .views-field-moderation-actions li {
-  float: none;
-  margin-bottom: 5px;
-  margin-right: 3px;
-  overflow: auto;
-}
-.view-workbench-moderation tbody .views-field-moderation-actions li a {
-  background-color: #7bc;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  color: #fff;
-  display: block;
-  padding: 0 7px;
-  text-shadow: #38a 0px 1px 0px;
-}
-.view-workbench-moderation tbody .views-field-moderation-actions li a:hover {
-  background-color: #52a8be;
-  color: #fff;
-}
\ No newline at end of file
diff --git a/drupal7/sites/all/themes/rubik/template.php b/drupal7/sites/all/themes/rubik/template.php
index 4c62d6f7..751aa7f0 100644
--- a/drupal7/sites/all/themes/rubik/template.php
+++ b/drupal7/sites/all/themes/rubik/template.php
@@ -8,7 +8,7 @@ function rubik_preprocess_html(&$vars) {
   }
 
    // add in a specific stylesheet for overrides in IE7. (BLAH)
-  drupal_add_css(drupal_get_path('theme', 'rubik') . '/ie.css', array(
+  drupal_add_css(drupal_get_path('theme', 'rubik') . '/css/ie.css', array(
     'browsers' => array(
       '!IE' => FALSE,
     ),
@@ -17,6 +17,9 @@ function rubik_preprocess_html(&$vars) {
     'every_page' => TRUE,
   ));
 
+  // Disable sticky in the sidebar. Set option in JS
+  $disable_sticky = theme_get_setting('rubik_disable_sticky_sidebar');
+  drupal_add_js(array('rubik' => array('disable_sticky' => $disable_sticky)), array('type' => 'setting'));
 }
 
 /**
@@ -25,10 +28,10 @@ function rubik_preprocess_html(&$vars) {
  */
 function rubik_css_alter(&$css) {
   if (isset($css['modules/overlay/overlay-child.css'])) {
-    $css['modules/overlay/overlay-child.css']['data'] = drupal_get_path('theme', 'rubik') . '/overlay-child.css';
+    $css['modules/overlay/overlay-child.css']['data'] = drupal_get_path('theme', 'rubik') . '/css/overlay-child.css';
   }
   if (isset($css['modules/shortcut/shortcut.css'])) {
-    $css['modules/shortcut/shortcut.css']['data'] = drupal_get_path('theme', 'rubik') . '/shortcut.css';
+    $css['modules/shortcut/shortcut.css']['data'] = drupal_get_path('theme', 'rubik') . '/css/shortcut.css';
   }
 }
 
@@ -140,11 +143,6 @@ function rubik_preprocess_page(&$vars) {
 
   // Overlay is enabled.
   $vars['overlay'] = (module_exists('overlay') && overlay_get_mode() === 'child');
-
-  // Disable sticky in the sidebar. Set option in JS
-  $disable_sticky = theme_get_setting('rubik_disable_sticky_sidebar');
-  drupal_add_js(array('rubik' => array('disable_sticky' => $disable_sticky)), array('type' => 'setting'));
-
 }
 
 /**
@@ -499,7 +497,8 @@ function rubik_admin_drilldown_menu_item_link($link) {
  */
 function rubik_preprocess_textfield(&$vars) {
   if ($vars['element']['#size'] >= 30 && empty($vars['element']['#field_prefix']) && empty($vars['element']['#field_suffix'])) {
-    $vars['element']['#size'] = '';
+    // Set text field to default size.
+    $vars['element']['#size'] = 20;
     if (!isset($vars['element']['#attributes']['class'])
       || !is_array($vars['element']['#attributes']['class'])) {
        $vars['element']['#attributes']['class'] = array();
