diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/editorwindow.cpp
index ada9ecd137..e06f0d8937 100644
--- a/utils/themeeditor/editorwindow.cpp
+++ b/utils/themeeditor/editorwindow.cpp
@@ -29,33 +29,51 @@ EditorWindow::EditorWindow(QWidget *parent) :
     ui(new Ui::EditorWindow)
 {
     ui->setupUi(this);
+    loadSettings();
+    setupUI();
+    setupMenus();
+}
 
+void EditorWindow::loadSettings()
+{
+    /* When there are settings to load, they'll be loaded here */
+}
+
+void EditorWindow::setupUI()
+{
     /* Establishing the parse tree */
-    tree = new ParseTreeModel(ui->code->document()->toPlainText().toAscii());
+    tree = new ParseTreeModel(ui->codeEdit->document()->toPlainText().
+                              toAscii());
     ui->parseTree->setModel(tree);
 
     /* Setting up the syntax highlighter */
     highlighter = new SkinHighlighter(QColor(0,255,0), QColor(255,0,0),
                                       QColor(0,0,255), QColor(150,150,150),
-                                      ui->code->document());
+                                      ui->codeEdit->document());
 
     /* Connecting the buttons */
-    QObject::connect(ui->code, SIGNAL(cursorPositionChanged()),
-                     this, SLOT(updateTree()));
+    QObject::connect(ui->codeEdit, SIGNAL(cursorPositionChanged()),
+                     this, SLOT(codeChanged()));
     QObject::connect(ui->fromTree, SIGNAL(pressed()),
                      this, SLOT(updateCode()));
+
 }
 
-void EditorWindow::updateTree()
+void EditorWindow::setupMenus()
 {
-    tree->changeTree(ui->code->document()->toPlainText().toAscii());
+    /* When there are menus to setup, they'll be set up here */
+}
+
+void EditorWindow::codeChanged()
+{
+    tree->changeTree(ui->codeEdit->document()->toPlainText().toAscii());
     ui->parseTree->expandAll();
 }
 
 void EditorWindow::updateCode()
 {
     tree->genCode();
-    ui->code->document()->setPlainText(tree->genCode());
+    ui->codeEdit->document()->setPlainText(tree->genCode());
 }
 
 EditorWindow::~EditorWindow()
diff --git a/utils/themeeditor/editorwindow.h b/utils/themeeditor/editorwindow.h
index a13bd4b6bb..f37cfcbf29 100644
--- a/utils/themeeditor/editorwindow.h
+++ b/utils/themeeditor/editorwindow.h
@@ -39,9 +39,14 @@ public:
 
 private slots:
     void updateCode();
-    void updateTree();
+    void codeChanged();
 
 private:
+    /* Setup functions */
+    void loadSettings();
+    void setupUI();
+    void setupMenus();
+
     Ui::EditorWindow *ui;
     ParseTreeModel* tree;
     SkinHighlighter* highlighter;
diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/editorwindow.ui
index ca69a21c77..a85ef62155 100644
--- a/utils/themeeditor/editorwindow.ui
+++ b/utils/themeeditor/editorwindow.ui
@@ -15,24 +15,14 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QTreeView" name="parseTree"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="fromTree">
-        <property name="text">
-         <string>Update Code</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
     <item>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QPlainTextEdit" name="code"/>
+       <widget class="QPlainTextEdit" name="codeEdit">
+        <property name="lineWrapMode">
+         <enum>QPlainTextEdit::NoWrap</enum>
+        </property>
+       </widget>
       </item>
      </layout>
     </item>
@@ -56,6 +46,29 @@
    <addaction name="menuFile"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QDockWidget" name="outputDock">
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents">
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QTreeView" name="parseTree"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="fromTree">
+         <property name="text">
+          <string>Update Code</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+  </widget>
   <action name="actionQuit">
    <property name="text">
     <string>Quit</string>