diff --git a/web/gui/src/main/webapp/app/view/device/device-theme.css b/web/gui/src/main/webapp/app/view/device/device-theme.css
new file mode 100644
index 0000000..cb134f5
--- /dev/null
+++ b/web/gui/src/main/webapp/app/view/device/device-theme.css
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.
+ */
+
+/*
+ ONOS GUI -- Device View (theme) -- CSS file
+ */
+
+.light #ov-device .current-view use {
+    fill: white;
+}
+.dark #ov-device .current-view use {
+    fill: #304860;
+}
+
+.light #ov-device .current-view rect {
+    fill: deepskyblue;
+}
+.dark #ov-device .current-view rect {
+    fill: #eee;
+}
+
+.light #device-details-panel.floatpanel {
+    background-color: rgb(229, 234, 237);
+}
+.dark #device-details-panel.floatpanel {
+    background-color: #3A4042;
+}
+
+.light .close-btn svg.embeddedIcon .icon.plus .glyph {
+    fill: #aaa;
+}
+.dark .close-btn svg.embeddedIcon .icon.plus .glyph {
+    fill: #ccc;
+}
+
+.light .dev-icon svg.embeddedIcon .glyph {
+    fill: rgb(0, 172, 229);
+}
+.dark .dev-icon svg.embeddedIcon .glyph {
+    fill: #486D91;
+}
+
+#device-details-panel .editable {
+    cursor: pointer;
+    border-bottom: 1px dashed darkgreen;
+}
+
+#device-details-panel td.label {
+    /* works for both light and dark themes ... */
+    color: #777;
+}
+
+.light #device-details-panel hr {
+    opacity: .5;
+    border-color: #FFF;
+}
+.dark #device-details-panel hr {
+    border-color: #666;
+}
+
+.light #device-details-panel .bottom th {
+    background-color: #CCC;
+    /* default text color */
+}
+.dark #device-details-panel .bottom th {
+    background-color: #131313;
+    color: #ccc;
+}
+
+.light #device-details-panel .bottom tr:nth-child(odd) {
+    background-color: #f9f9f9;
+}
+.light #device-details-panel .bottom tr:nth-child(even) {
+    background-color: #EBEDF2;
+}
+.dark #device-details-panel .bottom tr:nth-child(odd) {
+    background-color: #333;
+}
+.dark #device-details-panel .bottom tr:nth-child(even) {
+    background-color: #555;
+}
diff --git a/web/gui/src/main/webapp/app/view/device/device.css b/web/gui/src/main/webapp/app/view/device/device.css
index 01a3b5c..a84286d 100644
--- a/web/gui/src/main/webapp/app/view/device/device.css
+++ b/web/gui/src/main/webapp/app/view/device/device.css
@@ -15,7 +15,7 @@
  */
 
 /*
- ONOS GUI -- Device View -- CSS file
+ ONOS GUI -- Device View (layout) -- CSS file
  */
 
 #ov-device h2 {
@@ -25,19 +25,6 @@
 #ov-device div.ctrl-btns {
 }
 
-.light #ov-device .current-view use {
-    fill: white;
-}
-.dark #ov-device .current-view use {
-    fill: #304860;
-}
-
-.light #ov-device .current-view rect {
-    fill: deepskyblue;
-}
-.dark #ov-device .current-view rect {
-    fill: #eee;
-}
 
 /* More in generic panel.css */
 
@@ -47,12 +34,6 @@
     z-index: 0;
 }
 
-.light #device-details-panel.floatpanel {
-    background-color: rgb(229, 234, 237);
-}
-.dark #device-details-panel.floatpanel {
-    background-color: #3A4042;
-}
 
 #device-details-panel .container {
     padding: 0 12px;
@@ -64,34 +45,18 @@
     top: 0;
     cursor: pointer;
 }
-.light .close-btn svg.embeddedIcon .icon.plus .glyph {
-    fill: #aaa;
-}
-.dark .close-btn svg.embeddedIcon .icon.plus .glyph {
-    fill: #ccc;
-}
 
 #device-details-panel .dev-icon {
     display: inline-block;
     padding: 0 6px 0 0;
     vertical-align: middle;
 }
-.light .dev-icon svg.embeddedIcon .glyph {
-    fill: rgb(0, 172, 229);
-}
-.dark .dev-icon svg.embeddedIcon .glyph {
-    fill: #486D91;
-}
 
 #device-details-panel h2 {
     display: inline-block;
     margin: 8px 0;
 }
 
-#device-details-panel .editable {
-    cursor: pointer;
-    border-bottom: 1px dashed darkgreen;
-}
 
 #device-details-panel h2 input {
     font-size: 1.0em;
@@ -108,8 +73,6 @@
 #device-details-panel td.label {
     font-style: italic;
     padding-right: 12px;
-    /* works for both light and dark themes ... */
-    color: #777;
 }
 
 #device-details-panel .actionBtns div {
@@ -121,13 +84,6 @@
     margin: 0 auto;
 }
 
-.light #device-details-panel hr {
-    opacity: .5;
-    border-color: #FFF;
-}
-.dark #device-details-panel hr {
-    border-color: #666;
-}
 
 #device-details-panel .bottom table {
     border-spacing: 0;
@@ -137,14 +93,6 @@
     letter-spacing: 0.02em;
 }
 
-.light #device-details-panel .bottom th {
-    background-color: #CCC;
-    /* default text color */
-}
-.dark #device-details-panel .bottom th {
-    background-color: #131313;
-    color: #ccc;
-}
 
 #device-details-panel .bottom th,
 #device-details-panel .bottom td {
@@ -152,15 +100,3 @@
     text-align: center;
 }
 
-.light #device-details-panel .bottom tr:nth-child(odd) {
-    background-color: #f9f9f9;
-}
-.light #device-details-panel .bottom tr:nth-child(even) {
-    background-color: #EBEDF2;
-}
-.dark #device-details-panel .bottom tr:nth-child(odd) {
-    background-color: #333;
-}
-.dark #device-details-panel .bottom tr:nth-child(even) {
-    background-color: #555;
-}