diff --git a/framebg.png b/framebg.png
deleted file mode 100644
index 16f5b0a..0000000
Binary files a/framebg.png and /dev/null differ
diff --git a/img/selection.png b/img/selection.png
new file mode 100644
index 0000000..ecf1467
Binary files /dev/null and b/img/selection.png differ
diff --git a/img/base_star.png b/img/working_images/base_star.png
similarity index 100%
rename from img/base_star.png
rename to img/working_images/base_star.png
diff --git a/img/base_star_lg.png b/img/working_images/base_star_lg.png
similarity index 100%
rename from img/base_star_lg.png
rename to img/working_images/base_star_lg.png
diff --git a/img/working_images/base_star_lg.psd b/img/working_images/base_star_lg.psd
new file mode 100644
index 0000000..b98c0a9
Binary files /dev/null and b/img/working_images/base_star_lg.psd differ
diff --git a/img/base_star_lg2.png b/img/working_images/base_star_lg2.png
similarity index 100%
rename from img/base_star_lg2.png
rename to img/working_images/base_star_lg2.png
diff --git a/img/working_images/base_star_lg2.psd b/img/working_images/base_star_lg2.psd
new file mode 100644
index 0000000..1ce2b96
Binary files /dev/null and b/img/working_images/base_star_lg2.psd differ
diff --git a/img/base_star_md.png b/img/working_images/base_star_md.png
similarity index 100%
rename from img/base_star_md.png
rename to img/working_images/base_star_md.png
diff --git a/img/working_images/base_star_md.psd b/img/working_images/base_star_md.psd
new file mode 100644
index 0000000..90965ac
Binary files /dev/null and b/img/working_images/base_star_md.psd differ
diff --git a/img/base_star_md2.png b/img/working_images/base_star_md2.png
similarity index 100%
rename from img/base_star_md2.png
rename to img/working_images/base_star_md2.png
diff --git a/img/working_images/base_star_md2.psd b/img/working_images/base_star_md2.psd
new file mode 100644
index 0000000..171e0e5
Binary files /dev/null and b/img/working_images/base_star_md2.psd differ
diff --git a/img/base_star_sm.png b/img/working_images/base_star_sm.png
similarity index 100%
rename from img/base_star_sm.png
rename to img/working_images/base_star_sm.png
diff --git a/img/working_images/base_star_sm.psd b/img/working_images/base_star_sm.psd
new file mode 100644
index 0000000..d7b3683
Binary files /dev/null and b/img/working_images/base_star_sm.psd differ
diff --git a/img/base_star_sm2.png b/img/working_images/base_star_sm2.png
similarity index 100%
rename from img/base_star_sm2.png
rename to img/working_images/base_star_sm2.png
diff --git a/img/working_images/base_star_sm2.psd b/img/working_images/base_star_sm2.psd
new file mode 100644
index 0000000..b12c888
Binary files /dev/null and b/img/working_images/base_star_sm2.psd differ
diff --git a/testui.py b/testui.py
deleted file mode 100644
index fcb380e..0000000
--- a/testui.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#import testopt
-import time
-import pyui
-import pyui.themes.win2k
-
-class MyFrame(object):
-    """A frame is a window that has a titlebar and borders. it is resizable and movable by dragging the titlebar.
-    """
-    def __init__(self, x, y, w, h, title, topmost = 0):
-        self.theme = getTheme()
-        self.innerWidth = w
-        self.innerHeight = h
-        self.title = title
-
-        self.panelOffsetLeft = 0
-        self.panelOffsetTop = 0
-        self.panelOffsetRight = 0
-        self.panelOffsetBottom = 0            
-        
-        Window.__init__(self, x, y, w, h, topmost)
-        self.setTitle(self.title)
-        
-        self.panelOffsetLeft = self.theme.getFrameBorderLeft()
-        self.panelOffsetTop = self.theme.getFrameBorderTop()
-        self.panelOffsetRight = self.theme.getFrameBorderRight()
-        self.panelOffsetBottom = self.theme.getFrameBorderBottom()            
-            
-        self._panel.moveto(self.panelOffsetLeft, self.panelOffsetTop)
-        w += self.panelOffsetLeft + self.panelOffsetRight
-        h += self.panelOffsetTop + self.panelOffsetBottom
-        self.backImage = None
-
-    def setBackImage(self, filename):
-        self.backImage = filename
-        #getRenderer().loadImage(filename)
-        
-
-    def draw(self, renderer):
-        """Draws to the actual frame if the renderer requires it.
-        """
-        if not self.show:
-            return
-        self.hitList = getTheme().drawFrame( (0,0,self.width, self.height), self.title, self.backImage)
-        Window.draw(self, renderer)    
-
-def onbutton(self):
-    print "got a button " 
-    
-def run():
-    #opts = testopt.parseCommandLine(800, 600)
-    done = 1
-    frame = 0
-    t = time.time()
-    desktop = pyui.init(640, 480, '2d')
-    print pyui.core.gRenderer.screen
-    newtheme = pyui.themes.win2k.Win2kTheme(pyui.core.gRenderer, "lucida sans unicode", 14)
-    desktop.setTheme(newtheme)
-    
-    w = pyui.widgets.Frame(50, 50, 400, 400, "clipme")
-    b = pyui.widgets.Button( "A button is here", onbutton)
-    w.addChild(b)
-    w.pack()
-
-    w.setBackImage("framebg.png")
-    pyui.run()
-
-    print "done"
-    pyui.quit()
-
-
-if __name__ == '__main__':
-    run()
diff --git a/testui2.py b/testui2.py
deleted file mode 100644
index d70132b..0000000
--- a/testui2.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hello World example.
-from ocempgui.widgets import *
-
-# Initialize the drawing window.
-re = Renderer ()
-re.create_screen (640, 480)
-re.title = "Hello World"
-re.color = (250, 250, 250)
-
-button = Button ("Hello World")
-button.topleft = (10, 10)
-re.add_widget (button)
-
-# Start the main rendering loop.
-re.start()
-
-re.start()
\ No newline at end of file