diff --git a/artsrc/cnc/ui.svg b/artsrc/cnc/ui.svg
new file mode 100644
index 0000000000..a0f0b89452
--- /dev/null
+++ b/artsrc/cnc/ui.svg
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="ui.svg"
+   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/chrome.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="191.88571"
+     inkscape:cy="64.277751"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1626"
+     inkscape:window-height="1006"
+     inkscape:window-x="58"
+     inkscape:window-y="162"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.3622)">
+    <g
+       transform="translate(0,2.0004485e-5)"
+       id="layer1-3"
+       inkscape:label="Layer 1">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+         y="988.86218"
+         x="0.5"
+         height="63"
+         width="63"
+         id="rect3776-3"
+         style="fill:#2b0000;fill-opacity:0.87843137;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         style="fill:#560000;fill-opacity:0.87843137;stroke:#c00000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3759"
+         width="63"
+         height="63"
+         x="0.5"
+         y="924.86218"
+         inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <rect
+         style="fill:#2b2b2b;fill-opacity:0.87843137;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect2984-3"
+         width="63"
+         height="63"
+         x="64.5"
+         y="924.86218"
+         inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <rect
+         style="fill:#0f0000;fill-opacity:0.87843137;stroke:#c00000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3753"
+         width="63"
+         height="63"
+         x="64.5"
+         y="988.86218"
+         inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </g>
+    <rect
+       style="fill:#2b0000;fill-opacity:0.87843137;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3776"
+       width="63"
+       height="63"
+       x="0.5"
+       y="860.86218"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-859.86218"
+       x="64.5"
+       height="63"
+       width="63"
+       id="rect2984"
+       style="fill:#000000;fill-opacity:0.75294118;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       style="fill:#302020;fill-opacity:0.75294118;stroke:#800000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3007"
+       width="63"
+       height="63"
+       x="64.5"
+       y="-923.86218"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g3052"
+       transform="translate(-128,0)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path5225"
+         d="m 128.5,796.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,798.8622 63.00122,0"
+         id="path5229"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5231"
+         d="m 128.5,800.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,802.8622 63.00122,0"
+         id="path5233"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5235"
+         d="m 128.5,804.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,806.8622 63.00122,0"
+         id="path5237"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5239"
+         d="m 128.5,808.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,810.8622 63.00122,0"
+         id="path5241"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5243"
+         d="m 128.5,812.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,814.8622 63.00122,0"
+         id="path5245"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5247"
+         d="m 128.5,816.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,818.8622 63.00122,0"
+         id="path5249"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5251"
+         d="m 128.5,820.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,822.8622 63.00122,0"
+         id="path5253"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5255"
+         d="m 128.5,824.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,826.8622 63.00122,0"
+         id="path5257"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5259"
+         d="m 128.5,828.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,830.8622 63.00122,0"
+         id="path5261"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5263"
+         d="m 128.5,832.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,834.8622 63.00122,0"
+         id="path5265"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5267"
+         d="m 128.5,836.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,838.8622 63.00122,0"
+         id="path5269"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5271"
+         d="m 128.5,840.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,842.8622 63.00122,0"
+         id="path5273"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5275"
+         d="m 128.5,844.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,846.8622 63.00122,0"
+         id="path5277"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5279"
+         d="m 128.5,848.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,850.8622 63.00122,0"
+         id="path5281"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5283"
+         d="m 128.5,852.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,854.8622 63.00122,0"
+         id="path5285"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5287"
+         d="m 128.5,856.8622 63.00122,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 128.5,858.8622 63.00122,0"
+         id="path5289"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(128,1.0707092e-5)"
+       id="layer1-9"
+       inkscape:label="Layer 1"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/layer1-9.png"
+       inkscape:export-xdpi="180"
+       inkscape:export-ydpi="180">
+      <rect
+         y="940.36218"
+         x="16"
+         height="96.000008"
+         width="96"
+         id="rect2987"
+         style="fill:#000080;fill-opacity:0.00392157;stroke:#000000;stroke-width:31.99999809;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         y="955.36218"
+         x="31.000002"
+         height="66"
+         width="66"
+         id="rect3776-4"
+         style="fill:none;stroke:#800000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g3280">
+      <text
+         sodipodi:linespacing="125%"
+         id="text3048"
+         y="893.86218"
+         x="4"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="893.86218"
+           x="4"
+           id="tspan3050"
+           sodipodi:role="line">panel-darkred</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="74.200432"
+         y="893.86218"
+         id="text3086"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3088"
+           x="74.200432"
+           y="893.86218">panel-gray</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3090"
+         y="831.86218"
+         x="74.200432"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="831.86218"
+           x="74.200432"
+           id="tspan3092"
+           sodipodi:role="line">panel-black</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="3.2734375"
+         y="831.86218"
+         id="text3094"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3096"
+           x="3.2734375"
+           y="831.86218">panel-scanline</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3098"
+         y="959.86218"
+         x="6.2004318"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="959.86218"
+           x="6.2004318"
+           id="tspan3100"
+           sodipodi:role="line">button-hover</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="18.200432"
+         y="1023.8622"
+         id="text3102"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3104"
+           x="18.200432"
+           y="1023.8622">button</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="64.200432"
+         y="959.86218"
+         id="text3106"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3108"
+           x="64.200432"
+           y="959.86218">button-disabled</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3110"
+         y="1023.8622"
+         x="65.500435"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="1023.8622"
+           x="65.500435"
+           id="tspan3112"
+           sodipodi:role="line">button-pressed</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="160.6004"
+         y="989.86218"
+         id="text3159"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3161"
+           x="160.6004"
+           y="989.86218">shellmapborder</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml
index 00ea335f93..b5b18ebf02 100644
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -4,29 +4,51 @@ shellmap: reticle.png
 install: install.png
 	logo:0,0,128,128
 
