Bug 1369872 - Combine skins/custom/Mozilla/*.css and skins/contrib/*.css into skins/standard/*.css

* Move bug_groups from custom to standard

* More modified bug_group files

* Combine skin CSS files

* Move .png files to standard

* Move css from global.css that belongs in index.css

* Changes to css placement

* All images within skins/standard moved to images folder

* Fix font issue

* Updates

* Updates

* Fix mistake

76 files changed, 1216 insertions, 2935 deletions

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 7d5f6fa2e..9c8f39b4a 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -83,19 +83,19 @@ use Memoize;
     CMT_ATTACHMENT_UPDATED
 
     THROW_ERROR
-    
+
     RELATIONSHIPS
     REL_ASSIGNEE REL_QA REL_REPORTER REL_CC REL_GLOBAL_WATCHER
     REL_ANY
-    
+
     POS_EVENTS
     EVT_OTHER EVT_ADDED_REMOVED EVT_COMMENT EVT_ATTACHMENT EVT_ATTACHMENT_DATA
     EVT_PROJ_MANAGEMENT EVT_OPENED_CLOSED EVT_KEYWORD EVT_CC EVT_DEPEND_BLOCK
     EVT_BUG_CREATED EVT_COMPONENT
 
     NEG_EVENTS
-    EVT_UNCONFIRMED EVT_CHANGED_BY_ME 
-        
+    EVT_UNCONFIRMED EVT_CHANGED_BY_ME
+
     GLOBAL_EVENTS
     EVT_FLAG_REQUESTED EVT_REQUESTED_FLAG
 
@@ -119,7 +119,7 @@ use Memoize;
     FIELD_TYPE_EXTENSION
 
     FIELD_TYPE_HIGHEST_PLUS_ONE
-    
+
     EMPTY_DATETIME_REGEX
 
     ABNORMAL_SELECTS
@@ -180,7 +180,7 @@ use Memoize;
 
     PASSWORD_DIGEST_ALGORITHM
     PASSWORD_SALT_LENGTH
-    
+
     CGI_URI_LIMIT
 
     PRIVILEGES_REQUIRED_NONE
@@ -238,9 +238,9 @@ use constant NOT_NULL => '  __NOT_NULL__  ';
 #
 # ControlMap constants for group_control_map.
 # membercontol:othercontrol => meaning
-# Na:Na               => Bugs in this product may not be restricted to this 
+# Na:Na               => Bugs in this product may not be restricted to this
 #                        group.
-# Shown:Na            => Members of the group may restrict bugs 
+# Shown:Na            => Members of the group may restrict bugs
 #                        in this product to this group.
 # Shown:Shown         => Members of the group may restrict bugs
 #                        in this product to this group.
@@ -355,7 +355,7 @@ use constant RELATIONSHIPS => {
     REL_CC            , "CC",
     REL_GLOBAL_WATCHER, "GlobalWatcher"
 };
-                              
+
 # Used for global events like EVT_FLAG_REQUESTED
 use constant REL_ANY                => 100;
 
@@ -378,8 +378,8 @@ use constant EVT_DEPEND_BLOCK       => 9;
 use constant EVT_BUG_CREATED        => 10;
 use constant EVT_COMPONENT          => 11;
 
-use constant POS_EVENTS => EVT_OTHER, EVT_ADDED_REMOVED, EVT_COMMENT, 
-                           EVT_ATTACHMENT, EVT_ATTACHMENT_DATA, 
+use constant POS_EVENTS => EVT_OTHER, EVT_ADDED_REMOVED, EVT_COMMENT,
+                           EVT_ATTACHMENT, EVT_ATTACHMENT_DATA,
                            EVT_PROJ_MANAGEMENT, EVT_OPENED_CLOSED, EVT_KEYWORD,
                            EVT_CC, EVT_DEPEND_BLOCK, EVT_BUG_CREATED,
                            EVT_COMPONENT;
@@ -432,7 +432,7 @@ use constant FIELD_TYPE_EXTENSION => 99;
 # obvious fashion
 use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 100;
 
-use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/; 
+use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/;
 
 # See the POD for Bugzilla::Field/is_abnormal to see why these are listed
 # here.
@@ -482,7 +482,7 @@ use constant contenttypes =>
    "rdf"  => "application/rdf+xml" ,
    "atom" => "application/atom+xml" ,
    "xml"  => "application/xml" ,
-   "dtd"  => "application/xml-dtd" , 
+   "dtd"  => "application/xml-dtd" ,
    "js"   => "application/x-javascript" ,
    "json" => "application/json" ,
    "csv"  => "text/csv" ,
@@ -521,7 +521,7 @@ use constant INSTALLATION_MODE_NON_INTERACTIVE => 1;
 use constant DB_MODULE => {
     # Require MySQL 5.6.x for innodb's fulltext support
     'mysql' => {db => 'Bugzilla::DB::Mysql', db_version => '5.6.12',
-                dbd => { 
+                dbd => {
                     package => 'DBD-mysql',
                     module  => 'DBD::mysql',
                     # Disallow development versions
@@ -678,7 +678,7 @@ sub _bz_locations {
     }
 
     $datadir = "$libpath/$datadir";
-    # We have to return absolute paths for mod_perl. 
+    # We have to return absolute paths for mod_perl.
     # That means that if you modify these paths, they must be absolute paths.
     return {
         'libpath'        => $libpath,
diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
index 73d4d2b4d..bc8356c7b 100644
--- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -40,7 +40,7 @@ label.required:before {
    generate_api_token = 1
    style = inline_style
    style_urls = [ 'skins/standard/attachment.css',
-                  'skins/custom/create_bug.css' ]
+                  'skins/standard/create_bug.css' ]
    javascript_urls = [ 'js/attachment.js', 'js/field.js' ]
 %]
 
diff --git a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
index 0243345bb..a9d3146f1 100644
--- a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
@@ -19,15 +19,15 @@
 [% END %]
 
 [%# Change the background/border for bugs/attachments in certain bug groups %]
-[% IF template.name == 'attachment/edit.html.tmpl' 
+[% IF template.name == 'attachment/edit.html.tmpl'
       || template.name == 'attachment/create.html.tmpl'
       || template.name == 'attachment/diff-header.html.tmpl' %]
-  [% style_urls.push("skins/custom/bug_groups.css") %]
+  [% style_urls.push("skins/standard/bug_groups.css") %]
 
   [% IF template.name == 'attachment/edit.html.tmpl'
         || template.name == 'attachment/diff-header.html.tmpl' %]
     [% IF bodyclasses == 'no_javascript' %]
-      [% bodyclasses = ['no_javascript'] %] 
+      [% bodyclasses = ['no_javascript'] %]
     [% END %]
     [% FOREACH group = attachment.bug.groups_in %]
       [% bodyclasses.push("bz_group_$group.name") %]
diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
index 94b9d57fc..20f1aebb0 100644
--- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
@@ -66,7 +66,7 @@
   style_urls.push(
     "extensions/BugModal/web/bug_modal.css",
     "extensions/BugModal/web/dropdown.css",
-    "skins/custom/bug_groups.css",
+    "skins/standard/bug_groups.css",
     "js/jquery/plugins/datetimepicker/datetimepicker.css",
     "js/jquery/plugins/contextMenu/contextMenu.css"
   );
diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
index 64b4f3073..f2cd15d39 100644
--- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
@@ -11,7 +11,7 @@
 [% PROCESS global/header.html.tmpl
    title = "Mozilla Project Review"
    generate_api_token = 1
-   style_urls = [ 'skins/custom/create_bug.css',
+   style_urls = [ 'skins/standard/create_bug.css',
                   'extensions/MozProjectReview/web/style/moz_project_review.css'
                   'js/jquery/plugins/datetimepicker/datetimepicker.css' ]
    javascript_urls = [ 'js/field.js', 'js/util.js',
diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
index c2640b422..df5dd75ce 100644
--- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
+++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
@@ -28,7 +28,7 @@
   generate_api_token = 1
   header = "Patch Review"
   style_urls = [ "extensions/Splinter/web/splinter.css",
-                 "skins/custom/bug_groups.css" ]
+                 "skins/standard/bug_groups.css" ]
   javascript_urls = [ "js/yui.js",
                       "extensions/Splinter/web/splinter.js",
                       "js/field.js" ]
diff --git a/skins/contrib/Mozilla-OpenSans/bugzilla-magnifier.png b/images/bugzilla-magnifier.png
index b859b1668..b859b1668 100644
--- a/skins/contrib/Mozilla-OpenSans/bugzilla-magnifier.png
+++ b/images/bugzilla-magnifier.png
diff --git a/skins/contrib/Mozilla-OpenSans/bugzilla-papericon.png b/images/bugzilla-papericon.png
index 677567929..677567929 100644
--- a/skins/contrib/Mozilla-OpenSans/bugzilla-papericon.png
+++ b/images/bugzilla-papericon.png
diff --git a/skins/contrib/Mozilla-OpenSans/bugzilla-person-alternate.png b/images/bugzilla-person-alternate.png
index a9e9ff213..a9e9ff213 100644
--- a/skins/contrib/Mozilla-OpenSans/bugzilla-person-alternate.png
+++ b/images/bugzilla-person-alternate.png
diff --git a/skins/contrib/Mozilla-OpenSans/bugzilla-person.png b/images/bugzilla-person.png
index 62351c265..62351c265 100644
--- a/skins/contrib/Mozilla-OpenSans/bugzilla-person.png
+++ b/images/bugzilla-person.png
diff --git a/skins/contrib/Mozilla-OpenSans/bugzilla-questionmark2.png b/images/bugzilla-questionmark2.png
index 441d07f93..441d07f93 100644
--- a/skins/contrib/Mozilla-OpenSans/bugzilla-questionmark2.png
+++ b/images/bugzilla-questionmark2.png
diff --git a/skins/contrib/Mozilla-OpenSans/dropdown.png b/images/dropdown.png
index e01e5e51d..e01e5e51d 100644
--- a/skins/contrib/Mozilla-OpenSans/dropdown.png
+++ b/images/dropdown.png
diff --git a/skins/contrib/Mozilla-OpenSans/footer-mozilla.png b/images/footer-mozilla.png
index 593c10308..593c10308 100644
--- a/skins/contrib/Mozilla-OpenSans/footer-mozilla.png
+++ b/images/footer-mozilla.png
diff --git a/skins/contrib/Mozilla-OpenSans/grain.png b/images/grain.png
index 2980ee90e..2980ee90e 100644
--- a/skins/contrib/Mozilla-OpenSans/grain.png
+++ b/images/grain.png
diff --git a/skins/contrib/Mozilla-OpenSans/noise.png b/images/noise.png
index 97407ffd2..97407ffd2 100644
--- a/skins/contrib/Mozilla-OpenSans/noise.png
+++ b/images/noise.png
diff --git a/skins/contrib/Mozilla-OpenSans/tabzilla.png b/images/tabzilla.png
index 7619610c3..7619610c3 100644
--- a/skins/contrib/Mozilla-OpenSans/tabzilla.png
+++ b/images/tabzilla.png
diff --git a/skins/standard/throbber.gif b/images/throbber.gif
index bc4fa6561..bc4fa6561 100644
--- a/skins/standard/throbber.gif
+++ b/images/throbber.gif
diff --git a/skins/README b/skins/README
deleted file mode 100644
index d649350b9..000000000
--- a/skins/README
+++ /dev/null
@@ -1,18 +0,0 @@
-There are three directories here, standard/, custom/, and contrib/.
-
-standard/ holds the standard stylesheets. These are used no matter what skin
-the user selects. If the user selects the "Classic" skin, then *only* the
-standard/ stylesheets are used.
-
-contrib/ holds "skins" that the user can select in their preferences.  skins
-are in directories, and they contain files with the same names as the files in
-skins/standard/. Simply putting a new directory into the contrib/ directory
-adds a new skin as an option in users' preferences.
-
-custom/ allows you to locally override the standard/ and contrib/ CSS.  If you
-put files into the custom/ directory with the same names as the CSS files in
-skins/standard/, you can override the standard/ and contrib/ CSS. For example,
-if you want to override some CSS in skins/standard/global.css, then you should
-create a file called "global.css" in custom/ and put some CSS in it. The CSS
-you put into files in custom/ will be used *in addition* to the CSS in
-skins/standard/ or the CSS in skins/contrib/. It will apply to every skin.
diff --git a/skins/contrib/Dusk-Helvetica/buglist.css b/skins/contrib/Dusk-Helvetica/buglist.css
deleted file mode 100644
index 2e14368b1..000000000
--- a/skins/contrib/Dusk-Helvetica/buglist.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  */
-
-tr.bz_bugitem:hover {
-    background-color: #ccccff;
-}
diff --git a/skins/contrib/Dusk-Helvetica/global.css b/skins/contrib/Dusk-Helvetica/global.css
deleted file mode 100644
index 8478c1a88..000000000
--- a/skins/contrib/Dusk-Helvetica/global.css
+++ /dev/null
@@ -1,263 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Frédéric Buclin <LpSolit@gmail.com>
-  */
-
-body {
-    background: #c8c8c8;
-    font-family: "Helvetica Neue", "Nimbus Sans L", Arial, sans-serif;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-body, td, th, input {
-    font-family: "Helvetica Neue", "Nimbus Sans L", Arial, sans-serif;
-}
-
-/* page title */
-
-#titles {
-    -moz-border-radius-topleft: 5px;
-    -moz-border-radius-topright: 5px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-}
-
-#header .links, #footer {
-    background-color: #929bb1;
-    color: #ddd;
-}
-
-#header {
-    -moz-border-radius-bottomleft: 5px;
-    -moz-border-radius-bottomright: 5px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border: none;
-}
-
-#header a, #footer a {
-    color: white;
-    text-decoration: none;
-}
-#header a:hover, #footer a:hover {
-    text-decoration: underline;
-}
-
-/* body */
-
-#bugzilla-body {
-    background: #f0f0f0;
-    color: black;
-    border: 1px solid #747e93;
-    padding: 10px;
-    font-size: 10pt;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-a {
-    color: #6070cf;
-}
-a:hover {
-    color: #8090ef;
-}
-
-hr {
-  border-color: #969696;
-  border-style: dashed;
-  border-width: 1px;
-  margin-top: 10px;
-}
-
-/* edit */
-
-#bugzilla-body th {
-    font-weight: bold;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#bug-form td {
-    padding-top: 2px;
-}
-
-/* attachments */
-
-#attachment-list {
-    border: 2px solid #c8c8ba;
-    font-size: 9pt;
-}
-
-#attachment-list th {
-    background-color: #e6e6d8;
-    border: none;
-    border-bottom: 1px solid #c8c8ba;
-    text-align: left;
-}
-
-#attachment-list th a {
-    color: #646456;
-}
-
-#attachment-list td {
-    border: none;
-}
-
-#attachment-list-actions td {
-    border-top: 1px solid #c8c8ba;
-}
-
-/************/
-/* Comments */
-/************/
-
-#comments th {
-    font-size: 9pt;
-    font-weight: bold;
-    padding-top: 5px;
-    padding-right: 5px;
-    padding-bottom: 10px;
-    text-align: right;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#comments td {
-    padding-top: 2px;
-}
-
-.reply-button a {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.bz_comment {
-    background-color: #e8e8e8;
-    margin: 1px 1px 10px 1px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #c8c8ba;
-    padding: 5px;
-    font-size: 9pt;
-}
-
-.bz_comment_head, .bz_first_comment_head {
-    margin: 0; padding: 0;
-    background-color: transparent;
-    font-weight: bold;
-}
-
-.bz_comment_user {
-    margin-left: 0;
-}
-
-.bz_comment.bz_private {
-    background-color: #f0e8e8;
-    border-color: #f8c8ba;
-}
-
-.comment_rule {
-    display: none;
-}
-
-/* footer */
-
-#footer {
-    border: 1px solid #747e93;
-    width: 100%;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-#footer #links-actions,
-#footer #links-edit,
-#footer #links-saved,
-#footer #links-special {
-    margin-top: 2ex;
-}
-
-#footer .links {
-    border-spacing: 30px;
-    margin-bottom: 2ex;
-}
-
-.separator {
-    color: #cccccc;
-}
-
-/* tabs */
-
-.tabbed .tabbody {
-    background: #f8f8f8;
-    padding: 1em;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 0 3px 3px 1px;
-}
-
-.tabs {
-    margin: 0;
-    padding: 0;
-    border-collapse: collapse;
-}
-
-.tabs td {
-    background: #c8c8c8;
-    border-width: 1px;
-}
-
-.tabs td.selected {
-    background: #f8f8f8;
-    border-width: 1px 3px 0 1px;
-}
-
-.tabs td.spacer {
-    background: transparent;
-    border-top: none;
-    border-left: none;
-    border-right: none;
-}
-
-/* other */
-
-.bz_row_odd {
-    background-color: #f0f0f0;
-}
-
-/* Rules specific for printing */
-@media print {
-    #header,
-    #footer,
-    .navigation {
-        display: none;
-    }
-
-    body {
-        background-image: none;
-        background-color: #ffffff;
-    }
-
-    #bugzilla-body {
-        border: none;
-        margin: 0;
-        padding: 0;
-    }
-}
diff --git a/skins/contrib/Dusk-Helvetica/index.css b/skins/contrib/Dusk-Helvetica/index.css
deleted file mode 100644
index c9c2d1705..000000000
--- a/skins/contrib/Dusk-Helvetica/index.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Custom rules for index.css.
- * The rules you put here override rules in that stylesheet.
- */
-    
-    div#page-index .outro 
-    {
-        clear:both;
-    }
diff --git a/skins/contrib/Dusk-Segoe/buglist.css b/skins/contrib/Dusk-Segoe/buglist.css
deleted file mode 100644
index 2e14368b1..000000000
--- a/skins/contrib/Dusk-Segoe/buglist.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  */
-
-tr.bz_bugitem:hover {
-    background-color: #ccccff;
-}
diff --git a/skins/contrib/Dusk-Segoe/global.css b/skins/contrib/Dusk-Segoe/global.css
deleted file mode 100644
index f431aceba..000000000
--- a/skins/contrib/Dusk-Segoe/global.css
+++ /dev/null
@@ -1,263 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Frédéric Buclin <LpSolit@gmail.com>
-  */
-
-body {
-    background: #c8c8c8;
-    font-family: Segoe, "Segoe UI", "Helvetica Neue", Verdana, sans-serif;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-body, td, th, input {
-    font-family: Segoe, "Segoe UI", "Helvetica Neue", Verdana, sans-serif;
-}
-
-/* page title */
-
-#titles {
-    -moz-border-radius-topleft: 5px;
-    -moz-border-radius-topright: 5px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-}
-
-#header .links, #footer {
-    background-color: #929bb1;
-    color: #ddd;
-}
-
-#header {
-    -moz-border-radius-bottomleft: 5px;
-    -moz-border-radius-bottomright: 5px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border: none;
-}
-
-#header a, #footer a {
-    color: white;
-    text-decoration: none;
-}
-#header a:hover, #footer a:hover {
-    text-decoration: underline;
-}
-
-/* body */
-
-#bugzilla-body {
-    background: #f0f0f0;
-    color: black;
-    border: 1px solid #747e93;
-    padding: 10px;
-    font-size: 10pt;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-a {
-    color: #6070cf;
-}
-a:hover {
-    color: #8090ef;
-}
-
-hr {
-  border-color: #969696;
-  border-style: dashed;
-  border-width: 1px;
-  margin-top: 10px;
-}
-
-/* edit */
-
-#bugzilla-body th {
-    font-weight: bold;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#bug-form td {
-    padding-top: 2px;
-}
-
-/* attachments */
-
-#attachment-list {
-    border: 2px solid #c8c8ba;
-    font-size: 9pt;
-}
-
-#attachment-list th {
-    background-color: #e6e6d8;
-    border: none;
-    border-bottom: 1px solid #c8c8ba;
-    text-align: left;
-}
-
-#attachment-list th a {
-    color: #646456;
-}
-
-#attachment-list td {
-    border: none;
-}
-
-#attachment-list-actions td {
-    border-top: 1px solid #c8c8ba;
-}
-
-/************/
-/* Comments */
-/************/
-
-#comments th {
-    font-size: 9pt;
-    font-weight: bold;
-    padding-top: 5px;
-    padding-right: 5px;
-    padding-bottom: 10px;
-    text-align: right;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#comments td {
-    padding-top: 2px;
-}
-
-.reply-button a {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.bz_comment {
-    background-color: #e8e8e8;
-    margin: 1px 1px 10px 1px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #c8c8ba;
-    padding: 5px;
-    font-size: 9pt;
-}
-
-.bz_comment_head, .bz_first_comment_head {
-    margin: 0; padding: 0;
-    background-color: transparent;
-    font-weight: bold;
-}
-
-.bz_comment_user {
-    margin-left: 0;
-}
-
-.bz_comment.bz_private {
-    background-color: #f0e8e8;
-    border-color: #f8c8ba;
-}
-
-.comment_rule {
-    display: none;
-}
-
-/* footer */
-
-#footer {
-    border: 1px solid #747e93;
-    width: 100%;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-#footer #links-actions,
-#footer #links-edit,
-#footer #links-saved,
-#footer #links-special {
-    margin-top: 2ex;
-}
-
-#footer .links {
-    border-spacing: 30px;
-    margin-bottom: 2ex;
-}
-
-.separator {
-    color: #cccccc;
-}
-
-/* tabs */
-
-.tabbed .tabbody {
-    background: #f8f8f8;
-    padding: 1em;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 0 3px 3px 1px;
-}
-
-.tabs {
-    margin: 0;
-    padding: 0;
-    border-collapse: collapse;
-}
-
-.tabs td {
-    background: #c8c8c8;
-    border-width: 1px;
-}
-
-.tabs td.selected {
-    background: #f8f8f8;
-    border-width: 1px 3px 0 1px;
-}
-
-.tabs td.spacer {
-    background: transparent;
-    border-top: none;
-    border-left: none;
-    border-right: none;
-}
-
-/* other */
-
-.bz_row_odd {
-    background-color: #f0f0f0;
-}
-
-/* Rules specific for printing */
-@media print {
-    #header,
-    #footer,
-    .navigation {
-        display: none;
-    }
-
-    body {
-        background-image: none;
-        background-color: #ffffff;
-    }
-
-    #bugzilla-body {
-        border: none;
-        margin: 0;
-        padding: 0;
-    }
-}
diff --git a/skins/contrib/Dusk-Segoe/index.css b/skins/contrib/Dusk-Segoe/index.css
deleted file mode 100644
index c9c2d1705..000000000
--- a/skins/contrib/Dusk-Segoe/index.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Custom rules for index.css.
- * The rules you put here override rules in that stylesheet.
- */
-    
-    div#page-index .outro 
-    {
-        clear:both;
-    }
diff --git a/skins/contrib/Dusk-Segoe/show_bug.css b/skins/contrib/Dusk-Segoe/show_bug.css
deleted file mode 100644
index 92e52d02e..000000000
--- a/skins/contrib/Dusk-Segoe/show_bug.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.bz_comment {
-    font-size: small;
-}
diff --git a/skins/contrib/Dusk/buglist.css b/skins/contrib/Dusk/buglist.css
deleted file mode 100644
index 2e14368b1..000000000
--- a/skins/contrib/Dusk/buglist.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  */
-
-tr.bz_bugitem:hover {
-    background-color: #ccccff;
-}
diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css
deleted file mode 100644
index 33f28965c..000000000
--- a/skins/contrib/Dusk/global.css
+++ /dev/null
@@ -1,257 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (the "License"); you may not use this file
-  * except in compliance with the License. You may obtain a copy of
-  * the License at http://www.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Frédéric Buclin <LpSolit@gmail.com>
-  */
-
-body {
-    background: #c8c8c8;
-    font-family: Verdana, sans-serif;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-body, td, th, input {
-    font-family: Verdana, sans-serif;
-}
-
-/* page title */
-
-#titles {
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-}
-
-#header .links, #footer {
-    background-color: #929bb1;
-    color: #ddd;
-}
-
-#header {
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border: none;
-}
-
-#header a, #footer a {
-    color: white;
-    text-decoration: none;
-}
-#header a:hover, #footer a:hover {
-    text-decoration: underline;
-}
-
-/* body */
-
-#bugzilla-body {
-    background: #f0f0f0;
-    color: black;
-    border: 1px solid #747e93;
-    padding: 10px;
-    font-size: 10pt;
-    border-radius: 5px;
-}
-
-a {
-    color: #6070cf;
-}
-a:hover {
-    color: #8090ef;
-}
-
-hr {
-  border-color: #969696;
-  border-style: dashed;
-  border-width: 1px;
-  margin-top: 10px;
-}
-
-/* edit */
-
-#bugzilla-body th {
-    font-weight: bold;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#bug-form td {
-    padding-top: 2px;
-}
-
-/* attachments */
-
-#attachment-list {
-    border: 2px solid #c8c8ba;
-    font-size: 9pt;
-}
-
-#attachment-list th {
-    background-color: #e6e6d8;
-    border: none;
-    border-bottom: 1px solid #c8c8ba;
-    text-align: left;
-}
-
-#attachment-list th a {
-    color: #646456;
-}
-
-#attachment-list td {
-    border: none;
-}
-
-#attachment-list-actions td {
-    border-top: 1px solid #c8c8ba;
-}
-
-/************/
-/* Comments */
-/************/
-
-#comments th {
-    font-size: 9pt;
-    font-weight: bold;
-    padding-top: 5px;
-    padding-right: 5px;
-    padding-bottom: 10px;
-    text-align: right;
-    vertical-align: top;
-    white-space: nowrap;
-}
-
-#comments td {
-    padding-top: 2px;
-}
-
-.reply-button a {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.bz_comment {
-    background-color: #e8e8e8;
-    margin: 1px 1px 10px 1px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #c8c8ba;
-    padding: 5px;
-    font-size: 9pt;
-}
-
-.bz_comment_head, .bz_first_comment_head {
-    margin: 0; padding: 0;
-    background-color: transparent;
-    font-weight: bold;
-}
-
-.bz_comment_user {
-    margin-left: 0;
-}
-
-.bz_comment.bz_private {
-    background-color: #f0e8e8;
-    border-color: #f8c8ba;
-}
-
-.comment_rule {
-    display: none;
-}
-
-/* footer */
-
-#footer {
-    border: 1px solid #747e93;
-    width: 100%;
-    border-radius: 5px;
-}
-
-#footer #links-actions,
-#footer #links-edit,
-#footer #links-saved,
-#footer #links-special {
-    margin-top: 2ex;
-}
-
-#footer .links {
-    border-spacing: 30px;
-    margin-bottom: 2ex;
-}
-
-.separator {
-    color: #cccccc;
-}
-
-/* tabs */
-
-.tabbed .tabbody {
-    background: #f8f8f8;
-    padding: 1em;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 0 3px 3px 1px;
-}
-
-.tabs {
-    margin: 0;
-    padding: 0;
-    border-collapse: collapse;
-}
-
-.tabs td {
-    background: #c8c8c8;
-    border-width: 1px;
-}
-
-.tabs td.selected {
-    background: #f8f8f8;
-    border-width: 1px 3px 0 1px;
-}
-
-.tabs td.spacer {
-    background: transparent;
-    border-top: none;
-    border-left: none;
-    border-right: none;
-}
-
-/* other */
-
-.bz_row_odd {
-    background-color: #f0f0f0;
-}
-
-/* Rules specific for printing */
-@media print {
-    #header,
-    #footer,
-    .navigation {
-        display: none;
-    }
-
-    body {
-        background-image: none;
-        background-color: #ffffff;
-    }
-
-    #bugzilla-body {
-        border: none;
-        margin: 0;
-        padding: 0;
-    }
-}
diff --git a/skins/contrib/Dusk/index.css b/skins/contrib/Dusk/index.css
deleted file mode 100644
index c9c2d1705..000000000
--- a/skins/contrib/Dusk/index.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Custom rules for index.css.
- * The rules you put here override rules in that stylesheet.
- */
-    
-    div#page-index .outro 
-    {
-        clear:both;
-    }
diff --git a/skins/contrib/Mozilla-OpenSans/global.css b/skins/contrib/Mozilla-OpenSans/global.css
deleted file mode 100644
index 7b600f1fb..000000000
--- a/skins/contrib/Mozilla-OpenSans/global.css
+++ /dev/null
@@ -1,799 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0. */
-
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans'), local('OpenSans'), url(opensans.woff) format('woff');
-}
-
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 600;
-  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(opensans-semibold.woff) format('woff');
-}
-
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(opensans-bold.woff) format('woff');
-}
-
-body {
-    background: #f6f4ec;
-    background-image: url(noise.png);
-    background-image: url(noise.png), -moz-linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-image: url(noise.png), linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-repeat: repeat, repeat-x;
-    color: #404040;
-}
-
-body, td, th, input, select, option, optgroup, .text_input {
-    font-family: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-/* security group colouring */
-/* these are also defined in skins/custom/bug_groups.css */
-
-body[class*=bz_group_] {
-    background-color: inherit;
-    background-image: url(noise.png), -moz-linear-gradient(#d7d7ff, #f0f0ff 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#d7d7ff, #f0f0ff 400px);
-    background-image: url(noise.png), linear-gradient(#d7d7ff, #f0f0ff 400px);
-}
-
-body[class*=core-security],
-body.bz_group_infrasec {
-    background-image: url(noise.png), -moz-linear-gradient(#ffe0b0, #fff4e3 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffe0b0, #fff4e3 400px);
-    background-image: url(noise.png), linear-gradient(#ffe0b0, #fff4e3 400px);
-}
-
-body.bz_group_webtools-security,
-body.bz_group_websites-security,
-body.bz_group_bugzilla-security {
-    background-image: url(noise.png), -moz-linear-gradient(#ffcccc, #fff0f0 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffcccc, #fff0f0 400px);
-    background-image: url(noise.png), linear-gradient(#ffcccc, #fff0f0 400px);
-}
-
-body.bz_group_client-services-security,
-body.bz_group_cloud-services-security {
-    background-image: url(noise.png), -moz-linear-gradient(#ffffa3, #ffffe3 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffffa3, #ffffe3 400px);
-    background-image: url(noise.png), linear-gradient(#ffffa3, #ffffe3 400px);
-}
-
-a, #header a, #header a:visited, #footer a, #footer a:visited {
-    color: #0095dd;
-}
-
-a:hover, #header a:hover, #footer a:hover {
-    color: #00539f;
-}
-
-select[multiple], textarea, input[type=text], input[type=password],
-input[type=email], input[type=url], input[type=number], input:not([type]), .text_input, .yui-ac-input {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    border: 1px solid #b2b2b2;
-    border-radius: .25em;
-    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
-    background: white;
-    padding: 4px 3px 5px;
-    color: #404040;
-    vertical-align: top;
-}
-
-select[multiple], .text_input, .yui-ac-input, input {
-    font-size: 1em;
-}
-
-select[multiple]:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
-    border-color: #42a4e0;
-    -webkit-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-    -moz-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-    box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-}
-
-select, select[multiple] {
-    font-size: 12px;
-}
-
-hr {
-    border: none;
-    height: 1px;
-    color: #ccc;
-    background-color: #ccc;
-    margin: 1em 0;
-}
-
-#changeform hr {
-    display: none;
-}
-
-#header {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    background: #e5e3dc;
-    background: -moz-linear-gradient(#e5e3dc, #ecebe5);
-    background: -webkit-linear-gradient(#e5e3dc, #ecebe5);
-    background: linear-gradient(#e5e3dc, #ecebe5);
-    border-radius: 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    border-top: 2px solid rgb(255, 255, 255);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin: -15px -15px 0 -15px;
-    color: transparent;
-}
-
-#header .subheader {
-    text-align: left;
-    padding-left: 10px;
-}
-
-#header .wrapper {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    margin: -1px auto 0px;
-    width: 99%;
-}
-
-#header .wrapper:after {
-    clear: both;
-    content: ".";
-    display: block;
-    height: 0;
-    visibility: hidden;
-}
-
-#header #bugzilla_version {
-    float: right;
-    color: #888;
-    padding: 5px 20px;
-}
-
-#titles {
-    width: 100%;
-    background-color: transparent;
-    padding: 0 1em 0 1em;
-}
-
-#information {
-    text-align: left;
-    padding-left: 2em;
-}
-
-#title {
-    width: 150px;
-    font-size: 120%;
-}
-
-#moz_tab {
-    width: 100px;
-    vertical-align: top;
-}
-
-#moz_login {
-    text-align: right;
-    padding-right: 2em;
-    color: #404040;
-}
-
-#header .links {
-    background: transparent;
-    border: none;
-    border-radius: 0;
-    color: #404040;
-    position: relative;
-    width: 50%;
-}
-
-#header .links {
-    width: auto;
-}
-
-.login-links ul {
-}
-
-.login-links li {
-    display: inline;
-}
-
-.links a {
-    margin: 0 10px 0 10px;
-}
-
-.links .home {
-    font-weight: bold;
-}
-
-.links .separator {
-    display: none;
-}
-
-#quicksearch_top, #quicksearch_main {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    background: url(search.png) 5px center no-repeat, #fafafa;
-    background: url(search.png) 5px center no-repeat, -moz-linear-gradient(#fafafa, #fff);
-    background: url(search.png) 5px center no-repeat, -webkit-linear-gradient(#fafafa, #fff);
-    background: url(search.png) 5px center no-repeat, linear-gradient(#fafafa, #fff);
-    padding: .4em 1em .45em 26px;
-    width: 200px;
-}
-
-#footer .links .quicksearch_form {
-    display: none;
-}
-
-#header .form a {
-    margin: 0;
-}
-
-.links .dropdown {
-    background: rgba(0, 0, 0, 0.05);
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: .25em;
-    display: inline-block;
-    padding: 4px 8px;
-    position: relative;
-    cursor: default;
-}
-
-.links .dropdown .anchor {
-    background-image: url(dropdown.png);
-    background-position: right center;
-    background-repeat: no-repeat;
-    display: inline-block;
-    min-width: 110px;
-    padding-right: 15px;
-}
-
-.links .dropdown ul {
-    background: #fafafa;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    border-radius: 0 0 .25em .25em;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    display: none;
-    padding: 4px;
-    position: absolute;
-    right: -1px;
-    margin-top: 4px;
-    z-index: 2;
-    text-align: left;
-}
-
-.links .dropdown:hover ul {
-    display: block;
-}
-
-.links .dropdown li {
-    display: block;
-}
-
-.links .dropdown:hover {
-    border-bottom-right-radius: 0;
-}
-
-.links .dropdown li {
-    display: block;
-}
-
-#bugzilla-body {
-    background: none;
-    border: none;
-    color: #404040;
-    margin: 10px auto 15px;
-    padding: 0;
-    width: 99%;
-}
-
-#bugzilla-body th {
-    white-space: nowrap;
-}
-
-/* Home */
-
-#page-index {
-    max-width: none;
-}
-
-#page-index td:first-child {
-    text-align: center;
-}
-
-#quicksearch_links {
-    margin-top: 10px;
-}
-
-/* Bugs */
-
-.navigation {
-    background: rgba(255, 255, 255, 0.3);
-    padding: 5px 10px;
-}
-
-u {
-    border-bottom: 1px solid #aaa;
-    text-decoration: none;
-}
-
-#field_container_see_also br {
-    margin-bottom: 10px;
-}
-
-.bz_alias_short_desc_container {
-    background: none;
-    font-size: 20px;
-    font-weight: normal;
-    line-height: 30px;
-    padding: 5px 0;
-    text-shadow: 0 1px rgba(255, 255, 255, 0.2);
-}
-
-.bz_alias_short_desc_container b {
-    font-weight: normal;
-}
-
-.bz_alias_short_desc_container .editme {
-    font-weight: normal;
-}
-
-.last_comment_link {
-    font-size: 18px;
-}
-
-.last_comment_link b {
-    border-bottom: 1px solid #aaa;
-    font-weight: normal;
-}
-
-table.edit_form {
-    background: #fff;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin-bottom: 20px;
-    padding: 10px 10px 80px;
-    position: relative;
-}
-
-table.edit_form tbody {
-    width: 100%;
-}
-
-table.edit_form hr {
-    display: none;
-}
-
-.field_label {
-    font-weight: bold !important;
-    padding-right: 10px;
-    vertical-align: baseline;
-    white-space: nowrap;
-}
-
-.field_label a, .field_label b {
-    color: #404040;
-    font-weight: bold;
-}
-
-.field_value .text_input {
-    min-width: 0;
-}
-
-#product, #component {
-    width: 235px;
-}
-
-#bz_show_bug_column_1 tr:last-child span {
-    position: absolute;
-    left: 20px;
-    bottom: 20px;
-}
-
-#commit_top {
-    position: absolute;
-    bottom: 20px;
-    right: 10px;
-}
-
-.cc_list_display {
-    background: #fff;
-    float: none;
-    font-size: 11px;
-    margin-top: 3px;
-    max-width: none;
-    padding: 5px;
-}
-
-#project-flags, #custom-flags {
-    border-collapse: collapse;
-}
-
-#project-flags label, #custom-flags label {
-    margin-right: 10px;
-}
-
-#cf_crash_signature {
-    width: 100%;
-}
-
-#attachment_table {
-    background: #fff;
-    border: none;
-    border-collapse: collapse;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin-bottom: 40px;
-}
-
-#attachment_table td {
-    border: none;
-}
-
-#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
-    background: #eee;
-    color: #404040;
-}
-
-#attachment_table .bz_attach_actions {
-    white-space: nowrap;
-}
-
-/* background for diff views */
-.file_table, .file-table {
-    background: #ffffff;
-}
-
-.bz_comment {
-    width: 65em !important;
-    margin: 0 0 20px;
-}
-
-.bz_comment pre, #comment, #comment-preview {
-    font: 13px/1.2 "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace;
-}
-
-.bz_first_comment_head, .bz_comment_head {
-    font-weight: normal;
-    line-height: 32px;
-    padding-bottom: 2px;
-    padding-left: 0px;
-    margin-left: -5px;
-    white-space: nowrap;
-    background-color: transparent;
-}
-
-.bz_comment_head img, .bz_first_comment_head img {
-    vertical-align: middle;
-}
-
-.bz_comment_user a {
-    -moz-transition: all 100ms linear 0s;
-    -webkit-transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    color: #0095dd;
-    padding: 0px;
-    margin: 0px;
-}
-
-.bz_comment_user a:hover {
-    -moz-transition: all 100ms linear 0s;
-    -webkit-transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    background: #fff;
-    border: none;
-    text-decoration: none;
-}
-
-.bz_comment_user .vcard {
-    font-weight: bold;
-}
-
-.bz_comment_actions {
-    margin: 0px 0px;
-}
-
-.new_user {
-    margin-left: 10px;
-}
-
-.ih_history {
-    padding: 0 !important;
-}
-
-.ih_history .bz_comment_head {
-    padding-bottom: 3px;
-}
-
-.ih_history_item:not(.ih_hidden) ~ .ih_history_item:not(.ih_hidden) {
-    margin-top: 20px;
-}
-
-.ih_history_change {
-    background: #eee;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    padding: 10px;
-    position: relative;
-}
-
-.bz_comment_text {
-    background: #fff;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin: 1px 0 0 0;
-    overflow: auto;
-    padding: 10px;
-    position: relative;
-}
-
-.bz_comment_text:after, .bz_comment_text:before {
-    bottom: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.bz_comment_text:after {
-    border-bottom-color: #fff;
-    border-width: 8px;
-    left: 16px;
-}
-
-.bz_comment_text span.quote, .bz_comment_text span.quote_wrapped {
-    background: #eee !important;
-    color: #444 !important;
-    display: block !important;
-    margin-top: 5px !important;
-    margin-bottom: -10px !important;
-    overflow: auto;
-    padding: 5px !important;
-}
-
-.bz_comment_tags {
-    background: #eee;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    padding: 5px;
-}
-
-.bz_comment_tag {
-    background: #fff;
-    color: #444;
-    border: none;
-    padding: 2px 6px;
-}
-
-.bz_comment_tag a {
-    color: #0095DD;
-}
-
-#bz_ctag_error {
-    border: none;
-    background-color: #faa;
-    color: #444;
-    padding: 2px 6px;
-}
-
-#bz_ctag_error a {
-    color: #0095DD;
-}
-
-.ih_inlinehistory {
-    background: #eee;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    padding: 10px;
-    position: relative;
-    top: -1px;
-}
-
-.bz_collapse_expand_comments li {
-    white-space: nowrap;
-}
-
-#add_comment {
-    border: 1px solid #ccc;
-    border-width: 1px 0;
-    margin-bottom: 20px;
-    padding: 10px 0;
-}
-
-#add_comment > table {
-    border-collapse: collapse;
-    width: 661px;
-}
-
-#comment {
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-}
-
-#comment_tabs {
-    margin-top: 2px;
-}
-
-#comment_preview {
-    background: white;
-    display: block;
-    clear: both;
-}
-
-#comment_preview_text {
-    background: transparent;
-    border: none;
-    box-shadow: none;
-    padding: 2px 2px 2px 1px;
-}
-
-#footer {
-    background: #fff;
-    border: none;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0;
-    color: #bbb;
-    width: auto;
-    margin-bottom: 1em;
-    margin-left: 6px;
-}
-
-#links-actions, #links-saved {
-    margin-left: -10px;
-}
-
-#footer form input {
-    padding: 1px 2px;
-    margin-top: 3px;
-}
-
-#privacy-policy {
-    margin-bottom: 1em;
-}
-
-button, input[type=submit], input[type=button], #commit, #commit_top, #header .btn, #header input[type=submit] {
-    background-color: #43a6e2;
-    background-image: -moz-linear-gradient(#43a6e2,#277ac1);
-    background-image: -webkit-linear-gradient(#43a6e2,#277ac1);
-    background-image: linear-gradient(#43a6e2,#277ac1);
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-    border-radius: .25em;
-    border: 0px none;
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
-    color: rgb(255, 255, 255);
-    cursor: pointer;
-    display: inline-block;
-    font-size: 12px;
-    font-weight: 600;
-    text-align: center;
-    text-decoration: none;
-    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
-    padding: .425em 1em .5em;
-}
-
-button:hover, input[type=submit]:hover, input[type=button]:hover, #commit:hover, #commit_top:hover, #header .btn:hover, #header input[type=submit]:hover {
-    -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-}
-
-button:active, input[type=submit]:active, input[type=button]:active, #commit:active, #commit_top:active, #header .btn:active, #header input[type=submit]:active  {
-    -webkit-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    -moz-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-}
-
-button[disabled], input[type=submit][disabled], input[type=button][disabled], button[disabled]:hover, input[type=submit][disabled]:hover, input[type=button][disabled]:hover, button[disabled]:active, input[type=submit][disabled]:active, input[type=button][disabled]:active {
-    background-color: #bfc7cd;
-    background-image: -moz-linear-gradient(#bfc7cd,#9ca3aa);
-    background-image: -webkit-linear-gradient(#bfc7cd,#9ca3aa);
-    background-image: linear-gradient(#bfc7cd,#9ca3aa);
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
-    cursor: pointer;
-}
-
-.notransition {
-  -webkit-transition: none !important;
-  -moz-transition: none !important;
-  -o-transition: none !important;
-  -ms-transition: none !important;
-  transition: none !important;
-}
-
-.calendar_button, .calendar_button:hover {
-    box-shadow: none;
-    padding: 0;
-}
-
-.related_actions {
-    line-height: 19px;
-    padding: 5px 10px;
-}
-
-/* Attachments */
-
-#viewFrame {
-    border: 2px solid #222;
-    margin-bottom: 10px;
-}
-
-#editFrame, #viewDiffFrame, #viewFrame {
-    margin-left: 0;
-}
-
-#flags label {
-    font-weight: normal;
-}
-
-/* tabs */
-
-table.tabs {
-    border-collapse: separate;
-    border-spacing: 1em 0;
-}
-
-.tabs td {
-    background: rgba(255,255,255,0.5);
-    padding: 1em;
-    text-align: center;
-    border-style: none;
-    font-size: 12px;
-    text-transform: uppercase;
-}
-
-.tabs td.selected {
-    background: white;
-    font-weight: 700;
-}
-
-.tabs td.spacer {
-    background: transparent;
-}
-
-.tabs a {
-    color: #333;
-}
-
-.tabbody {
-    background: white;
-    padding: 1em 2em;
-}
-
-/* splinter */
-
-#splinter-files .new-line, #splinter-files .old-line {
-    font-size: 90%;
-}
-
-/* search */
-
-#summary_field.search_field_row input {
-    padding-bottom: 6px;
-}
diff --git a/skins/contrib/Mozilla-OpenSans/index.css b/skins/contrib/Mozilla-OpenSans/index.css
deleted file mode 100644
index 81f207990..000000000
--- a/skins/contrib/Mozilla-OpenSans/index.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0. */
-
-#enter_bug {
-    background: url(bugzilla-papericon.png) no-repeat;
-}
-#query {
-    background: url(bugzilla-magnifier.png) no-repeat;
-}
-#account {
-    background: url(bugzilla-person-alternate.png) no-repeat;
-    margin-right: 0;
-}
-#docs {
-    background: url(bugzilla-questionmark2.png) no-repeat !important;
-}
diff --git a/skins/contrib/Mozilla-OpenSans/opensans-bold.woff b/skins/contrib/Mozilla-OpenSans/opensans-bold.woff
deleted file mode 100644
index 27619e7ce..000000000
--- a/skins/contrib/Mozilla-OpenSans/opensans-bold.woff
+++ /dev/null
diff --git a/skins/contrib/Mozilla-OpenSans/opensans-semibold.woff b/skins/contrib/Mozilla-OpenSans/opensans-semibold.woff
deleted file mode 100644
index e83bb333d..000000000
--- a/skins/contrib/Mozilla-OpenSans/opensans-semibold.woff
+++ /dev/null
diff --git a/skins/contrib/Mozilla-OpenSans/opensans.woff b/skins/contrib/Mozilla-OpenSans/opensans.woff
deleted file mode 100644
index 55b25f867..000000000
--- a/skins/contrib/Mozilla-OpenSans/opensans.woff
+++ /dev/null
diff --git a/skins/contrib/Mozilla/bugzilla-magnifier.png b/skins/contrib/Mozilla/bugzilla-magnifier.png
deleted file mode 100644
index b859b1668..000000000
--- a/skins/contrib/Mozilla/bugzilla-magnifier.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/bugzilla-papericon.png b/skins/contrib/Mozilla/bugzilla-papericon.png
deleted file mode 100644
index 677567929..000000000
--- a/skins/contrib/Mozilla/bugzilla-papericon.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/bugzilla-person-alternate.png b/skins/contrib/Mozilla/bugzilla-person-alternate.png
deleted file mode 100644
index a9e9ff213..000000000
--- a/skins/contrib/Mozilla/bugzilla-person-alternate.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/bugzilla-person.png b/skins/contrib/Mozilla/bugzilla-person.png
deleted file mode 100644
index 62351c265..000000000
--- a/skins/contrib/Mozilla/bugzilla-person.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/bugzilla-questionmark2.png b/skins/contrib/Mozilla/bugzilla-questionmark2.png
deleted file mode 100644
index 441d07f93..000000000
--- a/skins/contrib/Mozilla/bugzilla-questionmark2.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/dropdown.png b/skins/contrib/Mozilla/dropdown.png
deleted file mode 100644
index e01e5e51d..000000000
--- a/skins/contrib/Mozilla/dropdown.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/footer-mozilla.png b/skins/contrib/Mozilla/footer-mozilla.png
deleted file mode 100644
index 593c10308..000000000
--- a/skins/contrib/Mozilla/footer-mozilla.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css
deleted file mode 100644
index f51dd7ac8..000000000
--- a/skins/contrib/Mozilla/global.css
+++ /dev/null
@@ -1,846 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0. */
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans'), local('FiraSans'),
-         url('fira/FiraSans-Regular.woff') format('woff');
-    font-weight: 400;
-    font-style: normal;
-}
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans Italic'), local('FiraSansItalic'),
-         url('fira/FiraSans-Italic.woff') format('woff');
-    font-weight: 400;
-    font-style: italic;
-}
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans SemiBold'), local('FiraSansSemiBold'),
-         url('fira/FiraSans-SemiBold.woff') format('woff');
-    font-weight: 600;
-    font-style: normal;
-}
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans SemiBold Italic'), local('FiraSansSemiBoldItalic'),
-         url('fira/FiraSans-SemiBoldItalic.woff') format('woff');
-    font-weight: 600;
-    font-style: italic;
-}
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans Bold'), local('FiraSansBold'),
-         url('fira/FiraSans-Bold.woff') format('woff');
-    font-weight: 700;
-    font-style: normal;
-}
-
-@font-face{
-    font-family: 'Fira Sans';
-    src: local('Fira Sans Bold Italic'), local('FiraSansBoldItalic'),
-         url('fira/FiraSans-BoldItalic.woff') format('woff');
-    font-weight: 700;
-    font-style: italic;
-}
-
-@font-face{
-    font-family: 'Fira Mono';
-    src: local('Fira Mono'), local('FiraMono'),
-         url('fira/FiraMono-Regular.woff') format('woff');
-    font-weight: 400;
-    font-style: normal;
-}
-
-@font-face{
-    font-family: 'Fira Mono';
-    src: local('Fira Mono Bold'), local('FiraMonoBold'),
-         url('fira/FiraMono-Bold.woff') format('woff');
-    font-weight: 600;
-    font-style: normal;
-}
-
-body {
-    background: #f6f4ec;
-    background-image: url(noise.png);
-    background-image: url(noise.png), -moz-linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-image: url(noise.png), linear-gradient(#d7d3c8, #f6f4ec 400px);
-    background-repeat: repeat, repeat-x;
-    color: #404040;
-}
-
-body, td, th, input, select, option, optgroup, .text_input {
-    font-family: "Fira Sans", "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
-
-/* security group colouring */
-/* these are also defined in skins/custom/bug_groups.css */
-
-body[class*=bz_group_] {
-    background-color: inherit;
-    background-image: url(noise.png), -moz-linear-gradient(#d7d7ff, #f0f0ff 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#d7d7ff, #f0f0ff 400px);
-    background-image: url(noise.png), linear-gradient(#d7d7ff, #f0f0ff 400px);
-}
-
-body[class*=core-security],
-body.bz_group_infrasec {
-    background-image: url(noise.png), -moz-linear-gradient(#ffe0b0, #fff4e3 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffe0b0, #fff4e3 400px);
-    background-image: url(noise.png), linear-gradient(#ffe0b0, #fff4e3 400px);
-}
-
-body.bz_group_webtools-security,
-body.bz_group_websites-security,
-body.bz_group_bugzilla-security {
-    background-image: url(noise.png), -moz-linear-gradient(#ffcccc, #fff0f0 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffcccc, #fff0f0 400px);
-    background-image: url(noise.png), linear-gradient(#ffcccc, #fff0f0 400px);
-}
-
-body.bz_group_client-services-security,
-body.bz_group_cloud-services-security {
-    background-image: url(noise.png), -moz-linear-gradient(#ffffa3, #ffffe3 400px);
-    background-image: url(noise.png), -webkit-linear-gradient(#ffffa3, #ffffe3 400px);
-    background-image: url(noise.png), linear-gradient(#ffffa3, #ffffe3 400px);
-}
-
-a, #header a, #header a:visited, #footer a, #footer a:visited {
-    color: #0095dd;
-}
-
-a:hover, #header a:hover, #footer a:hover {
-    color: #00539f;
-}
-
-select[multiple], textarea, input[type=text], input[type=password],
-input[type=email], input[type=url], input[type=number], input:not([type]), .text_input, .yui-ac-input {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    border: 1px solid #b2b2b2;
-    border-radius: .25em;
-    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
-    background: white;
-    padding: 4px 3px 5px;
-    color: #404040;
-    vertical-align: top;
-}
-
-select[multiple], .text_input, .yui-ac-input, input {
-    font-size: 1em;
-}
-
-select[multiple]:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
-    border-color: #42a4e0;
-    -webkit-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-    -moz-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-    box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
-}
-
-select, select[multiple] {
-    font-size: 12px;
-}
-
-hr {
-    border: none;
-    height: 1px;
-    color: #ccc;
-    background-color: #ccc;
-    margin: 1em 0;
-}
-
-#changeform hr {
-    display: none;
-}
-
-#header {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    background: #e5e3dc;
-    background: -moz-linear-gradient(#e5e3dc, #ecebe5);
-    background: -webkit-linear-gradient(#e5e3dc, #ecebe5);
-    background: linear-gradient(#e5e3dc, #ecebe5);
-    border-radius: 0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    border-top: 2px solid rgb(255, 255, 255);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin: -15px -15px 0 -15px;
-    color: transparent;
-}
-
-#header .subheader {
-    text-align: left;
-    padding-left: 10px;
-}
-
-#header .wrapper {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    margin: -1px auto 0px;
-    width: 99%;
-}
-
-#header .wrapper:after {
-    clear: both;
-    content: ".";
-    display: block;
-    height: 0;
-    visibility: hidden;
-}
-
-#header #bugzilla_version {
-    float: right;
-    color: #888;
-    padding: 5px 20px;
-}
-
-#titles {
-    width: 100%;
-    background-color: transparent;
-    padding: 0 1em 0 1em;
-}
-
-#information {
-    text-align: left;
-    padding-left: 2em;
-}
-
-#title {
-    width: 150px;
-    font-size: 120%;
-}
-
-#moz_tab {
-    width: 100px;
-    vertical-align: top;
-}
-
-#moz_login {
-    text-align: right;
-    padding-right: 2em;
-    color: #404040;
-}
-
-#header .links {
-    background: transparent;
-    border: none;
-    border-radius: 0;
-    color: #404040;
-    position: relative;
-    width: 50%;
-}
-
-#header .links {
-    width: auto;
-}
-
-.login-links ul {
-}
-
-.login-links li {
-    display: inline;
-}
-
-.links a {
-    margin: 0 10px 0 10px;
-}
-
-.links .home {
-    font-weight: bold;
-}
-
-.links .separator {
-    display: none;
-}
-
-#quicksearch_top, #quicksearch_main {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    background: url(search.png) 5px center no-repeat, #fafafa;
-    background: url(search.png) 5px center no-repeat, -moz-linear-gradient(#fafafa, #fff);
-    background: url(search.png) 5px center no-repeat, -webkit-linear-gradient(#fafafa, #fff);
-    background: url(search.png) 5px center no-repeat, linear-gradient(#fafafa, #fff);
-    padding: .4em 1em .45em 26px;
-    width: 200px;
-}
-
-#footer .links .quicksearch_form {
-    display: none;
-}
-
-#header .form a {
-    margin: 0;
-}
-
-.links .dropdown {
-    background: rgba(0, 0, 0, 0.05);
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: .25em;
-    display: inline-block;
-    padding: 4px 8px;
-    position: relative;
-    cursor: default;
-}
-
-.links .dropdown .anchor {
-    background-image: url(dropdown.png);
-    background-position: right center;
-    background-repeat: no-repeat;
-    display: inline-block;
-    min-width: 110px;
-    padding-right: 15px;
-}
-
-.links .dropdown ul {
-    background: #fafafa;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    border-radius: 0 0 .25em .25em;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    display: none;
-    padding: 4px;
-    position: absolute;
-    right: -1px;
-    margin-top: 4px;
-    z-index: 2;
-    text-align: left;
-}
-
-.links .dropdown:hover ul {
-    display: block;
-}
-
-.links .dropdown li {
-    display: block;
-}
-
-.links .dropdown:hover {
-    border-bottom-right-radius: 0;
-}
-
-.links .dropdown li {
-    display: block;
-}
-
-#bugzilla-body {
-    background: none;
-    border: none;
-    color: #404040;
-    margin: 10px auto 15px;
-    padding: 0;
-    width: 99%;
-}
-
-#bugzilla-body th {
-    white-space: nowrap;
-}
-
-/* Home */
-
-#page-index {
-    max-width: none;
-}
-
-#page-index td:first-child {
-    text-align: center;
-}
-
-#quicksearch_links {
-    margin-top: 10px;
-}
-
-/* Bugs */
-
-.navigation {
-    background: rgba(255, 255, 255, 0.3);
-    padding: 5px 10px;
-}
-
-u {
-    border-bottom: 1px solid #aaa;
-    text-decoration: none;
-}
-
-#field_container_see_also br {
-    margin-bottom: 10px;
-}
-
-.bz_alias_short_desc_container {
-    background: none;
-    font-size: 20px;
-    font-weight: normal;
-    line-height: 30px;
-    padding: 5px 0;
-    text-shadow: 0 1px rgba(255, 255, 255, 0.2);
-}
-
-.bz_alias_short_desc_container b {
-    font-weight: normal;
-}
-
-.bz_alias_short_desc_container .editme {
-    font-weight: normal;
-}
-
-.last_comment_link {
-    font-size: 18px;
-}
-
-.last_comment_link b {
-    border-bottom: 1px solid #aaa;
-    font-weight: normal;
-}
-
-table.edit_form {
-    background: #fff;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin-bottom: 20px;
-    padding: 10px 10px 80px;
-    position: relative;
-}
-
-table.edit_form tbody {
-    width: 100%;
-}
-
-table.edit_form hr {
-    display: none;
-}
-
-.field_label {
-    font-weight: bold !important;
-    padding-right: 10px;
-    vertical-align: baseline;
-    white-space: nowrap;
-}
-
-.field_label a, .field_label b {
-    color: #404040;
-    font-weight: bold;
-}
-
-.field_value .text_input {
-    min-width: 0;
-}
-
-#product, #component {
-    width: 235px;
-}
-
-#bz_show_bug_column_1 tr:last-child span {
-    position: absolute;
-    left: 20px;
-    bottom: 20px;
-}
-
-#commit_top {
-    position: absolute;
-    bottom: 20px;
-    right: 10px;
-}
-
-.cc_list_display {
-    background: #fff;
-    float: none;
-    font-size: 11px;
-    margin-top: 3px;
-    max-width: none;
-    padding: 5px;
-}
-
-#project-flags, #custom-flags {
-    border-collapse: collapse;
-}
-
-#project-flags label, #custom-flags label {
-    margin-right: 10px;
-}
-
-#cf_crash_signature {
-    width: 100%;
-}
-
-#attachment_table {
-    background: #fff;
-    border: none;
-    border-collapse: collapse;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin-bottom: 40px;
-}
-
-#attachment_table td {
-    border: none;
-}
-
-#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
-    background: #eee;
-    color: #404040;
-}
-
-#attachment_table .bz_attach_actions {
-    white-space: nowrap;
-}
-
-#attachment_table .bz_private .bz_attach_desc {
-    border-left: 4px solid darkred;
-}
-
-/* background for diff views */
-.file_table, .file-table {
-    background: #ffffff;
-}
-
-.bz_comment {
-    width: 65em !important;
-    margin: 0 0 20px;
-}
-
-.bz_comment pre, #comment, #comment-preview {
-    font: 13px/1.2 "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace;
-}
-
-.bz_first_comment_head, .bz_comment_head {
-    font-weight: normal;
-    line-height: 32px;
-    padding-bottom: 2px;
-    padding-left: 0px;
-    margin-left: -5px;
-    white-space: nowrap;
-    background-color: transparent;
-}
-
-.bz_comment_head img, .bz_first_comment_head img {
-    vertical-align: middle;
-}
-
-.bz_comment_user a {
-    -moz-transition: all 100ms linear 0s;
-    -webkit-transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    color: #0095dd;
-    padding: 0px;
-    margin: 0px;
-}
-
-.bz_comment_user a:hover {
-    -moz-transition: all 100ms linear 0s;
-    -webkit-transition: all 100ms linear 0s;
-    transition: all 100ms linear 0s;
-    background: #fff;
-    border: none;
-    text-decoration: none;
-}
-
-.bz_comment_user .vcard {
-    font-weight: bold;
-}
-
-.bz_comment_actions {
-    margin: 0px 0px;
-}
-
-.new_user {
-    margin-left: 10px;
-}
-
-.ih_history {
-    padding: 0 !important;
-}
-
-.ih_history .bz_comment_head {
-    padding-bottom: 3px;
-}
-
-.ih_history_item:not(.ih_hidden) ~ .ih_history_item:not(.ih_hidden) {
-    margin-top: 20px;
-}
-
-.ih_history_change {
-    background: #eee;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    padding: 10px;
-    position: relative;
-}
-
-.bz_comment_text {
-    background: #fff;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    margin: 1px 0 0 0;
-    overflow: auto;
-    padding: 10px;
-    position: relative;
-}
-
-.bz_comment_text:after, .bz_comment_text:before {
-    bottom: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.bz_comment_text:after {
-    border-bottom-color: #fff;
-    border-width: 8px;
-    left: 16px;
-}
-
-.bz_comment_text span.quote, .bz_comment_text span.quote_wrapped {
-    background: #eee !important;
-    color: #444 !important;
-    display: block !important;
-    margin-top: 5px !important;
-    margin-bottom: -10px !important;
-    overflow: auto;
-    padding: 5px !important;
-}
-
-.bz_comment_tags {
-    background: #eee;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    padding: 5px;
-}
-
-.bz_comment_tag {
-    background: #fff;
-    color: #444;
-    border: none;
-    padding: 2px 6px;
-}
-
-.bz_comment_tag a {
-    color: #0095DD;
-}
-
-#bz_ctag_error {
-    border: none;
-    background-color: #faa;
-    color: #444;
-    padding: 2px 6px;
-}
-
-#bz_ctag_error a {
-    color: #0095DD;
-}
-
-.ih_inlinehistory {
-    background: #eee;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-    padding: 10px;
-    position: relative;
-    top: -1px;
-}
-
-.bz_collapse_expand_comments li {
-    white-space: nowrap;
-}
-
-#add_comment {
-    border: 1px solid #ccc;
-    border-width: 1px 0;
-    margin-bottom: 20px;
-    padding: 10px 0;
-}
-
-#add_comment > table {
-    border-collapse: collapse;
-    width: 661px;
-}
-
-#comment {
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-}
-
-#comment_tabs {
-    margin-top: 2px;
-}
-
-#comment_preview {
-    background: white;
-    display: block;
-    clear: both;
-}
-
-#comment_preview_text {
-    background: transparent;
-    border: none;
-    box-shadow: none;
-    padding: 2px 2px 2px 1px;
-}
-
-#footer {
-    background: #fff;
-    border: none;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0;
-    color: #bbb;
-    width: auto;
-    margin-bottom: 1em;
-    margin-left: 6px;
-}
-
-#links-actions, #links-saved {
-    margin-left: -10px;
-}
-
-#footer form input {
-    padding: 1px 2px;
-    margin-top: 3px;
-}
-
-#privacy-policy {
-    margin-bottom: 1em;
-}
-
-button, input[type=submit], input[type=button], #commit, #commit_top, #header .btn, #header input[type=submit] {
-    background-color: #43a6e2;
-    background-image: -moz-linear-gradient(#43a6e2,#277ac1);
-    background-image: -webkit-linear-gradient(#43a6e2,#277ac1);
-    background-image: linear-gradient(#43a6e2,#277ac1);
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-    border-radius: .25em;
-    border: 0px none;
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
-    color: rgb(255, 255, 255);
-    cursor: pointer;
-    display: inline-block;
-    font-size: 12px;
-    font-weight: 600;
-    text-align: center;
-    text-decoration: none;
-    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
-    padding: .425em 1em .5em;
-}
-
-button:hover, input[type=submit]:hover, input[type=button]:hover, #commit:hover, #commit_top:hover, #header .btn:hover, #header input[type=submit]:hover {
-    -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-}
-
-button:active, input[type=submit]:active, input[type=button]:active, #commit:active, #commit_top:active, #header .btn:active, #header input[type=submit]:active  {
-    -webkit-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    -moz-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
-    -moz-transition: all linear 100ms;
-    -webkit-transition: all linear 100ms;
-    transition: all linear 100ms;
-}
-
-button[disabled], input[type=submit][disabled], input[type=button][disabled], button[disabled]:hover, input[type=submit][disabled]:hover, input[type=button][disabled]:hover, button[disabled]:active, input[type=submit][disabled]:active, input[type=button][disabled]:active {
-    background-color: #bfc7cd;
-    background-image: -moz-linear-gradient(#bfc7cd,#9ca3aa);
-    background-image: -webkit-linear-gradient(#bfc7cd,#9ca3aa);
-    background-image: linear-gradient(#bfc7cd,#9ca3aa);
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
-    cursor: pointer;
-}
-
-.notransition {
-  -webkit-transition: none !important;
-  -moz-transition: none !important;
-  -o-transition: none !important;
-  -ms-transition: none !important;
-  transition: none !important;
-}
-
-.calendar_button, .calendar_button:hover {
-    box-shadow: none;
-    padding: 0;
-}
-
-.related_actions {
-    line-height: 19px;
-    padding: 5px 10px;
-}
-
-/* Attachments */
-
-#viewFrame {
-    border: 2px solid #222;
-    margin-bottom: 10px;
-}
-
-#editFrame, #viewDiffFrame, #viewFrame {
-    margin-left: 0;
-}
-
-#flags label {
-    font-weight: normal;
-}
-
-/* tabs */
-
-table.tabs {
-    border-collapse: separate;
-    border-spacing: 1em 0;
-}
-
-.tabs td {
-    background: rgba(255,255,255,0.5);
-    padding: 1em;
-    text-align: center;
-    border-style: none;
-    font-size: 12px;
-    text-transform: uppercase;
-}
-
-.tabs td.selected {
-    background: white;
-    font-weight: 700;
-}
-
-.tabs td.spacer {
-    background: transparent;
-}
-
-.tabs a {
-    color: #333;
-}
-
-.tabbody {
-    background: white;
-    padding: 1em 2em;
-}
-
-/* splinter */
-
-#splinter-files .new-line, #splinter-files .old-line {
-    font-size: 90%;
-}
-
-/* search */
-
-#summary_field.search_field_row input {
-    padding-bottom: 6px;
-}
diff --git a/skins/contrib/Mozilla/grain.png b/skins/contrib/Mozilla/grain.png
deleted file mode 100644
index 2980ee90e..000000000
--- a/skins/contrib/Mozilla/grain.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/index.css b/skins/contrib/Mozilla/index.css
deleted file mode 100644
index 81f207990..000000000
--- a/skins/contrib/Mozilla/index.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0. */
-
-#enter_bug {
-    background: url(bugzilla-papericon.png) no-repeat;
-}
-#query {
-    background: url(bugzilla-magnifier.png) no-repeat;
-}
-#account {
-    background: url(bugzilla-person-alternate.png) no-repeat;
-    margin-right: 0;
-}
-#docs {
-    background: url(bugzilla-questionmark2.png) no-repeat !important;
-}
diff --git a/skins/contrib/Mozilla/noise.png b/skins/contrib/Mozilla/noise.png
deleted file mode 100644
index 97407ffd2..000000000
--- a/skins/contrib/Mozilla/noise.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/search.png b/skins/contrib/Mozilla/search.png
deleted file mode 100644
index a56b5e2cd..000000000
--- a/skins/contrib/Mozilla/search.png
+++ /dev/null
diff --git a/skins/contrib/Mozilla/tabzilla.png b/skins/contrib/Mozilla/tabzilla.png
deleted file mode 100644
index 7619610c3..000000000
--- a/skins/contrib/Mozilla/tabzilla.png
+++ /dev/null
diff --git a/skins/custom/IE-fixes.css b/skins/custom/IE-fixes.css
deleted file mode 100644
index 0d5c47630..000000000
--- a/skins/custom/IE-fixes.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.bz_short_desc_column a, .bz_short_short_desc_column a {
-    /* color:inherit */
-    color: expression(this.parentNode.currentStyle['color']);
-}
diff --git a/skins/custom/buglist.css b/skins/custom/buglist.css
deleted file mode 100644
index d3097aedd..000000000
--- a/skins/custom/buglist.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* For the JS-sorting buglist. */
-
-th.sorttable_sorted,
-th.sorttable_sorted_reverse,
-th.sorted_0 {
-    background-color: #aaa;
-}
-
-th.sorted_1 {
-    background-color: #bbb;
-}
-
-th.sorted_2 {
-    background-color: #ccc;
-}
-
-th.sorted_3 {
-    background-color: #ddd;
-}
-
-th.sorted_4 {
-    background-color: #eee;
-}
-
-th.sorted_5 {
-    background-color: #fff;
-}
-
-.bz_short_desc_column a, .bz_short_short_desc_column a {
-    text-decoration: none;
-    color: inherit;
-}
-
-.bz_short_desc_column a:hover, .bz_short_short_desc_column a:hover {
-    text-decoration: underline;
-}
-
-#request_form #filtering th {
-    padding-left: 0.5em;
-}
-
diff --git a/skins/custom/global.css b/skins/custom/global.css
deleted file mode 100644
index 61743d62a..000000000
--- a/skins/custom/global.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0. */
-
-/* 
- * Custom rules for skins/standard/global.css.
- * The rules you put here override rules in that stylesheet.
- */
-
-body {
-    margin: 0;
-    padding: 15px 15px 2px 15px;
-}
-
-#header .btn, #header .txt {
-    font-size: 100%;
-}
-
-#header #information {
-    color: #dddddd;
-    font-size: small;
-}
-
-pre {
-    font-size: medium;
-}
-
-#attachment_table {
-    width: 50em;
-}
-
-#page-index #quicksearchForm {
-    padding-top: 20px;
-}
-
-/* createaccount styling */
-.support_div {
-    width: 40%;
-    font-size: 80%;
-}
-
-.support_div > img {
-  padding: 5px 20px;
-}
-
-a {
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-a.controller {
-    font-size: 100%;
-    border: 1px solid #c0c0c0;
-    padding: 3px;
-}
-
-.group_secure > th > a {
-    background-image: url("../../images/padlock.png");
-    background-position: center left;
-    background-repeat: no-repeat;
-    padding-left: 18px;
-}
-
-#policy_links {
-    padding-right: 5px;
-    text-align: right;
-}
-
-#policy_links li {
-    display: inline;
-}
-
-.highlighted {
-    background: lightyellow;
-}
-
-/* user dropdown menu down-arrow */
-.vcard a .fn:after, .vcard a .ln:after {
-    content: ' \25BE';
-}
diff --git a/skins/custom/index.css b/skins/custom/index.css
deleted file mode 100644
index ca2d83dde..000000000
--- a/skins/custom/index.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Custom rules for index.css.
- * The rules you put here override rules in that stylesheet.
- */
-
-/* index.html.tmpl puts intro hook contents inside a div which causes 
- * the icons to display over two rows when adding the Help icon. 
- * So we change to inline to make it display a single row. */
-#page-index .intro { display: inline; }
-
-#docs { background: url(../standard/index/help.png) no-repeat; }
-
-.bz_common_actions {
-    display: block;
-    height: 170px;
-    width: 145px;
-    float: left;
-    margin: 0 2ex 2em 0;
-    text-align: center;
-}
-.bz_common_actions span {
-    position: relative;
-    top: 95%;
-    font-weight: bold;
-}
-.bz_common_actions, 
-.bz_common_actions:visited, 
-.bz_common_actions:hover
-{
-    text-decoration: none;
-}
diff --git a/skins/custom/search_form.css b/skins/custom/search_form.css
deleted file mode 100644
index 1855eb445..000000000
--- a/skins/custom/search_form.css
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/* let the browser choose the select height from the "size" param */
-.search_field_grid select {
-    height: auto;
-}
-
diff --git a/skins/custom/show_bug.css b/skins/custom/show_bug.css
deleted file mode 100644
index 444950cdc..000000000
--- a/skins/custom/show_bug.css
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Custom rules for show_bug.css.
- * The rules you put here override rules in that stylesheet.
- */
-
-.last_comment_link {
-    float: right;
-    font-size: 80%;
-    font-weight: normal;
-    margin-left: 1em;
-}
-
-#legal_disclaimer {
-    width: 40em;
-    padding: 1em;
-    margin: 0 1em 1em 1em;
-    font-weight: bold;
-    border: 1px red solid;
-    background-color: lightyellow;
-}
-
-.bz_patch {
-    background: #ffffcc;
-}
-
-.cc_list_display {
-    list-style: none;
-    margin:0px;
-    padding:5px;
-    padding-right:20px;
-    overflow:auto;
-    float:left;
-    max-width:465px;
-    max-height:100px;
-    border:1px solid #CCC;
-}
-
-.cc_list_display li {
-    margin:0px;
-    padding:0px;
-    white-space:nowrap;
-}
-
-#wave_wand {
-    margin-top: 0px;
-}
-
-/* put the width on the TD rather than the PRE to stop the col resizing
-   when comments are hidden */
-.bz_comment {
-    width: 55em;
-}
-.bz_comment_text {
-    width: auto;
-}
-
-.bz_comment_number {
-    float: right;
-}
-
-/* style all field labels the same */
-
-.field_label, .field_label a {
-    color: #000;
-    font-weight: bold;
-}
-
-.field_label a {
-    cursor: help;
-}
-
-.edit_form table th:first-child {
-    width: 0px;
-}
-
-#bz_show_bug_column_1, #bz_show_bug_column_2 {
-    width: 50%;
-}
-
-/* fix flag table's vertical alignment */
-
-table#flags {
-    border-collapse: collapse;
-    border-spacing: 0px;
-}
-
-div[class="bz_comment"]:target {
-    border: 2px solid #0095DD;
-}
diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css
index 7ef30e501..0e326286d 100644
--- a/skins/standard/IE-fixes.css
+++ b/skins/standard/IE-fixes.css
@@ -61,3 +61,7 @@ form#Create #comp_desc {
 }
 
 
