diff --git a/contrib/themes/diffy/etc/GerritSite.css b/contrib/themes/diffy/etc/GerritSite.css
deleted file mode 100644
index 76c595a2b7..0000000000
--- a/contrib/themes/diffy/etc/GerritSite.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#gerrit_topmenu {
- left: 60px;
- margin-right: 60px;
- position: relative;
- margin-bottom: 5px;
-}
-
-#diffy_logo {
- display: block !important;
- margin-bottom: -55px;
- padding-left: 10px;
- position: relative;
- top: -55px;
- width: 60px;
-}
diff --git a/contrib/themes/diffy/etc/GerritSiteHeader.html b/contrib/themes/diffy/etc/GerritSiteHeader.html
deleted file mode 100644
index 89b4db5149..0000000000
--- a/contrib/themes/diffy/etc/GerritSiteHeader.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/contrib/themes/diffy/static/diffymute.svg b/contrib/themes/diffy/static/diffymute.svg
deleted file mode 100644
index 6833ba6a9f..0000000000
--- a/contrib/themes/diffy/static/diffymute.svg
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
-
-
-
diff --git a/contrib/themes/diffy/static/logo.png b/contrib/themes/diffy/static/logo.png
deleted file mode 100644
index 989c30304c..0000000000
Binary files a/contrib/themes/diffy/static/logo.png and /dev/null differ
diff --git a/contrib/themes/spotify/etc/GerritSite.css b/contrib/themes/spotify/etc/GerritSite.css
deleted file mode 100644
index 489452a949..0000000000
--- a/contrib/themes/spotify/etc/GerritSite.css
+++ /dev/null
@@ -1,113 +0,0 @@
-#gerrit_topmenu {
- font-size: 9pt !important;
- padding-top: 5px !important;
- padding-left: 15px !important;
- padding-right: 15px !important;
- background: url(static/background-spotigreen.jpg) !important;
- float: left !important;
- margin-left: 250px !important;
- margin-right: 150px !important;
- border-radius: 0 0 10px 10px !important;
- padding-bottom: 10px !important;
- border-bottom: 1px solid #abc506 !important;
- border-right: 1px solid #abc506 !important;
- border-left: 1px solid #abc506 !important;
-}
-
-body, .gwt-DialogBox .dialogMiddleCenter {
- background: #FFF url(static/background-gradient.png) no-repeat !important;
-}
-
-#logo-spotify {
- background: url(static/logo.png) no-repeat;
- height: 98px;
- width: 228px;
- margin-left: 2px;
-}
-
-#gerrit_header {
- background: #FCFEEF;
- padding-bottom: 10px;
- border-bottom: dashed 1px rgba(0, 0, 0, 0.05);
-}
-
-#gerrit_topmenu .gwt-TextBox {
- margin-top: 15px;
- width: 240px;
-}
-
-#gerrit_topmenu > table {
- float: left;
-}
-
-#gerrit_topmenu > table > tbody > tr > td:nth-child(3) a {
- margin-left: 5px;
- background-color: #FFC;
- border-radius: 3px;
- padding: 5px 5px;
- border-right: none !important;
-}
-
-.gwt-TabPanelBottom {
- background: #FFC !important;
- border-radius: 0 0 3px 3px !important;
- padding-bottom: 6px !important;
- padding-top: 6px !important;
-}
-
-.gwt-TabBar .gwt-TabBarItem, .gwt-TabBar .gwt-TabBarRest, .gwt-TabBar .gwt-TabPanelBottom {
- background: transparent !important;
-}
-
-.gwt-TabBarItem-wrapper {
- background: rgba(255, 255, 255, 0.2) !important;
-}
-
-#gerrit_topmenu .gwt-TabBar .gwt-TabBarItem-selected {
- background: #FFC !important;
- border-radius: 3px 3px 0 0 !important;
-}
-
-#gerrit_topmenu .gwt-TabBar .gwt-TabBarItem-selected:hover {
- background: #FFC !important;
-}
-
-#gerrit_topmenu .gwt-TabBar .gwt-TabBarItem-selected:focus {
- outline: none !important;
-}
-
-#gerrit_topmenu > table > tbody > tr > td > table {
- border: none !important;
-}
-
-.gwt-TabBar {
- border-bottom: 1px solid #E2E2AD !important;
-}
-
-.gwt-TabBarItem {
- border-right: 1px solid rgba(79, 58, 0, 0.3) !important;
- background: rgba(255, 255, 255, 0.2) !important;
-}
-
-.gwt-TabBarItem:hover {
- background: rgba(255, 255, 255, 0.1) !important;
-}
-
-a, a:visited {
- text-decoration: none !important;
- color: #3F4D00 !important;
-}
-
-a:hover {
- color: #5d7200 !important;
- text-decoration: underline !important;
-}
-
-.gwt-Label {
-height: 30px !important;
-line-height: 30px !important;
-}
-
-#gerrit_btmmenu > div {
- color: rgba(0, 0, 0, 0.3) !important;
-}
\ No newline at end of file
diff --git a/contrib/themes/spotify/etc/GerritSiteHeader.html b/contrib/themes/spotify/etc/GerritSiteHeader.html
deleted file mode 100644
index 8af84be723..0000000000
--- a/contrib/themes/spotify/etc/GerritSiteHeader.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/contrib/themes/spotify/static/background-gradient.png b/contrib/themes/spotify/static/background-gradient.png
deleted file mode 100644
index 3b9422eaec..0000000000
Binary files a/contrib/themes/spotify/static/background-gradient.png and /dev/null differ
diff --git a/contrib/themes/spotify/static/background-spotigreen.jpg b/contrib/themes/spotify/static/background-spotigreen.jpg
deleted file mode 100644
index fcc7983309..0000000000
Binary files a/contrib/themes/spotify/static/background-spotigreen.jpg and /dev/null differ
diff --git a/contrib/themes/spotify/static/logo.png b/contrib/themes/spotify/static/logo.png
deleted file mode 100644
index c231031c29..0000000000
Binary files a/contrib/themes/spotify/static/logo.png and /dev/null differ
-