-dialog: uibuttons.png
-	background: 2,2,60,60
-	border-r: 62,2,2,60
-	border-l: 0,2,2,60
-	border-b: 2,62,60,2
-	border-t: 2,0,60,2
-	corner-tl: 0,0,2,2
-	corner-tr: 62,0,2,2
-	corner-bl: 0,62,2,2
-	corner-br: 62,62,2,2
+button: chrome.png
+	background: 2,194,60,60
+	border-r: 62,194,2,60
+	border-l: 0,194,2,60
+	border-b: 2,254,60,2
+	border-t: 2,192,60,2
+	corner-tl: 0,192,2,2
+	corner-tr: 62,192,2,2
+	corner-bl: 0,254,2,2
+	corner-br: 62,254,2,2
 
-button-hover: uibuttons.png
-	background: 2,2,60,60
-	border-r: 62,2,2,60
-	border-l: 0,2,2,60
-	border-b: 2,62,60,2
-	border-t: 2,0,60,2
-	corner-tl: 0,0,2,2
-	corner-tr: 62,0,2,2
-	corner-bl: 0,62,2,2
-	corner-br: 62,62,2,2
+button-hover: chrome.png
+	background: 2,130,60,60
+	border-r: 62,132,2,60
+	border-l: 0,130,2,60
+	border-b: 2,190,60,2
+	border-t: 2,128,60,2
+	corner-tl: 0,128,2,2
+	corner-tr: 62,128,2,2
+	corner-bl: 0,190,2,2
+	corner-br: 62,190,2,2
 
-button-disabled: uibuttons.png
+button-disabled: chrome.png
+	background: 66,130,60,60
+	border-r: 126,130,2,60
+	border-l: 64,130,2,60
+	border-b: 66,190,60,2
+	border-t: 66,128,60,2
+	corner-tl: 64,128,2,2
+	corner-tr: 126,128,2,2
+	corner-bl: 64,190,2,2
+	corner-br: 126,190,2,2
+
+button-pressed: chrome.png
+	background: 66,194,60,60
+	border-r: 126,194,2,60
+	border-l: 64,194,2,60
+	border-b: 66,254,60,2
+	border-t: 66,192,60,2
+	corner-tl: 64,192,2,2
+	corner-tr: 126,192,2,2
+	corner-bl: 64,254,2,2
+	corner-br: 126,254,2,2
+
+panel-black: chrome.png
 	background: 66,2,60,60
 	border-r: 126,2,2,60
 	border-l: 64,2,2,60
@@ -37,18 +59,7 @@ button-disabled: uibuttons.png
 	corner-bl: 64,62,2,2
 	corner-br: 126,62,2,2
 
-button-pressed: uibuttons.png
-	background: 66,66,60,60
-	border-r: 126,66,2,60
-	border-l: 64,66,2,60
-	border-b: 66,126,60,2
-	border-t: 66,64,60,2
-	corner-tl: 64,64,2,2
-	corner-tr: 126,64,2,2
-	corner-bl: 64,126,2,2
-	corner-br: 126,126,2,2
-
-button: uibuttons.png
+panel-darkred: chrome.png
 	background: 2,66,60,60
 	border-r: 62,66,2,60
 	border-l: 0,66,2,60
@@ -59,18 +70,7 @@ button: uibuttons.png
 	corner-bl: 0,126,2,2
 	corner-br: 62,126,2,2
 
-dialog2: panel.png
-	background: 2,66,60,60
-	border-r: 62,66,2,60
-	border-l: 0,66,2,60
-	border-b: 2,126,60,2
-	border-t: 2,64,60,2
-	corner-tl: 0,64,2,2
-	corner-tr: 62,64,2,2
-	corner-bl: 0,126,2,2
-	corner-br: 62,126,2,2
-
-dialog3: panel.png
+panel-gray: chrome.png
 	background: 66,66,60,60
 	border-r: 126,66,2,60
 	border-l: 64,66,2,60
@@ -81,49 +81,27 @@ dialog3: panel.png
 	corner-bl: 64,126,2,2
 	corner-br: 126,126,2,2
 