+.bz_short_desc_column a, .bz_short_short_desc_column a {
+    /* color:inherit */
+    color: expression(this.parentNode.currentStyle['color']);
+}
diff --git a/skins/custom/bug_groups.css b/skins/standard/bug_groups.css
index 038ea8d1f..86d64153c 100644
--- a/skins/custom/bug_groups.css
+++ b/skins/standard/bug_groups.css
@@ -15,13 +15,13 @@ body.bz_group_infrasec {
     background-color: #ffcc99;
 }
 
-body.bz_group_webtools-security, 
-body.bz_group_websites-security, 
+body.bz_group_webtools-security,
+body.bz_group_websites-security,
 body.bz_group_bugzilla-security {
     background-color: #ffeeee;
 }
 
-body.bz_group_client-services-security, 
+body.bz_group_client-services-security,
 body.bz_group_cloud-services-security {
     background-color: #ffff80;
 }
diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css
index e6460a48b..e0298b0aa 100644
--- a/skins/standard/buglist.css
+++ b/skins/standard/buglist.css
@@ -84,12 +84,12 @@
 /* Align columns in the "change multiple bugs" form to the right. */
 table#form tr th { text-align: right; }
 
-table.bz_buglist td, table.bz_buglist th { 
+table.bz_buglist td, table.bz_buglist th {
 }
 
 /* we use a first-child class and not the pseudo-class because IE
  * doesn't support it :-( */
-tr.bz_secure td.first-child, a.bz_secure { 
+tr.bz_secure td.first-child, a.bz_secure {
   background-image: url("../../images/padlock.png");
   background-position: center left;
   background-repeat: no-repeat;
@@ -150,3 +150,43 @@ td.bz_total {
 table.requests th {
     text-align: left;
 }
+/* For the JS-sorting buglist. */
+
+th.sorttable_sorted,
+th.sorttable_sorted_reverse,
+th.sorted_0 {
+    background-color: #aaa;
+}
+
+th.sorted_1 {
+    background-color: #bbb;
+}
+
+th.sorted_2 {
+    background-color: #ccc;
+}
+
+th.sorted_3 {
+    background-color: #ddd;
+}
+
+th.sorted_4 {
+    background-color: #eee;
+}
+
+th.sorted_5 {
+    background-color: #fff;
+}
+
+.bz_short_desc_column a, .bz_short_short_desc_column a {
+    text-decoration: none;
+    color: inherit;
+}
+
+.bz_short_desc_column a:hover, .bz_short_short_desc_column a:hover {
+    text-decoration: underline;
+}
+
+#request_form #filtering th {
+    padding-left: 0.5em;
+}
diff --git a/skins/custom/create_bug.css b/skins/standard/create_bug.css
index 333aff48f..333aff48f 100644
--- a/skins/custom/create_bug.css
+++ b/skins/standard/create_bug.css
diff --git a/skins/contrib/Mozilla/fira/FiraMono-Bold.woff b/skins/standard/fira/FiraMono-Bold.woff
index 735352fb9..735352fb9 100644
--- a/skins/contrib/Mozilla/fira/FiraMono-Bold.woff
+++ b/skins/standard/fira/FiraMono-Bold.woff
diff --git a/skins/contrib/Mozilla/fira/FiraMono-Regular.woff b/skins/standard/fira/FiraMono-Regular.woff
index b38ee144d..b38ee144d 100644
--- a/skins/contrib/Mozilla/fira/FiraMono-Regular.woff
+++ b/skins/standard/fira/FiraMono-Regular.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-Bold.woff b/skins/standard/fira/FiraSans-Bold.woff
index a8dba6487..a8dba6487 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-Bold.woff
+++ b/skins/standard/fira/FiraSans-Bold.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff b/skins/standard/fira/FiraSans-BoldItalic.woff
index 54895de69..54895de69 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff
+++ b/skins/standard/fira/FiraSans-BoldItalic.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-Italic.woff b/skins/standard/fira/FiraSans-Italic.woff
index 298019498..298019498 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-Italic.woff
+++ b/skins/standard/fira/FiraSans-Italic.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-Regular.woff b/skins/standard/fira/FiraSans-Regular.woff
index d8e0363f4..d8e0363f4 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-Regular.woff
+++ b/skins/standard/fira/FiraSans-Regular.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff b/skins/standard/fira/FiraSans-SemiBold.woff
index 8b408d4d0..8b408d4d0 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff
+++ b/skins/standard/fira/FiraSans-SemiBold.woff
diff --git a/skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff b/skins/standard/fira/FiraSans-SemiBoldItalic.woff
index 2592e4fcf..2592e4fcf 100644
--- a/skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff
+++ b/skins/standard/fira/FiraSans-SemiBoldItalic.woff
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 17ce5ed7b..ccf62dc74 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -144,7 +144,7 @@
 
 /* footer (begin)
  * See also the "header" section for styles that apply
- * to both the header and footer. 
+ * to both the header and footer.
  */
     #footer {
         clear: both;
@@ -201,7 +201,7 @@
         border-color: black;
         border-width: 0px 0px 2px 0px;
     }
-        
+
     .tabs td.selected {
         background: white;
         border-width: 2px 2px 0px 2px;
@@ -312,7 +312,7 @@ div#docslinks {
      width: 50em;
 }
 
-.bz_comment_user, .bz_comment_time, .bz_comment_number, 
+.bz_comment_user, .bz_comment_time, .bz_comment_number,
 .bz_private_checkbox, .bz_comment_actions
 {
     margin: 0 .5em;
@@ -334,7 +334,7 @@ div#docslinks {
     text-decoration: none;
 }
 
-.bz_private_checkbox input { 
+.bz_private_checkbox input {
     margin: 0;
     vertical-align: middle;
 }
@@ -585,8 +585,8 @@ input.required, select.required, span.required_explanation {
 .calendar_button span { display: none }
 /* These classes are set by YUI. */
 .yui-calcontainer {
-    display: none; 
-    background-color: white; 
+    display: none;
+    background-color: white;
     padding: 10px;
     border: 1px solid #404D6C;
 }
@@ -721,7 +721,7 @@ input.required, select.required, span.required_explanation {
 }
 
 .autocomplete-running {
-    background-image: url("throbber.gif") !important;
+    background-image: url(../../images/throbber.gif) !important;
     background-repeat: no-repeat !important;
     background-position: right 8px center !important;
 }
@@ -743,3 +743,918 @@ input.required, select.required, span.required_explanation {
 #login .field-restrict, #login .field-remember {
     margin-left: 7em;
 }
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans'), local('FiraSans'),
+         url('fira/FiraSans-Regular.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Italic'), local('FiraSansItalic'),
+         url('fira/FiraSans-Italic.woff') format('woff');
+    font-weight: 400;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans SemiBold'), local('FiraSansSemiBold'),
+         url('fira/FiraSans-SemiBold.woff') format('woff');
+    font-weight: 600;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans SemiBold Italic'), local('FiraSansSemiBoldItalic'),
+         url('fira/FiraSans-SemiBoldItalic.woff') format('woff');
+    font-weight: 600;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Bold'), local('FiraSansBold'),
+         url('fira/FiraSans-Bold.woff') format('woff');
+    font-weight: 700;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Sans';
+    src: local('Fira Sans Bold Italic'), local('FiraSansBoldItalic'),
+         url('fira/FiraSans-BoldItalic.woff') format('woff');
+    font-weight: 700;
+    font-style: italic;
+}
+
+@font-face{
+    font-family: 'Fira Mono';
+    src: local('Fira Mono'), local('FiraMono'),
+         url('fira/FiraMono-Regular.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face{
+    font-family: 'Fira Mono';
+    src: local('Fira Mono Bold'), local('FiraMonoBold'),
+         url('fira/FiraMono-Bold.woff') format('woff');
+    font-weight: 600;
+    font-style: normal;
+}
+
+body {
+    background: #f6f4ec;
+    background-image: url(../../images/noise.png);
+    background-image: url(../../images/noise.png), -moz-linear-gradient(#d7d3c8, #f6f4ec 400px);
+    background-image: url(../../images/noise.png), -webkit-linear-gradient(#d7d3c8, #f6f4ec 400px);
+    background-image: url(../../images/noise.png), linear-gradient(#d7d3c8, #f6f4ec 400px);
+    background-repeat: repeat, repeat-x;
+    color: #404040;
+}
+
+body, td, th, input, select, option, optgroup, .text_input {
+    font-family: "Fira Sans", "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+/* security group colouring */
+/* these are also defined in skins/standard/bug_groups.css */
+
+body[class*=bz_group_] {
+    background-color: inherit;
+    background-image: url(../../images/noise.png), -moz-linear-gradient(#d7d7ff, #f0f0ff 400px);
+    background-image: url(../../images/noise.png), -webkit-linear-gradient(#d7d7ff, #f0f0ff 400px);
+    background-image: url(../../images/noise.png), linear-gradient(#d7d7ff, #f0f0ff 400px);
+}
+
+body[class*=core-security],
+body.bz_group_infrasec {
+    background-image: url(../../images/noise.png), -moz-linear-gradient(#ffe0b0, #fff4e3 400px);
+    background-image: url(../../images/noise.png), -webkit-linear-gradient(#ffe0b0, #fff4e3 400px);
+    background-image: url(../../images/noise.png), linear-gradient(#ffe0b0, #fff4e3 400px);
+}
+
+body.bz_group_webtools-security,
+body.bz_group_websites-security,
+body.bz_group_bugzilla-security {
+    background-image: url(../../images/noise.png), -moz-linear-gradient(#ffcccc, #fff0f0 400px);
+    background-image: url(../../images/noise.png), -webkit-linear-gradient(#ffcccc, #fff0f0 400px);
+    background-image: url(../../images/noise.png), linear-gradient(#ffcccc, #fff0f0 400px);
+}
+
+body.bz_group_client-services-security,
+body.bz_group_cloud-services-security {
+    background-image: url(../../images/noise.png), -moz-linear-gradient(#ffffa3, #ffffe3 400px);
+    background-image: url(../../images/noise.png), -webkit-linear-gradient(#ffffa3, #ffffe3 400px);
+    background-image: url(../../images/noise.png), linear-gradient(#ffffa3, #ffffe3 400px);
+}
+
+a, #header a, #header a:visited, #footer a, #footer a:visited {
+    color: #0095dd;
+}
+
+a:hover, #header a:hover, #footer a:hover {
+    color: #00539f;
+}
+
+select[multiple], textarea, input[type=text], input[type=password],
+input[type=email], input[type=url], input[type=number], input:not([type]), .text_input, .yui-ac-input {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px solid #b2b2b2;
+    border-radius: .25em;
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
+    background: white;
+    padding: 4px 3px 5px;
+    color: #404040;
+    vertical-align: top;
+}
+
+select[multiple], .text_input, .yui-ac-input, input {
+    font-size: 1em;
+}
+
+select[multiple]:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
+    border-color: #42a4e0;
+    -webkit-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+    -moz-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+    box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+}
+
+select, select[multiple] {
+    font-size: 12px;
+}
+
+hr {
+    border: none;
+    height: 1px;
+    color: #ccc;
+    background-color: #ccc;
+    margin: 1em 0;
+}
+
+#changeform hr {
+    display: none;
+}
+
+#header {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background: #e5e3dc;
+    background: -moz-linear-gradient(#e5e3dc, #ecebe5);
+    background: -webkit-linear-gradient(#e5e3dc, #ecebe5);
+    background: linear-gradient(#e5e3dc, #ecebe5);
+    border-radius: 0;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    border-top: 2px solid rgb(255, 255, 255);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin: -15px -15px 0 -15px;
+    color: transparent;
+}
+
+#header .subheader {
+    text-align: left;
+    padding-left: 10px;
+}
+
+#header .wrapper {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    margin: -1px auto 0px;
+    width: 99%;
+}
+
+#header .wrapper:after {
+    clear: both;
+    content: ".";
+    display: block;
+    height: 0;
+    visibility: hidden;
+}
+
+#header #bugzilla_version {
+    float: right;
+    color: #888;
+    padding: 5px 20px;
+}
+
+#titles {
+    width: 100%;
+    background-color: transparent;
+    padding: 0 1em 0 1em;
+}
+
+#information {
+    text-align: left;
+    padding-left: 2em;
+}
+
+#title {
+    width: 150px;
+    font-size: 120%;
+}
+
+#moz_tab {
+    width: 100px;
+    vertical-align: top;
+}
+
+#moz_login {
+    text-align: right;
+    padding-right: 2em;
+    color: #404040;
+}
+
+#header .links {
+    background: transparent;
+    border: none;
+    border-radius: 0;
+    color: #404040;
+    position: relative;
+    width: 50%;
+}
+
+#header .links {
+    width: auto;
+}
+
+.login-links ul {
+}
+
+.login-links li {
+    display: inline;
+}
+
+.links a {
+    margin: 0 10px 0 10px;
+}
+
+.links .home {
+    font-weight: bold;
+}
+
+.links .separator {
+    display: none;
+}
+
+#quicksearch_top, #quicksearch_main {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background: url(search.png) 5px center no-repeat, #fafafa;
+    background: url(search.png) 5px center no-repeat, -moz-linear-gradient(#fafafa, #fff);
+    background: url(search.png) 5px center no-repeat, -webkit-linear-gradient(#fafafa, #fff);
+    background: url(search.png) 5px center no-repeat, linear-gradient(#fafafa, #fff);
+    padding: .4em 1em .45em 26px;
+    width: 200px;
+}
+
+#footer .links .quicksearch_form {
+    display: none;
+}
+
+#header .form a {
+    margin: 0;
+}
+
+.links .dropdown {
+    background: rgba(0, 0, 0, 0.05);
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: .25em;
+    display: inline-block;
+    padding: 4px 8px;
+    position: relative;
+    cursor: default;
+}
+
+.links .dropdown .anchor {
+    background-image: url(../../images/dropdown.png);
+    background-position: right center;
+    background-repeat: no-repeat;
+    display: inline-block;
+    min-width: 110px;
+    padding-right: 15px;
+}
+
+.links .dropdown ul {
+    background: #fafafa;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 0 0 .25em .25em;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    display: none;
+    padding: 4px;
+    position: absolute;
+    right: -1px;
+    margin-top: 4px;
+    z-index: 2;
+    text-align: left;
+}
+
+.links .dropdown:hover ul {
+    display: block;
+}
+
+.links .dropdown li {
+    display: block;
+}
+
+.links .dropdown:hover {
+    border-bottom-right-radius: 0;
+}
+
+.links .dropdown li {
+    display: block;
+}
+
+#bugzilla-body {
+    background: none;
+    border: none;
+    color: #404040;
+    margin: 10px auto 15px;
+    padding: 0;
+    width: 99%;
+}
+
+#bugzilla-body th {
+    white-space: nowrap;
+}
+
+/* Home */
+
+/*#page-index {
+    max-width: none;
+}*/
+
+#page-index td:first-child {
+    text-align: center;
+}
+
+#quicksearch_links {
+    margin-top: 10px;
+}
+
+/* Bugs */
+
+.navigation {
+    background: rgba(255, 255, 255, 0.3);
+    padding: 5px 10px;
+}
+
+u {
+    border-bottom: 1px solid #aaa;
+    text-decoration: none;
+}
+
+#field_container_see_also br {
+    margin-bottom: 10px;
+}
+
+.bz_alias_short_desc_container {
+    background: none;
+    font-size: 20px;
+    font-weight: normal;
+    line-height: 30px;
+    padding: 5px 0;
+    text-shadow: 0 1px rgba(255, 255, 255, 0.2);
+}
+
+.bz_alias_short_desc_container b {
+    font-weight: normal;
+}
+
+.bz_alias_short_desc_container .editme {
+    font-weight: normal;
+}
+
+.last_comment_link {
+    font-size: 18px;
+}
+
+.last_comment_link b {
+    border-bottom: 1px solid #aaa;
+    font-weight: normal;
+}
+
+table.edit_form {
+    background: #fff;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin-bottom: 20px;
+    padding: 10px 10px 80px;
+    position: relative;
+}
+
+table.edit_form tbody {
+    width: 100%;
+}
+
+table.edit_form hr {
+    display: none;
+}
+
+.field_label {
+    font-weight: bold !important;
+    padding-right: 10px;
+    vertical-align: baseline;
+    white-space: nowrap;
+}
+
+.field_label a, .field_label b {
+    color: #404040;
+    font-weight: bold;
+}
+
+.field_value .text_input {
+    min-width: 0;
+}
+
+#product, #component {
+    width: 235px;
+}
+
+#bz_show_bug_column_1 tr:last-child span {
+    position: absolute;
+    left: 20px;
+    bottom: 20px;
+}
+
+#commit_top {
+    position: absolute;
+    bottom: 20px;
+    right: 10px;
+}
+
+.cc_list_display {
+    background: #fff;
+    float: none;
+    font-size: 11px;
+    margin-top: 3px;
+    max-width: none;
+    padding: 5px;
+}
+
+#project-flags, #custom-flags {
+    border-collapse: collapse;
+}
+
+#project-flags label, #custom-flags label {
+    margin-right: 10px;
+}
+
+#cf_crash_signature {
+    width: 100%;
+}
+
+#attachment_table {
+    background: #fff;
+    border: none;
+    border-collapse: collapse;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin-bottom: 40px;
+}
+
+#attachment_table td {
+    border: none;
+}
+
+#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
+    background: #eee;
+    color: #404040;
+}
+
+#attachment_table .bz_attach_actions {
+    white-space: nowrap;
+}
+
+#attachment_table .bz_private .bz_attach_desc {
+    border-left: 4px solid darkred;
+}
+
+/* background for diff views */
+.file_table, .file-table {
+    background: #ffffff;
+}
+
+.bz_comment {
+    width: 65em !important;
+    margin: 0 0 20px;
+}
+
+.bz_comment pre, #comment, #comment-preview {
+    font: 13px/1.2 "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace;
+}
+
+.bz_first_comment_head, .bz_comment_head {
+    font-weight: normal;
+    line-height: 32px;
+    padding-bottom: 2px;
+    padding-left: 0px;
+    margin-left: -5px;
+    white-space: nowrap;
+    background-color: transparent;
+}
+
+.bz_comment_head img, .bz_first_comment_head img {
+    vertical-align: middle;
+}
+
+.bz_comment_user a {
+    -moz-transition: all 100ms linear 0s;
+    -webkit-transition: all 100ms linear 0s;
+    transition: all 100ms linear 0s;
+    transition: all 100ms linear 0s;
+    color: #0095dd;
+    padding: 0px;
+    margin: 0px;
+}
+
+.bz_comment_user a:hover {
+    -moz-transition: all 100ms linear 0s;
+    -webkit-transition: all 100ms linear 0s;
+    transition: all 100ms linear 0s;
+    background: #fff;
+    border: none;
+    text-decoration: none;
+}
+
+.bz_comment_user .vcard {
+    font-weight: bold;
+}
+
+.bz_comment_actions {
+    margin: 0px 0px;
+}
+
+.new_user {
+    margin-left: 10px;
+}
+
+.ih_history {
+    padding: 0 !important;
+}
+
+.ih_history .bz_comment_head {
+    padding-bottom: 3px;
+}
+
+.ih_history_item:not(.ih_hidden) ~ .ih_history_item:not(.ih_hidden) {
+    margin-top: 20px;
+}
+
+.ih_history_change {
+    background: #eee;
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    padding: 10px;
+    position: relative;
+}
+
+.bz_comment_text {
+    background: #fff;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin: 1px 0 0 0;
+    overflow: auto;
+    padding: 10px;
+    position: relative;
+}
+
+.bz_comment_text:after, .bz_comment_text:before {
+    bottom: 100%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+}
+
+.bz_comment_text:after {
+    border-bottom-color: #fff;
+    border-width: 8px;
+    left: 16px;
+}
+
+.bz_comment_text span.quote, .bz_comment_text span.quote_wrapped {
+    background: #eee !important;
+    color: #444 !important;
+    display: block !important;
+    margin-top: 5px !important;
+    margin-bottom: -10px !important;
+    overflow: auto;
+    padding: 5px !important;
+}
+
+.bz_comment_tags {
+    background: #eee;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 5px;
+}
+
+.bz_comment_tag {
+    background: #fff;
+    color: #444;
+    border: none;
+    padding: 2px 6px;
+}
+
+.bz_comment_tag a {
+    color: #0095DD;
+}
+
+#bz_ctag_error {
+    border: none;
+    background-color: #faa;
+    color: #444;
+    padding: 2px 6px;
+}
+
+#bz_ctag_error a {
+    color: #0095DD;
+}
+
+.ih_inlinehistory {
+    background: #eee;
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    padding: 10px;
+    position: relative;
+    top: -1px;
+}
+
+.bz_collapse_expand_comments li {
+    white-space: nowrap;
+}
+
+#add_comment {
+    border: 1px solid #ccc;
+    border-width: 1px 0;
+    margin-bottom: 20px;
+    padding: 10px 0;
+}
+
+#add_comment > table {
+    border-collapse: collapse;
+    width: 661px;
+}
+
+#comment {
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+#comment_tabs {
+    margin-top: 2px;
+}
+
+#comment_preview {
+    background: white;
+    display: block;
+    clear: both;
+}
+
+#comment_preview_text {
+    background: transparent;
+    border: none;
+    box-shadow: none;
+    padding: 2px 2px 2px 1px;
+}
+
+#footer {
+    background: #fff;
+    border: none;
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: 0;
+    color: #bbb;
+    width: auto;
+    margin-bottom: 1em;
+    margin-left: 6px;
+}
+
+#links-actions, #links-saved {
+    margin-left: -10px;
+}
+
+#footer form input {
+    padding: 1px 2px;
+    margin-top: 3px;
+}
+
+#privacy-policy {
+    margin-bottom: 1em;
+}
+
+button, input[type=submit], input[type=button], #commit, #commit_top, #header .btn, #header input[type=submit] {
+    background-color: #43a6e2;
+    background-image: -moz-linear-gradient(#43a6e2,#277ac1);
+    background-image: -webkit-linear-gradient(#43a6e2,#277ac1);
+    background-image: linear-gradient(#43a6e2,#277ac1);
+    -moz-transition: all linear 100ms;
+    -webkit-transition: all linear 100ms;
+    transition: all linear 100ms;
+    border-radius: .25em;
+    border: 0px none;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
+    color: rgb(255, 255, 255);
+    cursor: pointer;
+    display: inline-block;
+    font-size: 12px;
+    font-weight: 600;
+    text-align: center;
+    text-decoration: none;
+    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
+    padding: .425em 1em .5em;
+}
+
+button:hover, input[type=submit]:hover, input[type=button]:hover, #commit:hover, #commit_top:hover, #header .btn:hover, #header input[type=submit]:hover {
+    -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    -moz-transition: all linear 100ms;
+    -webkit-transition: all linear 100ms;
+    transition: all linear 100ms;
+}
+
+button:active, input[type=submit]:active, input[type=button]:active, #commit:active, #commit_top:active, #header .btn:active, #header input[type=submit]:active  {
+    -webkit-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    -moz-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    -moz-transition: all linear 100ms;
+    -webkit-transition: all linear 100ms;
+    transition: all linear 100ms;
+}
+
+button[disabled], input[type=submit][disabled], input[type=button][disabled], button[disabled]:hover, input[type=submit][disabled]:hover, input[type=button][disabled]:hover, button[disabled]:active, input[type=submit][disabled]:active, input[type=button][disabled]:active {
+    background-color: #bfc7cd;
+    background-image: -moz-linear-gradient(#bfc7cd,#9ca3aa);
+    background-image: -webkit-linear-gradient(#bfc7cd,#9ca3aa);
+    background-image: linear-gradient(#bfc7cd,#9ca3aa);
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
+    cursor: pointer;
+}
+
+.notransition {
+  -webkit-transition: none !important;
+  -moz-transition: none !important;
+  -o-transition: none !important;
+  -ms-transition: none !important;
+  transition: none !important;
+}
+
+.calendar_button, .calendar_button:hover {
+    box-shadow: none;
+    padding: 0;
+}
+
+.related_actions {
+    line-height: 19px;
+    padding: 5px 10px;
+}
+
+/* Attachments */
+
+#viewFrame {
+    border: 2px solid #222;
+    margin-bottom: 10px;
+}
+
+#editFrame, #viewDiffFrame, #viewFrame {
+    margin-left: 0;
+}
+
+#flags label {
+    font-weight: normal;
+}
+
+/* tabs */
+
+table.tabs {
+    border-collapse: separate;
+    border-spacing: 1em 0;
+}
+
+.tabs td {
+    background: rgba(255,255,255,0.5);
+    padding: 1em;
+    text-align: center;
+    border-style: none;
+    font-size: 12px;
+    text-transform: uppercase;
+}
+
+.tabs td.selected {
+    background: white;
+    font-weight: 700;
+}
+
+.tabs td.spacer {
+    background: transparent;
+}
+
+.tabs a {
+    color: #333;
+}
+
+.tabbody {
+    background: white;
+    padding: 1em 2em;
+}
+
+/* splinter */
+
+#splinter-files .new-line, #splinter-files .old-line {
+    font-size: 90%;
+}
+
+/* search */
+
+#summary_field.search_field_row input {
+    padding-bottom: 6px;
+}
+
+body {
+    margin: 0;
+    padding: 15px 15px 2px 15px;
+}
+
+#header .btn, #header .txt {
+    font-size: 100%;
+}
+
+#header #information {
+    color: #dddddd;
+    font-size: small;
+}
+
+pre {
+    font-size: medium;
+}
+
+#attachment_table {
+    width: 50em;
+}
+
+#page-index #quicksearchForm {
+    padding-top: 20px;
+}
+
+/* createaccount styling */
+.support_div {
+    width: 40%;
+    font-size: 80%;
+}
+
+.support_div > img {
+  padding: 5px 20px;
+}
+
+a {
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+a.controller {
+    font-size: 100%;
+    border: 1px solid #c0c0c0;
+    padding: 3px;
+}
+
+.group_secure > th > a {
+    background-image: url("../../images/padlock.png");
+    background-position: center left;
+    background-repeat: no-repeat;
+    padding-left: 18px;
+}
+
+#policy_links {
+    padding-right: 5px;
+    text-align: right;
+}
+
+#policy_links li {
+    display: inline;
+}
+
+.highlighted {
+    background: lightyellow;
+}
+
+/* user dropdown menu down-arrow */
+.vcard a .fn:after, .vcard a .ln:after {
+    content: ' \25BE';
+}
diff --git a/skins/standard/index.css b/skins/standard/index.css
index 1e440cb99..f7533c6c4 100644
--- a/skins/standard/index.css
+++ b/skins/standard/index.css
@@ -11,7 +11,7 @@
   * The Original Code is the Bugzilla Bug Tracking System.
   *
   * Contributor(s): Vitaly Harisov <vitaly@rathedg.com>
