diff --git a/openlp.pyw b/openlp.pyw
index 1676459f3..18b4c438e 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -1,40 +1,31 @@
-#!/usr/bin/env pythonw
+#!/usr/bin/env python
+# vim: autoindent shiftwidth=4 expandtab textwidth=80
 
 """
+OpenLP - Open Source Lyrics Projection
+Copyright (c) 2008 Raoul Snyman
+Portions copyright (c) 2008 Martin Thompson, Tim Bennet
 
-Entry point for OpenLP wx.App
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
 
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import wx
-
-from openlp.ui import mainframe
-
-
-class OpenLP(wx.PySimpleApp):
-    def OnInit(self):
-        frame = mainframe.MainFrame(None, title="openlp.org")
-        frame.Show()
-
-        import sys
-        for f in sys.argv[1:]:
-            self.OpenFileMessage(f)
-
-        return True;
-
-
-    def OpenFileMessage(self, filename):
-
-        # TODO: OOS loading here
-        #       rename function, too
-
-        dlg = wx.MessageDialog(None,
-                    "This app was just asked to open:\n%s\n"%filename,
-                    "File Opened", wx.OK|wx.ICON_INFORMATION)
+class OpenLP(object):
+    def __init__(self):
+        pass
 
+    def run(self):
+        pass
 
 if __name__ == '__main__':
     app = OpenLP()
-    app.MainLoop()
-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80
+    app.run()
diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 872865143..761fbb9ec 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -1 +1,2 @@
 from openlp.core.render import Renderer
+from openlp.core.settingsmanager import SettingsManager
diff --git a/plugin.py b/openlp/core/plugin.py
similarity index 100%
rename from plugin.py
rename to openlp/core/plugin.py
diff --git a/openlp/core/settingsmanager.py b/openlp/core/settingsmanager.py
new file mode 100644
index 000000000..a7fe51b57
--- /dev/null
+++ b/openlp/core/settingsmanager.py
@@ -0,0 +1,3 @@
+class SettingsManager(object):
+    def __init__(self):
+        pass
diff --git a/openlp/resources/images/custom_delete.png b/openlp/resources/images/custom_delete.png
new file mode 100644
index 000000000..ef8e685e2
Binary files /dev/null and b/openlp/resources/images/custom_delete.png differ
diff --git a/openlp/resources/images/custom_edit.png b/openlp/resources/images/custom_edit.png
new file mode 100644
index 000000000..d79aa5151
Binary files /dev/null and b/openlp/resources/images/custom_edit.png differ
diff --git a/openlp/resources/images/custom_new.png b/openlp/resources/images/custom_new.png
new file mode 100644
index 000000000..8431237bd
Binary files /dev/null and b/openlp/resources/images/custom_new.png differ
diff --git a/openlp/resources/images/openlp-2.qrc b/openlp/resources/images/openlp-2.qrc
index 1dd7935d9..32f422ed9 100644
--- a/openlp/resources/images/openlp-2.qrc
+++ b/openlp/resources/images/openlp-2.qrc
@@ -5,6 +5,11 @@
     <file>song_export.png</file>
     <file>song_new.png</file>
   </qresource>
+  <qresource prefix="custom" >
+    <file>custom_new.png</file>
+    <file>custom_edit.png</file>
+    <file>custom_delete.png</file>
+  </qresource>
   <qresource prefix="wizards" >
     <file>wizard_importbible.bmp</file>
   </qresource>
@@ -58,6 +63,7 @@
     <file>tools_alert.png</file>
   </qresource>
   <qresource prefix="themes" >
+    <file>theme_delete.png</file>
     <file>theme_new.png</file>
     <file>theme_edit.png</file>
     <file>theme_export.png</file>