--- a/Devian.xml	Sat Dec 26 21:51:57 2015 -0500
+++ b/Devian.xml	Sun Dec 27 02:30:46 2015 -0500
@@ -5,11 +5,71 @@
   <Include file="Libs\AceAddon-3.0\Console-3.0.xml" />
   <!--@end-no-lib-strip@-->.
 
-  <Texture name="DevianBorder" virtual="true" setAllPoints="false">
+  <Texture virtual="true" name="DevianBorder" setAllPoints="false">
     <Color r="1" g="0" b="0" a="1" />
     <Size x="2" y="2" />
   </Texture>
 
+
+  <Texture virtual="true" name="DevianHeader" parentKey="titlebar" alphaMode="BLEND">
+    <Anchors>
+      <Anchor point="TOPLEFT" />
+      <Anchor point="TOPRIGHT" />
+    </Anchors>
+    <Size y="20" />
+    <Color r="0.3" g="0.3" b="0.3" a="1" />
+    <Gradient orientation="VERTICAL">
+      <MinColor r="0" g="0" b="0" a="0.7"/>
+      <MaxColor r="0.3" g="0.3" b="0.3" a="0.7"/>
+    </Gradient>
+  </Texture>
+
+  <ScrollingMessageFrame
+      name="DevianBuffer"
+      maxLines="500"
+      fade="false"
+      displayduration="2147483647"
+      insertMode="BOTTOM"
+      virtual="true">
+    <Anchors>
+      <Anchor point="TOPLEFT" y="-20" />
+      <Anchor point="BOTTOMRIGHT" />
+    </Anchors>
+    <FontString  font="Interface\Addons\Devian\font\SourceCodePro-Regular.ttf" wordwrap="true"
+                 justifyH="LEFT"
+                 indented="true"
+                 setAllPoints="true">
+      <FontHeight>
+        <AbsValue val="13"/>
+      </FontHeight>
+    </FontString>
+
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture name="$parentBackdrop" parentKey="backdrop" setAllPoints="true" alphaMode="BLEND">
+          <Color r="1" g="1" b="1" a="1"/>
+          <Gradient orientation="VERTICAL">
+            <MinColor r="0" g="0" b="0" a="0.7"/>
+            <MaxColor r="0" g="0" b="0" a="0.3"/>
+          </Gradient>
+        </Texture>
+      </Layer>
+      <Layer level="OVERLAY">
+        <Texture name="DevianGripperRight" file="Interface\Addons\Devian\corner.blp" parentKey="grip" strata="HIGH" alphaMode="ADD">
+          <Anchors>
+            <Anchor point="BOTTOMRIGHT" x="-1" y="1" />
+          </Anchors>
+          <Size x="18" y="18" />
+          <Color r="0.4" g="0.4" b="0.4" a="1"/>
+          <Gradient orientation="VERTICAL">
+            <MaxColor r="0.9" g="0.9" b="0.9" a="1"/>
+            <MinColor r="0.4" g="0.4" b="0.4" a="1"/>
+          </Gradient>
+        </Texture>
+      </Layer>
+    </Layers>
+  </ScrollingMessageFrame>
+
   <Frame
       name="DevianConsole"
       parent="UIParent"
@@ -27,7 +87,7 @@
     </ResizeBounds>
     <Scripts>
       <OnShow>
-        self.header:SetText(self.index..' '.. self.signature)
+        self.title:SetText(self.index..' '.. self.signature)
       </OnShow>
       <OnMouseWheel>
         local up =  delta > 0
@@ -43,69 +103,9 @@
         end
       </OnMouseWheel>
     </Scripts>
-
-    <Frames>
-      <ScrollingMessageFrame
-          name="$parentScrollFrame"
-          parentkey="out"
-          maxLines="500"
-          fade="false"
-          displayduration="2147483647"
-          insertMode="BOTTOM">
-        <Anchors>
-          <Anchor point="TOPLEFT" y="-20" />
-          <Anchor point="BOTTOMRIGHT" />
-        </Anchors>
-        <FontString  font="Interface\Addons\Devian\font\SourceCodePro-Regular.ttf" wordwrap="true"
-                    justifyH="LEFT"
-                    indented="true"
-                    setAllPoints="true">
-          <FontHeight>
-            <AbsValue val="13"/>
-          </FontHeight>
-        </FontString>
-
-        <Layers>
-          <Layer level="BACKGROUND">
-            <Texture name="$parentbg" parentKey="backdrop" setAllPoints="true" alphaMode="BLEND">
-              <Color r="1" g="1" b="1" a="1"/>
-              <Gradient orientation="VERTICAL">
-                <MinColor r="0" g="0" b="0" a="0.7"/>
-                <MaxColor r="0" g="0" b="0" a="0.3"/>
-              </Gradient>
-            </Texture>
-          </Layer>
-          <Layer level="OVERLAY">
-            <Texture name="DevianGripperRight" file="Interface\Addons\Devian\corner.blp" parentKey="grip" strata="HIGH" alphaMode="ADD">
-              <Anchors>
-                <Anchor point="BOTTOMRIGHT" x="-1" y="1" />
-              </Anchors>
-              <Size x="18" y="18" />
-              <Color r="0.4" g="0.4" b="0.4" a="1"/>
-              <Gradient orientation="VERTICAL">
-                <MaxColor r="0.9" g="0.9" b="0.9" a="1"/>
-                <MinColor r="0.4" g="0.4" b="0.4" a="1"/>
-              </Gradient>
-            </Texture>
-          </Layer>
-        </Layers>
-      </ScrollingMessageFrame>
-    </Frames>
     <Layers>
       <Layer level="ARTWORK">
-        <Texture parentKey="titlebar" alphaMode="BLEND">
-          <Anchors>
-            <Anchor point="TOPLEFT" />
-            <Anchor point="TOPRIGHT" />
-          </Anchors>
-          <Size y="20" />
-          <Color r="0.3" g="0.3" b="0.3" a="1" />
-          <Gradient orientation="VERTICAL">
-            <MinColor r="0" g="0" b="0" a="0.7"/>
-            <MaxColor r="0.3" g="0.3" b="0.3" a="0.7"/>
-          </Gradient>
-        </Texture>
-        <FontString parentKey="header" font="Interface\Addons\Devian\font\SourceCodePro-Bold.ttf" wordwrap="true"
+        <FontString parentKey="title" font="Interface\Addons\Devian\font\SourceCodePro-Bold.ttf" wordwrap="true"
                     justifyH="LEFT"
                     indented="true">
           <Anchors>
@@ -163,6 +163,40 @@
           </Anchors>
         </Texture>
       </Layer>
+      <Layer level="OVERLAY">
+        <Texture name="$parentHeader" parentKey="header" inherits="DevianHeader">
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+            <Anchor point="TOPRIGHT" />
+            <Size y="20" />
+          </Anchors>
+        </Texture>
+      </Layer>
     </Layers>
+    <Frames>
+      <ScrollingMessageFrame parentKey="out" inherits="DevianBuffer" />
+    </Frames>
+  </Frame>
+
+
+
+  <Frame
+      name="DevianDockFrame"
+      inherits="DevianConsole"
+      virtual="true">
+    <Layers>
+      <Layer level="ARTWORK">
+        <Texture name="$parentHeader" parentKey="headerbar" inherits="DevianHeader">
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+            <Size x="150" y="20" />
+          </Anchors>
+        </Texture>
+        <!-- channel headers are moved here -->
+      </Layer>
+    </Layers>
+    <Frames>
+      <!-- channel scrollers are moved in here -->
+    </Frames>
   </Frame>
 </Ui>
\ No newline at end of file