-  *                 Guy Pyrzak <guy.pyrzak@gmail.com> 
+  *                 Guy Pyrzak <guy.pyrzak@gmail.com>
   */
 
 /* index page (begin) */
@@ -19,7 +19,7 @@
     #page-index
     {
         padding: 0.2em 0.2em 0.15em 0.2em;
-        max-width: 1000px;
+        max-width: none;
     }
 
     /* By default these contain nothing, but these CSS rules make things
@@ -76,36 +76,30 @@
     .bz_common_actions a:hover {
         text-decoration: none;
     }
-    #enter_bug { background: url(index/file-a-bug.png)     no-repeat; }
-    #query     { background: url(index/search.png)  no-repeat; }
-    #account   { 
-      background: url(index/new-account.png) no-repeat; 
-      margin-right: 0;
-    }
-    
+
     #quicksearchForm
     {
         clear: both;
         text-align: center;
         margin-bottom: 2em;
     }
-    
+
     #quicksearchForm #quicksearch_main
     {
         width: 27em;
     }
-    
+
     #quicksearchForm
     {
         margin: 0;
         padding: 0;
     }
-    
+
     #page-index table{
         border-collapse: collapse;
         margin: auto;
     }
-    
+
     #welcome
     {
         font-size: x-large;
@@ -114,30 +108,75 @@
         margin: 0 0 0.8em 0;
         padding: 0;
     }
-    
-    ul.additional_links 
+
+    ul.additional_links
     {
         list-style: none;
         margin: 0;
         padding: 0;
     }
-    
+
     ul#quicksearch_links{
         margin-bottom: 1em;
     }
-    
+
     ul.additional_links li
     {
         display: inline;
     }
-    
+
     ul.additional_links li.bz_default_hidden
     {
         display: none;
     }
-    
+
     input.quicksearch_help_text
     {
         color: #ccc;
     }
 /* index page (end) */
