From 14e775cbcf55552add83c1a313d1380618c67724 Mon Sep 17 00:00:00 2001
From: Dmitry V Selitsky <OR>
Date: Wed, 7 Oct 2015 12:48:28 +0100
Subject: [PATCH] Fix missing js semi-colons and refactor CSS

---
 .../deluge/plugins/execute/data/execute.js    |   2 +-
 .../plugins/extractor/data/extractor.js       |   2 +-
 .../plugins/scheduler/data/scheduler.js       |   2 +-
 .../web/js/extjs/ext-extensions/JSLoader.js   |   4 +-
 .../ui/web/js/extjs/ext-extensions/Spinner.js |   2 +-
 .../extjs/ext-extensions/form/SpinnerGroup.js |   2 +-
 .../tree/MultiSelectionModelFix.js            |   2 +-
 deluge/ui/web/themes/css/xtheme-access.css    |  88 +++++---------
 deluge/ui/web/themes/css/xtheme-blue.css      | 107 ++++++------------
 deluge/ui/web/themes/css/xtheme-gray.css      |  99 ++++++----------
 10 files changed, 107 insertions(+), 203 deletions(-)

diff --git a/deluge/plugins/Execute/deluge/plugins/execute/data/execute.js b/deluge/plugins/Execute/deluge/plugins/execute/data/execute.js
index 9be90dcdb..13c1f41de 100644
--- a/deluge/plugins/Execute/deluge/plugins/execute/data/execute.js
+++ b/deluge/plugins/Execute/deluge/plugins/execute/data/execute.js
@@ -136,7 +136,7 @@ Deluge.ux.preferences.ExecutePage = Ext.extend(Ext.Panel, {
                 'complete': _('Torrent Complete'),
                 'added': _('Torrent Added'),
                 'removed': _('Torrent Removed')
-            }
+            };
 
         this.list = new Ext.list.ListView({
             store: new Ext.data.SimpleStore({
diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/data/extractor.js b/deluge/plugins/Extractor/deluge/plugins/extractor/data/extractor.js
index e7c1520ed..78ee86764 100644
--- a/deluge/plugins/Extractor/deluge/plugins/extractor/data/extractor.js
+++ b/deluge/plugins/Extractor/deluge/plugins/extractor/data/extractor.js
@@ -62,7 +62,7 @@ Deluge.ux.preferences.ExtractorPage = Ext.extend(Ext.Panel, {
 
     onApply: function() {
         // build settings object
-        var config = {}
+        var config = {};
 
         config['extract_path'] = this.extract_path.getValue();
         config['use_name_folder'] = this.use_name_folder.getValue();
diff --git a/deluge/plugins/Scheduler/deluge/plugins/scheduler/data/scheduler.js b/deluge/plugins/Scheduler/deluge/plugins/scheduler/data/scheduler.js
index 2b936154f..5f78cbf66 100644
--- a/deluge/plugins/Scheduler/deluge/plugins/scheduler/data/scheduler.js
+++ b/deluge/plugins/Scheduler/deluge/plugins/scheduler/data/scheduler.js
@@ -556,7 +556,7 @@ Deluge.ux.preferences.SchedulerPage = Ext.extend(Ext.Panel, {
 
     onApply: function() {
         // build settings object
-        var config = {}
+        var config = {};
 
         config['button_state'] = this.schedule.getConfig();
         config['low_down'] = this.downloadLimit.getValue();
diff --git a/deluge/ui/web/js/extjs/ext-extensions/JSLoader.js b/deluge/ui/web/js/extjs/ext-extensions/JSLoader.js
index 7d397244d..563d32e31 100644
--- a/deluge/ui/web/js/extjs/ext-extensions/JSLoader.js
+++ b/deluge/ui/web/js/extjs/ext-extensions/JSLoader.js
@@ -30,9 +30,9 @@ Ext.ux.JSLoader = function(options) {
             script.onError(script.options, response.status);
         }
     });
-}
+};
 Ext.ux.JSLoader.index = 0;
 Ext.ux.JSLoader.scripts = [];
 Ext.ux.JSLoader.stdError = function(options, e) {
     window.alert('Error loading script:\n\n' + options.url + '\n\nstatus: ' + e);
-}
+};
diff --git a/deluge/ui/web/js/extjs/ext-extensions/Spinner.js b/deluge/ui/web/js/extjs/ext-extensions/Spinner.js
index 2e537fef1..74f5ea31d 100644
--- a/deluge/ui/web/js/extjs/ext-extensions/Spinner.js
+++ b/deluge/ui/web/js/extjs/ext-extensions/Spinner.js
@@ -199,7 +199,7 @@ Ext.ux.Spinner = Ext.extend(Ext.util.Observable, {
 
         this.field.mon(this.wrap, "mousewheel", this.handleMouseWheel, this);
 
-        this.dd.setXConstraint(0, 0, 10)
+        this.dd.setXConstraint(0, 0, 10);
         this.dd.setYConstraint(1500, 1500, 10);
         this.dd.endDrag = this.endDrag.createDelegate(this);
         this.dd.startDrag = this.startDrag.createDelegate(this);
diff --git a/deluge/ui/web/js/extjs/ext-extensions/form/SpinnerGroup.js b/deluge/ui/web/js/extjs/ext-extensions/form/SpinnerGroup.js
index 4ad3a7bf1..b0c14c0fd 100644
--- a/deluge/ui/web/js/extjs/ext-extensions/form/SpinnerGroup.js
+++ b/deluge/ui/web/js/extjs/ext-extensions/form/SpinnerGroup.js
@@ -73,7 +73,7 @@ Ext.ux.form.SpinnerGroup = Ext.extend(Ext.form.CheckboxGroup, {
                     layoutConfig: {columns: this.items.length},
                     defaults: this.defaults,
                     items: this.items
-                })
+                });
                 for(var i=0, len=this.items.length; i<len; i++){
                     Ext.applyIf(this.items[i], colCfg);
                 };
diff --git a/deluge/ui/web/js/extjs/ext-extensions/tree/MultiSelectionModelFix.js b/deluge/ui/web/js/extjs/ext-extensions/tree/MultiSelectionModelFix.js
index da2513c41..30d523356 100644
--- a/deluge/ui/web/js/extjs/ext-extensions/tree/MultiSelectionModelFix.js
+++ b/deluge/ui/web/js/extjs/ext-extensions/tree/MultiSelectionModelFix.js
@@ -89,4 +89,4 @@ Ext.override(Ext.tree.MultiSelectionModel, {
         return node;
     }
 
-})
+});
diff --git a/deluge/ui/web/themes/css/xtheme-access.css b/deluge/ui/web/themes/css/xtheme-access.css
index 7a091abb6..4ce0a6e69 100644
--- a/deluge/ui/web/themes/css/xtheme-access.css
+++ b/deluge/ui/web/themes/css/xtheme-access.css
@@ -15,8 +15,7 @@ body {
 
 .ext-el-mask-msg {
     border-color:#223;
-    background-color:#3f4757;
-    background-image:url(../images/access/box/tb-blue.gif);
+    background: #3f4757 url(../images/access/box/tb-blue.gif);
 }
 .ext-el-mask-msg div {
     background-color: #232d38;
@@ -26,8 +25,7 @@ body {
 }
 
 .x-mask-loading div {
-    background-color:#232d38;
-    background-image:url(../images/access/grid/loading.gif);
+    background: #232d38 url(../images/access/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -90,14 +88,12 @@ body {
 }
 
 ul.x-tab-strip-top{
-    background-color:#343843;
-    background-image: url(../images/access/tabs/tab-strip-bg.gif);
+    background: #343843 url(../images/access/tabs/tab-strip-bg.gif);
     border-bottom-color:#343d4e;
 }
 
 ul.x-tab-strip-bottom{
-    background-color:#343843;
-    background-image: url(../images/access/tabs/tab-strip-btm-bg.gif);
+    background: #343843 url(../images/access/tabs/tab-strip-btm-bg.gif);
     border-top-color:#343843;
 }
 
@@ -197,10 +193,8 @@ ul.x-tab-strip-bottom{
 
 .x-form-text, textarea.x-form-field{
     color: #ffffff;
-    background-color:#33373d;
-    background-image:url(../images/access/form/text-bg.gif);
-    border-color:#737b8c;
-    border-width:2px;
+    background: #33373d url(../images/access/form/text-bg.gif);
+    border: 2px #737b8c;
 }
 
 .ext-webkit .x-form-text, .ext-webkit textarea.x-form-field{
@@ -231,8 +225,7 @@ ul.x-tab-strip-bottom{
 
 .x-form-field-wrap .x-form-trigger{
     background-image:url(../images/access/form/trigger.gif);
-    border-bottom-color:#737b8c;
-    border-bottom-width:2px;
+    border-bottom: 2px #737b8c;
     height:24px;
     width:20px;
 }
@@ -299,8 +292,7 @@ ul.x-tab-strip-bottom{
 
 .x-form-invalid, textarea.x-form-invalid,
 .ext-webkit .x-form-invalid, .ext-webkit textarea.x-form-invalid{
-    background-color:#15171a;
-    background-image:url(../images/access/grid/invalid_line.gif);
+    background: #15171a url(../images/access/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -312,8 +304,7 @@ ul.x-tab-strip-bottom{
 */
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid{
-    background-color:#fff;
-    background-image:url(../images/access/grid/invalid_line.gif);
+    background: #fff url(../images/access/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -347,10 +338,9 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid-icon {
-    background-image:url(../images/access/form/exclamation.gif);
     height:25px;
     width:19px;
-    background-position:center right;
+    background: url(../images/access/form/exclamation.gif) center right;
 }
 
 .x-fieldset {
@@ -493,8 +483,7 @@ ul.x-tab-strip-bottom{
 }
 .x-toolbar{
     border-color:#18181a;
-    background-color:#393d4e;
-    background-image:url(../images/access/toolbar/bg.gif);
+    background: #393d4e url(../images/access/toolbar/bg.gif);
 }
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
@@ -661,8 +650,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background-color: #fff;
-    background-image:url(../images/default/shared/loading-balls.gif);
+    background: #fff url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -688,8 +676,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background-color:#3b3f50;
-    background-image:url(../images/access/grid/grid3-hrow.gif);
+    background: #3b3f50 url(../images/access/grid/grid3-hrow.gif);
 }
 
 .x-grid3-header-pop {
@@ -707,8 +694,7 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background-color:#4e628a;
-    background-image:url(../images/access/grid/grid3-hrow-over.gif);
+    background: #4e628a url(../images/access/grid/grid3-hrow-over.gif);
 }
 
 .x-grid3-cell-inner, .x-grid3-hd-inner {
@@ -742,8 +728,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background-color:#ebf3fd;
-    background-image:url(../images/access/grid/grid3-hrow-over.gif);
+    background: #ebf3fd url(../images/access/grid/grid3-hrow-over.gif);
     border-color:#aaccf6;
 }
 
@@ -779,8 +764,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background-color:#ebeadb !important;
-    background-image:url(../images/default/grid/grid-hrow.gif) !important;
+    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
     color:#fff;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -832,8 +816,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-hd-btn {
-    background-color:#c2c9d0;
-    background-image:url(../images/access/grid/grid3-hd-btn.gif);
+    background: #c2c9d0 url(../images/access/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -887,8 +870,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid-group-hd div.x-grid-group-title {
-    background-image:url(../images/access/grid/group-collapse.gif);
-    background-position:3px 6px;
+    background: url(../images/access/grid/group-collapse.gif) 3px 6px;
     color:#ffd;
     font:bold 14px tahoma, arial, helvetica, sans-serif;
 }
@@ -1135,8 +1117,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner th {
-    background-color:#363d4a;
-    background-image:url(../images/access/toolbar/bg.gif);
+    background: #363d4a url(../images/access/toolbar/bg.gif);
     border-bottom-color:#535b5c;
     font:normal 13px arial, helvetica,tahoma,sans-serif;
     color:#fff;
@@ -1157,8 +1138,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner .x-date-selected a{
-    background-color:#e5872c;
-    background-image:none;
+    background: #e5872c none;
     border-color:#864900;
     padding:1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */
 }
@@ -1177,8 +1157,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-date-bottom {
     border-top-color:#737b8c;
-    background-color:#464d5a;
-    background-image:url(../images/access/shared/glass-bg.gif);
+    background: #464d5a url(../images/access/shared/glass-bg.gif);
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1216,8 +1195,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-mp-btns {
-    background-color: #dfecfb;
-    background-image: url(../images/access/shared/glass-bg.gif);
+    background: #dfecfb url(../images/access/shared/glass-bg.gif);
 }
 
 .x-date-mp-btns td {
@@ -1234,8 +1212,7 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background-color: #e5872c;
-    background-image: none;
+    background: #e5872c none;
     border-color:#864900;
 }
 
@@ -1286,8 +1263,7 @@ td.x-date-mp-sep {
 }
 .x-menu {
     border-color:#222;
-    background-color:#414551;
-    background-image:url(../images/access/menu/menu.gif);
+    background: #414551 url(../images/access/menu/menu.gif);
 }
 
 .x-menu-nosep {
@@ -1312,8 +1288,7 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background-color: #f09134;
-    background-image: none;
+    background: #f09134 none;
     border-color:#b36427;
 }
 
@@ -1374,8 +1349,7 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background-color: #eee;
-    background-image: url(../images/default/box/tb.gif);
+    background: #eee url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 15px;
@@ -1714,13 +1688,11 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background-color:#232d38;
-    background-image:none;
+    background: #232d38 none;
 }
 
 .x-progress-bar {
-    background-color:#f39a00;
-    background-image:url(../images/access/progress/progress-bg.gif);
+    background: #f39a00 url(../images/access/progress/progress-bg.gif);
     border-top-color:#a66900;
     border-bottom-color:#a66900;
     border-right-color:#ffb941;
@@ -1739,9 +1711,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
     line-height: 19px;
 }
 .x-list-header{
-    background-color:#393d4e;
-    background-image:url(../images/access/toolbar/bg.gif);
-    background-position:0 top;
+    background: #393d4e url(../images/access/toolbar/bg.gif) 0 top;
 }
 
 .x-list-header-inner div em {
diff --git a/deluge/ui/web/themes/css/xtheme-blue.css b/deluge/ui/web/themes/css/xtheme-blue.css
index 8c9891ecc..edce8b51a 100644
--- a/deluge/ui/web/themes/css/xtheme-blue.css
+++ b/deluge/ui/web/themes/css/xtheme-blue.css
@@ -10,8 +10,7 @@
 
 .ext-el-mask-msg {
     border-color:#6593cf;
-    background-color:#c3daf9;
-    background-image:url(../images/default/box/tb-blue.gif);
+    background: #c3daf9 url(../images/default/box/tb-blue.gif);
 }
 .ext-el-mask-msg div {
     background-color: #eee;
@@ -21,8 +20,7 @@
 }
 
 .x-mask-loading div {
-    background-color:#fbfbfb;
-    background-image:url(../images/default/grid/loading.gif);
+    background: #fbfbfb url(../images/default/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -92,14 +90,12 @@
 }
 
 ul.x-tab-strip-top{
-    background-color:#cedff5;
-    background-image: url(../images/default/tabs/tab-strip-bg.gif);
+    background: #cedff5 url(../images/default/tabs/tab-strip-bg.gif);
     border-bottom-color:#8db2e3;
 }
 
 ul.x-tab-strip-bottom{
-    background-color:#cedff5;
-    background-image: url(../images/default/tabs/tab-strip-btm-bg.gif);
+    background: #cedff5 url(../images/default/tabs/tab-strip-btm-bg.gif);
     border-top-color:#8db2e3;
 }
 
@@ -205,8 +201,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-text, textarea.x-form-field {
-    background-color:#fff;
-    background-image:url(../images/default/form/text-bg.gif);
+    background: #fff url(../images/default/form/text-bg.gif);
     border-color:#b5b8c8;
 }
 
@@ -258,8 +253,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid, textarea.x-form-invalid {
-    background-color:#fff;
-    background-image:url(../images/default/grid/invalid_line.gif);
+    background: #fff url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -269,14 +263,12 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid.x-form-composite .x-form-invalid {
-    background-color:#fff;
-    background-image:url(../images/default/grid/invalid_line.gif);
+    background: #fff url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid {
-    background-color:#fff;
-    background-image:url(../images/default/grid/invalid_line.gif);
+    background: #fff url(../images/default/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -406,9 +398,8 @@ ul.x-tab-strip-bottom{
     background-image: url(../images/default/button/group-tb.gif);
 }.x-toolbar{
     border-color:#a9bfd3;
-    background-color:#d0def0;
-    background-image:url(../images/default/toolbar/bg.gif);
-}
+     background: #d0def0 url(../images/default/toolbar/bg.gif);
+ }
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
     font:normal 11px arial,tahoma, helvetica, sans-serif;
@@ -552,8 +543,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background-color: #fff;
-    background-image:url(../images/default/shared/loading-balls.gif);
+    background: #fff url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -567,8 +557,7 @@ ul.x-tab-strip-bottom{
 
 .x-grid3-row-over {
     border-color:#ddd;
-    background-color:#efefef;
-    background-image:url(../images/default/grid/row-over.gif);
+    background: #efefef url(../images/default/grid/row-over.gif);
 }
 
 .x-grid3-resize-proxy {
@@ -580,8 +569,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background-color:#f9f9f9;
-    background-image:url(../images/default/grid/grid3-hrow.gif);
+    background: #f9f9f9 url(../images/default/grid/grid3-hrow.gif);
 }
 
 .x-grid3-header-pop {
@@ -599,8 +587,7 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background-color:#ebf3fd;
-    background-image:url(../images/default/grid/grid3-hrow-over.gif);
+    background: #ebf3fd url(../images/default/grid/grid3-hrow-over.gif);
 
 }
 
@@ -625,8 +612,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background-color:#ebf3fd;
-    background-image:url(../images/default/grid/grid3-hrow-over.gif);
+    background: #ebf3fd url(../images/default/grid/grid3-hrow-over.gif);
     border-color:#aaccf6;
 }
 
@@ -662,8 +648,7 @@ td.grid-hd-group-cell {
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background-color:#ebeadb !important;
-    background-image:url(../images/default/grid/grid-hrow.gif) !important;
+    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
     color:#000;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -712,8 +697,7 @@ td.grid-hd-group-cell {
 }
 
 .x-grid3-hd-btn {
-    background-color:#c3daf9;
-    background-image:url(../images/default/grid/grid3-hd-btn.gif);
+    background: #c3daf9 url(../images/default/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -801,11 +785,9 @@ td.grid-hd-group-cell {
     border-top-color:#a3bae9;
 }.x-pivotgrid .x-grid3-header-offset table td {
     background: url(../images/default/grid/grid3-hrow.gif) repeat-x 50% 100%;
-    border-left: 1px solid;
-    border-right: 1px solid;
-    border-left-color: #EEE;
-    border-right-color: #D0D0D0;
-}
+     border-right: 1px solid #D0D0D0;
+     border-left: 1px solid #EEE;
+ }
 
 .x-pivotgrid .x-grid3-row-headers {
     background-color: #f9f9f9;
@@ -813,12 +795,9 @@ td.grid-hd-group-cell {
 
 .x-pivotgrid .x-grid3-row-headers table td {
     background: #EEE url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
-    border-left: 1px solid;
-    border-right: 1px solid;
-    border-left-color: #EEE;
-    border-right-color: #D0D0D0;
-    border-bottom: 1px solid;
-    border-bottom-color: #D0D0D0;
+    border-right: 1px solid #D0D0D0;
+    border-bottom: 1px solid #D0D0D0;
+    border-left: 1px solid #EEE;
     height: 18px;
 }
 .x-dd-drag-ghost{
@@ -1016,8 +995,7 @@ td.grid-hd-group-cell {
 }
 
 .x-date-inner th {
-    background-color:#dfecfb;
-    background-image:url(../images/default/shared/glass-bg.gif);
+    background: #dfecfb url(../images/default/shared/glass-bg.gif);
     border-bottom-color:#a3bad9;
     font:normal 10px arial, helvetica,tahoma,sans-serif;
     color:#233d6d;
@@ -1037,8 +1015,7 @@ td.grid-hd-group-cell {
 }
 
 .x-date-inner .x-date-selected a{
-    background-color:#dfecfb;
-    background-image:url(../images/default/shared/glass-bg.gif);
+    background: #dfecfb url(../images/default/shared/glass-bg.gif);
     border-color:#8db2e3;
 }
 
@@ -1056,8 +1033,7 @@ td.grid-hd-group-cell {
 
 .x-date-bottom {
     border-top-color:#a3bad9;
-    background-color:#dfecfb;
-    background-image:url(../images/default/shared/glass-bg.gif);
+    background: #dfecfb url(../images/default/shared/glass-bg.gif);
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1095,8 +1071,7 @@ td.grid-hd-group-cell {
 }
 
 .x-date-mp-btns {
-    background-color: #dfecfb;
-    background-image: url(../images/default/shared/glass-bg.gif);
+    background: #dfecfb url(../images/default/shared/glass-bg.gif);
 }
 
 .x-date-mp-btns td {
@@ -1113,8 +1088,7 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background-color: #dfecfb;
-    background-image: url(../images/default/shared/glass-bg.gif);
+    background: #dfecfb url(../images/default/shared/glass-bg.gif);
     border-color:#8db2e3;
 }
 
@@ -1162,9 +1136,8 @@ td.x-date-mp-sep {
 .x-tip-anchor {
     background-image:url(../images/default/qtip/tip-anchor-sprite.gif);
 }.x-menu {
-    background-color:#f0f0f0;
-    background-image:url(../images/default/menu/menu.gif);
-}
+     background: #f0f0f0 url(../images/default/menu/menu.gif);
+ }
 
 .x-menu-floating{
     border-color:#718bb7;
@@ -1192,8 +1165,7 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background-image: url(../images/default/menu/item-over.gif);
-    background-color: #dbecf4;
+    background: #dbecf4 url(../images/default/menu/item-over.gif);
     border-color:#aaccf6;
 }
 
@@ -1259,8 +1231,7 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background-color: #eee;
-    background-image: url(../images/default/box/tb.gif);
+    background: #eee url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 12px;
@@ -1399,8 +1370,7 @@ a.x-menu-item {
 }
 
 .x-panel-ml {
-    background-color: #fff;
-    background-image:url(../images/default/panel/left-right.gif);
+    background: #fff url(../images/default/panel/left-right.gif);
 }
 
 .x-panel-mr {
@@ -1580,13 +1550,11 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background-color:#e0e8f3;
-    background-image:url(../images/default/qtip/bg.gif);
+    background: #e0e8f3 url(../images/default/qtip/bg.gif);
 }
 
 .x-progress-bar {
-    background-color:#9cbfee;
-    background-image:url(../images/default/progress/progress-bg.gif);
+    background: #9cbfee url(../images/default/progress/progress-bg.gif);
     border-top-color:#d1e4fd;
     border-bottom-color:#7fa9e4;
     border-right-color:#7fa9e4;
@@ -1601,9 +1569,8 @@ body.x-body-masked .x-window-plain .x-window-mc {
 .x-progress-text-back {
     color:#396095;
 }.x-list-header{
-    background-color:#f9f9f9;
-    background-image:url(../images/default/grid/grid3-hrow.gif);
-}
+     background: #f9f9f9 url(../images/default/grid/grid3-hrow.gif);
+ }
 
 .x-list-header-inner div em {
     border-left-color:#ddd;
diff --git a/deluge/ui/web/themes/css/xtheme-gray.css b/deluge/ui/web/themes/css/xtheme-gray.css
index 923fdc5d8..6d957785f 100644
--- a/deluge/ui/web/themes/css/xtheme-gray.css
+++ b/deluge/ui/web/themes/css/xtheme-gray.css
@@ -10,9 +10,7 @@
 
 .ext-el-mask-msg {
     border-color:#999;
-    background-color:#ddd;
-    background-image:url(../images/gray/panel/white-top-bottom.gif);
-    background-position: 0 -1px;
+    background: #ddd url(../images/gray/panel/white-top-bottom.gif) 0 -1px;
 }
 .ext-el-mask-msg div {
     background-color: #eee;
@@ -22,8 +20,7 @@
 }
 
 .x-mask-loading div {
-    background-color:#fbfbfb;
-    background-image:url(../images/default/grid/loading.gif);
+    background: #fbfbfb url(../images/default/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -92,14 +89,12 @@
 }
 
 ul.x-tab-strip-top{
-    background-color:#dbdbdb;
-    background-image: url(../images/gray/tabs/tab-strip-bg.gif);
+    background: #dbdbdb url(../images/gray/tabs/tab-strip-bg.gif);
     border-bottom-color:#d0d0d0;
 }
 
 ul.x-tab-strip-bottom{
-    background-color:#dbdbdb;
-    background-image: url(../images/gray/tabs/tab-strip-btm-bg.gif);
+    background: #dbdbdb url(../images/gray/tabs/tab-strip-btm-bg.gif);
     border-top-color:#d0d0d0;
 }
 
@@ -206,8 +201,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-text, textarea.x-form-field{
-    background-color:#fff;
-    background-image:url(../images/default/form/text-bg.gif);
+    background: #fff url(../images/default/form/text-bg.gif);
     border-color:#C1C1C1;
 }
 
@@ -259,8 +253,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid, textarea.x-form-invalid{
-    background-color:#fff;
-    background-image:url(../images/default/grid/invalid_line.gif);
+    background: #fff url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -270,8 +263,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid{
-    background-color:#fff;
-    background-image:url(../images/default/grid/invalid_line.gif);
+    background: #fff url(../images/default/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -401,8 +393,7 @@ ul.x-tab-strip-bottom{
 }
 .x-toolbar{
     border-color:#d0d0d0;
-    background-color:#f0f0f0;
-    background-image:url(../images/gray/toolbar/bg.gif);
+    background: #f0f0f0 url(../images/gray/toolbar/bg.gif);
 }
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
@@ -547,8 +538,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background-color: #fff;
-    background-image:url(../images/default/shared/loading-balls.gif);
+    background: #fff url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -562,8 +552,7 @@ ul.x-tab-strip-bottom{
 
 .x-grid3-row-over {
     border-color:#ddd;
-    background-color:#efefef;
-    background-image:url(../images/default/grid/row-over.gif);
+    background: #efefef url(../images/default/grid/row-over.gif);
 }
 
 .x-grid3-resize-proxy {
@@ -575,8 +564,7 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background-color:#f9f9f9;
-    background-image:url(../images/gray/grid/grid3-hrow2.gif);
+    background: #f9f9f9 url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-grid3-header-pop {
@@ -594,8 +582,7 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background-color:#f9f9f9;
-    background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
+    background: #f9f9f9 url(../images/gray/grid/grid3-hrow-over2.gif);
 
 }
 
@@ -620,8 +607,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background-color:#f9f9f9;
-    background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
+    background: #f9f9f9 url(../images/gray/grid/grid3-hrow-over2.gif);
     border-color:#ACACAC;
 }
 
@@ -653,8 +639,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background-color:#ebeadb !important;
-    background-image:url(../images/default/grid/grid-hrow.gif) !important;
+    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
     color:#000;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -703,8 +688,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-hd-btn {
-    background-color:#f9f9f9;
-    background-image:url(../images/gray/grid/grid3-hd-btn.gif);
+    background: #f9f9f9 url(../images/gray/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -797,10 +781,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 .x-pivotgrid .x-grid3-header-offset table td {
     background: url(../images/gray/grid/grid3-hrow2.gif) repeat-x 50% 100%;
-    border-left: 1px solid;
-    border-right: 1px solid;
-    border-left-color: #D0D0D0;
-    border-right-color: #D0D0D0;
+    border-right: 1px solid #D0D0D0;
+    border-left: 1px solid #D0D0D0;
 }
 
 .x-pivotgrid .x-grid3-row-headers {
@@ -809,12 +791,9 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-pivotgrid .x-grid3-row-headers table td {
     background: #EEE url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
-    border-left: 1px solid;
-    border-right: 1px solid;
-    border-left-color: #EEE;
-    border-right-color: #D0D0D0;
-    border-bottom: 1px solid;
-    border-bottom-color: #D0D0D0;
+    border-right: 1px solid #D0D0D0;
+    border-bottom: 1px solid #D0D0D0;
+    border-left: 1px solid #EEE;
     height: 18px;
 }
 .x-dd-drag-ghost{
@@ -1018,8 +997,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner th {
-    background-color:#D8D8D8;
-    background-image: url(../images/gray/panel/white-top-bottom.gif);
+    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif);
     border-bottom-color:#AFAFAF;
     font:normal 10px arial, helvetica,tahoma,sans-serif;
     color:#595959;
@@ -1039,8 +1017,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner .x-date-selected a{
-    background-image: none;
-    background-color:#D8D8D8;
+    background: #D8D8D8 none;
     border-color:#DCDCDC;
 }
 
@@ -1058,8 +1035,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-date-bottom {
     border-top-color:#AFAFAF;
-    background-color:#D8D8D8;
-    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1097,8 +1073,7 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-mp-btns {
-    background-color:#D8D8D8;
-    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-mp-btns td {
@@ -1115,8 +1090,7 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background-color:#D8D8D8;
-    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
     border-color:#DCDCDC;
 }
 
@@ -1164,9 +1138,8 @@ td.x-date-mp-sep {
 .x-tip-anchor {
     background-image:url(../images/gray/qtip/tip-anchor-sprite.gif);
 }.x-menu {
-    background-color:#f0f0f0;
-    background-image:url(../images/default/menu/menu.gif);
-}
+     background: #f0f0f0 url(../images/default/menu/menu.gif);
+ }
 
 .x-menu-floating{
     border-color:#7D7D7D;
@@ -1194,8 +1167,7 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background-image: url(../images/gray/menu/item-over.gif);
-    background-color: #f1f1f1;
+    background: #f1f1f1 url(../images/gray/menu/item-over.gif);
     border-color:#ACACAC;
 }
 
@@ -1255,8 +1227,7 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background-color: #eee;
-    background-image: url(../images/default/box/tb.gif);
+    background: #eee url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 12px;
@@ -1396,8 +1367,7 @@ a.x-menu-item {
 }
 
 .x-panel-ml {
-    background-color: #fff;
-    background-image:url(../images/gray/panel/left-right.gif);
+    background: #fff url(../images/gray/panel/left-right.gif);
 }
 
 .x-panel-mr {
@@ -1585,13 +1555,11 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background-color:#E7E7E7;
-    background-image:url(../images/gray/qtip/bg.gif);
+    background: #E7E7E7 url(../images/gray/qtip/bg.gif);
 }
 
 .x-progress-bar {
-    background-color:#BCBCBC;
-    background-image:url(../images/gray/progress/progress-bg.gif);
+    background: #BCBCBC url(../images/gray/progress/progress-bg.gif);
     border-top-color:#E2E2E2;
     border-bottom-color:#A4A4A4;
     border-right-color:#A4A4A4;
@@ -1607,8 +1575,7 @@ body.x-body-masked .x-window-plain .x-window-mc {
     color:#5F5F5F;
 }
 .x-list-header{
-    background-color:#f9f9f9;
-    background-image:url(../images/gray/grid/grid3-hrow2.gif);
+    background: #f9f9f9 url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-list-header-inner div em {