-panel-black: panel.png
-	background: 66,2,60,60
-	border-r: 126,2,2,60
-	border-l: 64,2,2,60
-	border-b: 66,62,60,2
-	border-t: 66,0,60,2
-	corner-tl: 64,0,2,2
-	corner-tr: 126,0,2,2
-	corner-bl: 64,62,2,2
-	corner-br: 126,62,2,2
+panel-scanline: chrome.png
+	background: 2,2,60,60
+	border-r: 62,2,2,60
+	border-l: 0,2,2,60
+	border-b: 2,62,60,2
+	border-t: 2,0,60,2
+	corner-tl: 0,0,2,2
+	corner-tr: 62,0,2,2
+	corner-bl: 0,62,2,2
+	corner-br: 62,62,2,2
 
-panel-darkred: panel.png
-	background: 2,66,60,60
-	border-r: 62,66,2,60
-	border-l: 0,66,2,60
-	border-b: 2,126,60,2
-	border-t: 2,64,60,2
-	corner-tl: 0,64,2,2
-	corner-tr: 62,64,2,2
-	corner-bl: 0,126,2,2
-	corner-br: 62,126,2,2
-
-panel-gray: panel.png
-	background: 66,66,60,60
-	border-r: 126,66,2,60
-	border-l: 64,66,2,60
-	border-b: 66,126,60,2
-	border-t: 66,64,60,2
-	corner-tl: 64,64,2,2
-	corner-tr: 126,64,2,2
-	corner-bl: 64,126,2,2
-	corner-br: 126,126,2,2
-
-panel-scanline: panel.png
-	background: 130,2,60,60
-	border-r: 190,2,2,60
-	border-l: 128,2,2,60
-	border-b: 130,62,60,2
-	border-t: 130,0,60,2
-	corner-tl: 128,0,2,2
-	corner-tr: 190,0,2,2
-	corner-bl: 128,62,2,2
-	corner-br: 190,62,2,2
+shellmapborder: chrome.png
+	border-t: 161,128,62,33
+	border-b: 161,223,62,33
+	border-l: 128,161,33,62
+	border-r: 223,161,33,62
+	corner-tl: 128,128,33,33
+	corner-tr: 223,128,33,33
+	corner-bl: 128,223,33,33
+	corner-br: 223,223,33,33
+	background: 161,161,62,62
 
 dialog4: dialog4.png
 	border-t: 5,0,52,6
@@ -136,17 +114,6 @@ dialog4: dialog4.png
 	corner-br: 58,58,6,6
 	background: 5,5,52,52
 
-shellmapborder: shellmap-border.png
-	border-t: 33,0,62,33
-	border-b: 33,95,62,33
-	border-l: 0,33,33,62
-	border-r: 95,33,33,62
-	corner-tl: 0,0,33,33
-	corner-tr: 95,0,33,33
-	corner-bl: 0,95,33,33
-	corner-br: 95,95,33,33
-	background: 33,33,62,62
-
 music: musicplayer.png
 	pause: 0,0,25,25
 	stop: 28,0,25,25
diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png
new file mode 100644
index 0000000000..fafbaf3bb5
Binary files /dev/null and b/mods/cnc/uibits/chrome.png differ
diff --git a/mods/cnc/uibits/dialog.png b/mods/cnc/uibits/dialog.png
deleted file mode 100644
index bf86375a97..0000000000
Binary files a/mods/cnc/uibits/dialog.png and /dev/null differ
diff --git a/mods/cnc/uibits/dialog2.png b/mods/cnc/uibits/dialog2.png
deleted file mode 100644
index 6705b7919a..0000000000
Binary files a/mods/cnc/uibits/dialog2.png and /dev/null differ
diff --git a/mods/cnc/uibits/dialog3.png b/mods/cnc/uibits/dialog3.png
deleted file mode 100644
index 67da64ad3f..0000000000
Binary files a/mods/cnc/uibits/dialog3.png and /dev/null differ
diff --git a/mods/cnc/uibits/panel.png b/mods/cnc/uibits/panel.png
deleted file mode 100644
index 1e2e10a5e5..0000000000
Binary files a/mods/cnc/uibits/panel.png and /dev/null differ
diff --git a/mods/cnc/uibits/shellmap-border.png b/mods/cnc/uibits/shellmap-border.png
deleted file mode 100644
index a498edbfa1..0000000000
Binary files a/mods/cnc/uibits/shellmap-border.png and /dev/null differ
diff --git a/mods/cnc/uibits/uibuttons.png b/mods/cnc/uibits/uibuttons.png
deleted file mode 100644
index 725f522ca2..0000000000
Binary files a/mods/cnc/uibits/uibuttons.png and /dev/null differ
diff --git a/mods/cnc/uibits/widget-panel.png b/mods/cnc/uibits/widget-panel.png
deleted file mode 100644
index 54f90b04d2..0000000000
Binary files a/mods/cnc/uibits/widget-panel.png and /dev/null differ