+
+
+    #enter_bug
+    {
+        background: url(../../images/bugzilla-papericon.png) no-repeat;
+    }
+    #query
+    {
+        background: url(../../images/bugzilla-magnifier.png) no-repeat;
+    }
+    #account
+    {
+        background: url(../../images/bugzilla-person-alternate.png) no-repeat;
+        margin-right: 0;
+    }
+    #docs
+    {
+        background: url(../../images/bugzilla-questionmark2.png) no-repeat !important;
+    }
+
+    #page-index .intro { display: inline; }
+
+    #docs { background: url(../standard/index/help.png) no-repeat; }
+
+    .bz_common_actions
+    {
+        display: block;
+        height: 170px;
+        width: 145px;
+        float: left;
+        margin: 0 2ex 2em 0;
+        text-align: center;
+    }
+    .bz_common_actions span
+    {
+        position: relative;
+        top: 95%;
+        font-weight: bold;
+    }
+    .bz_common_actions,
+    .bz_common_actions:visited,
+    .bz_common_actions:hover
+    {
+        text-decoration: none;
+    }
diff --git a/skins/contrib/Mozilla-OpenSans/search.png b/skins/standard/search.png
index a56b5e2cd..a56b5e2cd 100644
--- a/skins/contrib/Mozilla-OpenSans/search.png
+++ b/skins/standard/search.png
diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index 509d87f66..71ce22484 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -204,3 +204,9 @@ div.bz_section_title span {
 .bz_simple_search_form th {
   text-align: right;
 }
+
+/* let the browser choose the select height from the "size" param */
+.search_field_grid select {
+    height: auto;
+}
+
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index d266419c5..0ef6722f9 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -159,3 +159,88 @@ table#flags {
     float: right;
 }
 
+
+.last_comment_link {
+    float: right;
+    font-size: 80%;
+    font-weight: normal;
+    margin-left: 1em;
+}
+
+#legal_disclaimer {
+    width: 40em;
+    padding: 1em;
+    margin: 0 1em 1em 1em;
+    font-weight: bold;
+    border: 1px red solid;
+    background-color: lightyellow;
+}
+
+.bz_patch {
+    background: #ffffcc;
+}
+
+.cc_list_display {
+    list-style: none;
+    margin:0px;
+    padding:5px;
+    padding-right:20px;
+    overflow:auto;
+    float:left;
+    max-width:465px;
+    max-height:100px;
+    border:1px solid #CCC;
+}
+
+.cc_list_display li {
+    margin:0px;
+    padding:0px;
+    white-space:nowrap;
+}
+
+#wave_wand {
+    margin-top: 0px;
+}
+
+/* put the width on the TD rather than the PRE to stop the col resizing
+   when comments are hidden */
+.bz_comment {
+    width: 55em;
+}
+.bz_comment_text {
+    width: auto;
+}
+
+.bz_comment_number {
+    float: right;
+}
+
+/* style all field labels the same */
+
+.field_label, .field_label a {
+    color: #000;
+    font-weight: bold;
+}
+
+.field_label a {
+    cursor: help;
+}
+
+.edit_form table th:first-child {
+    width: 0px;
+}
+
+#bz_show_bug_column_1, #bz_show_bug_column_2 {
+    width: 50%;
+}
+
+/* fix flag table's vertical alignment */
+
+table#flags {
+    border-collapse: collapse;
+    border-spacing: 0px;
+}
+
+div[class="bz_comment"]:target {
+    border: 2px solid #0095DD;
+}
diff --git a/t/css.t b/t/css.t
new file mode 100644
index 000000000..84d1ae3f0
--- /dev/null
+++ b/t/css.t
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+use strict;
+use warnings;
+use 5.10.1;
+use lib qw( . lib local/lib/perl5 );
+use File::Spec;
+use File::Slurp qw(read_file);
+use File::Find qw(find);
+use Cwd qw(realpath cwd);
+use Test::More;
+
+my $root = cwd();
+
+find(
+    {
+        wanted => sub {
+            if (/\.css$/) {
+                my $css_file = $File::Find::name;
+                my $content = read_file($_);
+                while ($content =~ m{url\(["']?([^\)"']+)['"]?\)}g) {
+                    my $file = $1;
+                    my $file_rel_root = File::Spec->abs2rel(realpath(File::Spec->rel2abs($file)), $root);
+
+                    ok(-f $file, "$css_file references $file ($file_rel_root)");
+                }
+            }
+        },
+    },
+    'skins'
+);
+
+done_testing;
diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 5bdd8ddaa..fc748cdd1 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -167,7 +167,7 @@
     <div id="mfa-enable-totp" style="display:none">
 
       <div id="mfa-totp-throbber">
-        Generating new QR code.. <img src="skins/standard/throbber.gif" width="16" height="11">
+        Generating new QR code.. <img src="../../images/throbber.gif" width="16" height="11">
       </div>
 
       <div id="mfa-totp-issued" style="display:none">
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index c19cf1407..f1b86e19f 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -19,17 +19,17 @@
   #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
-[% 
+[%
    title = "General"
-   desc = "Miscellaneous general settings that are not required." 
+   desc = "Miscellaneous general settings that are not required."
 %]
 
 [% param_descs = {
-  maintainer => 
+  maintainer =>
     "The email address of the person who maintains this installation "
     _ " of ${terms.Bugzilla}.",
 
-  docs_urlbase => 
+  docs_urlbase =>
     "The URL that is the common initial leading part of all"
     _ " $terms.Bugzilla documentation URLs. It may be an absolute URL,"
     _ " or a URL relative to the <tt>urlbase</tt> parameter. Leave this"
@@ -37,7 +37,7 @@
     _ "'%lang%' will be replaced by user's preferred language (if"
     _ " documentation is available in that language).",
 
-  utf8 => 
+  utf8 =>
     "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New"
     _ " installations should set this to true to avoid character encoding"
     _ " problems. <strong>Existing databases should set this to true"
@@ -48,12 +48,12 @@
     _ " &quot;on&quot;, you must re-run <kbd>checksetup.pl</kbd> immediately"
     _ " afterward.</p>",
 
-  shutdownhtml => 
+  shutdownhtml =>
     "If this field is non-empty, then $terms.Bugzilla will be completely"
     _ " disabled and this text will be displayed instead of all the"
     _ " $terms.Bugzilla pages.",
 
-  announcehtml => 
+  announcehtml =>
     "If this field is non-empty, then $terms.Bugzilla will"
     _ " display whatever is in this field at the top of every"
     _ " HTML page. The HTML you put in this field is not wrapped or"
@@ -61,11 +61,11 @@
     _ "<tt>&lt;div&gt;</tt>. Give the div <em>id=\"message\"</em> to get"
     _ " green text inside a red box, or <em>class=\"bz_private\"</em> for"
     _ " dark red on a red background.  Anything defined in "
-    _ " <tt>skins/standard/global.css</tt> or <tt>skins/custom/global.css</tt>"
+    _ " <tt>skins/standard/global.css</tt>"
     _ " will work.  To get centered text, use <em>style=\"text-align: "
     _  " center;\"</em>.",
 
-  upgrade_notification => 
+  upgrade_notification =>
     "$terms.Bugzilla can inform you when a new release is available."
     _ " The notification will appear on the $terms.Bugzilla homepage,"
     _ " for administrators only."
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ab95c38a7..d969ded64 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -33,7 +33,7 @@
   generate_api_token = 1
   style_urls = [ 'skins/standard/attachment.css',
                  'skins/standard/enter_bug.css',
-                 'skins/custom/create_bug.css' ]
+                 'skins/standard/create_bug.css' ]
   javascript_urls = [ "js/attachment.js", "js/util.js",
                       "js/field.js", "js/TUI.js", "js/bug.js",
                       "js/create_bug.js" ]
@@ -154,8 +154,8 @@ function set_assign_to() {
         for (var i = 0; i < flag_rows.length; i++) {
             // Each flag table row should have one flag form select element
             // We get the flag type id from the id attribute of the select.
-            var flag_select = YAHOO.util.Dom.getElementsByClassName('flag_select', 
-                                                                    'select', 
+            var flag_select = YAHOO.util.Dom.getElementsByClassName('flag_select',
+                                                                    'select',
                                                                     flag_rows[i])[0];
             var type_id = flag_select.id.split('-')[1];
             var can_set = flag_select.options.length > 1 ? 1 : 0;
@@ -181,7 +181,7 @@ function set_assign_to() {
 
 var status_comment_required = new Array();
 [% FOREACH status = bug_status %]
-  status_comment_required['[% status.name FILTER js %]'] = 
+  status_comment_required['[% status.name FILTER js %]'] =
     [% status.comment_required_on_change_from() ? 'true' : 'false' %]
 [% END %]
 
@@ -218,7 +218,7 @@ TUI_hide_default('attachment_text_field');
              value="Hide Advanced Fields" onClick="toggleAdvancedFields()">
       [%# Show the link if the browser supports JS %]
       <script type="text/javascript">
-        YAHOO.util.Dom.removeClass('expert_fields_controller', 
+        YAHOO.util.Dom.removeClass('expert_fields_controller',
                                    'bz_default_hidden');
       </script>
     </td>
@@ -245,7 +245,7 @@ TUI_hide_default('attachment_text_field');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.component editable = 1
       desc_url = component_desc_url
-    %]      
+    %]
     <td id="field_container_component">
       <select name="component" id="component" onchange="set_assign_to();"
               size="7" aria-required="true" class="required">
@@ -278,7 +278,7 @@ TUI_hide_default('attachment_text_field');
 
       <script type="text/javascript">
        <!--
-         [%+ INCLUDE "bug/field-events.js.tmpl" 
+         [%+ INCLUDE "bug/field-events.js.tmpl"
                      field = bug_fields.component, product = product %]
        //-->
        </script>
@@ -302,7 +302,7 @@ TUI_hide_default('attachment_text_field');
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
-      field = bug_fields.version editable = 1 rowspan = 3 
+      field = bug_fields.version editable = 1 rowspan = 3
     %]
     <td rowspan="3">
       <select name="version" id="version" size="5">
@@ -316,7 +316,7 @@ TUI_hide_default('attachment_text_field');
     </td>
 
     [% INCLUDE bug/field.html.tmpl
-      bug = default, field = bug_fields.bug_severity, editable = 1, 
+      bug = default, field = bug_fields.bug_severity, editable = 1,
       value = default.bug_severity %]
   </tr>
 
@@ -372,7 +372,7 @@ TUI_hide_default('attachment_text_field');
 
     [% IF Param('letsubmitterchoosepriority') %]
       [% INCLUDE bug/field.html.tmpl
-        bug = default, field = bug_fields.priority, editable = 1, 
+        bug = default, field = bug_fields.priority, editable = 1,
         value = default.priority %]
     [% ELSE %]
       <td colspan="2">&nbsp;</td>
@@ -414,7 +414,7 @@ TUI_hide_default('attachment_text_field');
       [% END %]
       <noscript>(Leave blank to assign to component's default assignee)</noscript>
     </td>
-  
+
 [% IF Param("useqacontact") %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.qa_contact editable = 1
@@ -436,7 +436,7 @@ TUI_hide_default('attachment_text_field');
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
-      field = bug_fields.cc editable = 1 
+      field = bug_fields.cc editable = 1
     %]
     <td>
       [% INCLUDE global/userselect.html.tmpl
@@ -493,10 +493,10 @@ TUI_hide_default('attachment_text_field');
       <td colspan="3">
         <div id="possible_duplicates"></div>
         <script type="text/javascript">
-          var dt_columns = [ 
+          var dt_columns = [
               { key: "id", label: "[% field_descs.bug_id FILTER js %]",
                 formatter: YAHOO.bugzilla.dupTable.formatBugLink },
-              { key: "summary", 
+              { key: "summary",
                 label: "[% field_descs.short_desc FILTER js %]",
                 formatter: "text" },
               { key: "status",
@@ -582,7 +582,7 @@ TUI_hide_default('attachment_text_field');
                    [% ' checked="checked"' IF comment_is_private %]
                    onClick="updateCommentTagControl(this, 'comment')">
             <label for="comment_is_private">
-              Make this attachment and [% terms.bug %] description private (visible only 
+              Make this attachment and [% terms.bug %] description private (visible only
               to members of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
             </label>
           [% END %]
@@ -664,8 +664,8 @@ TUI_hide_default('attachment_text_field');
   [% NEXT IF field.hidden %]
   [% SET value = ${field.name}.defined ? ${field.name} : "" %]
   <tr [% 'class="expert_fields"' IF !field.is_mandatory %]>
-    [% INCLUDE bug/field.html.tmpl 
-      bug = default, field = field, value = value, editable = 1, 
+    [% INCLUDE bug/field.html.tmpl
+      bug = default, field = field, value = value, editable = 1,
       value_span = 3 %]
   </tr>
 [% END %]
@@ -728,7 +728,7 @@ TUI_hide_default('attachment_text_field');
     <th>&nbsp;</th>
     <td colspan="3">
         <strong>
-          Only users in all of the selected groups can view this 
+          Only users in all of the selected groups can view this
           [%+ terms.bug %]:
         </strong>
       <br>
@@ -801,7 +801,7 @@ TUI_hide_default('attachment_text_field');
     field = field editable = 1
   %]
   <td>
-    <select name="[% field.name FILTER html %]" 
+    <select name="[% field.name FILTER html %]"
             id="[% field.name FILTER html %]">
     [%- FOREACH x = ${field.name} %]
       [% NEXT IF NOT x.is_active %]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 2aac89ddb..2fbc7ef51 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -76,8 +76,8 @@
     [% javascript FILTER none %]
   [% END %]
 [% END %]
-[% style_urls = [ "skins/standard/show_bug.css", 
-                  "skins/custom/bug_groups.css" ] %]
+[% style_urls = [ "skins/standard/show_bug.css",
+                  "skins/standard/bug_groups.css" ] %]
 [% doc_section = "bug_page.html" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index ac753dca9..107c69069 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -200,8 +200,8 @@
 
     [%# this puts the live bookmark up on firefox for the Atom feed %]
     [% IF atomlink %]
-       <link rel="alternate" 
-             type="application/atom+xml" title="Atom feed" 
+       <link rel="alternate"
+             type="application/atom+xml" title="Atom feed"
              href="[% atomlink FILTER html %]">
     [% END %]
 
@@ -296,9 +296,9 @@
               </li>
             [% ELSE %]
                 [%# Only display one login form when we're on a LOGIN_REQUIRED page. That
-                # way, we're guaranteed that the user will use the form that has 
+                # way, we're guaranteed that the user will use the form that has
                 # hidden_fields in it (the center form) instead of this one. Also, it's
-                # less confusing to have one form (as opposed to  three) when you're 
+                # less confusing to have one form (as opposed to  three) when you're
                 # required to log in.
                 #%]
                 [% IF user.authorizer.can_login && !Bugzilla.page_requires_login %]
@@ -310,7 +310,7 @@
       </td>
       <td id="moz_tab">
         <a href="https://www.mozilla.org/" title="Mozilla - Home of the Mozilla Project">
-          <img src="skins/contrib/Mozilla/tabzilla.png" border="0" height="42" width="154"></a>
+          <img src="images/tabzilla.png" border="0" height="42" width="154"></a>
       </td>
     </tr>
     </table>
diff --git a/template/en/default/mfa/duo/verify.html.tmpl b/template/en/default/mfa/duo/verify.html.tmpl
index 627b82039..77f87cd65 100644
--- a/template/en/default/mfa/duo/verify.html.tmpl
+++ b/template/en/default/mfa/duo/verify.html.tmpl
@@ -37,7 +37,7 @@ $(function() {
 [% css = BLOCK %]
 
   #duo_container {
-    background: #fff url(skins/standard/throbber.gif) 10px 10px no-repeat;
+    background: #fff url(../../images/throbber.gif) 10px 10px no-repeat;
     width: 620px;
     height: 330px;
     border: 1px solid #000;