--- a/gamelib/gui_base.py	Sun May 13 00:35:49 2012 +0200
+++ b/gamelib/gui_base.py	Sun May 13 00:38:48 2012 +0200
@@ -4,15 +4,14 @@
 from pygame.font import Font
 from pygame import image
 
-from gamelib import data
-from gamelib.data import filepath
+from gamelib.data import filepath, load_image
 
 
 # different font sizes
 pygame.font.init()
-font_small = Font(data.filepath('fonts/DejaVuSans.ttf'), 10)
-font_medium = Font(data.filepath('fonts/DejaVuSans.ttf'), 14)
-font_large = Font(data.filepath('fonts/DejaVuSans.ttf'), 18)
+font_small = Font(filepath('fonts/DejaVuSans.ttf'), 10)
+font_medium = Font(filepath('fonts/DejaVuSans.ttf'), 14)
+font_large = Font(filepath('fonts/DejaVuSans.ttf'), 18)
 font_auto = None
 
 
@@ -79,8 +78,7 @@
         super(Window, self).__init__()
         self.surface = Surface((screen.get_width(), screen.get_height()))
         self.background_colour = None
-        self.background_image = image.load(
-                filepath('images/background.jpg'))
+        self.background_image = load_image('images/background.jpg')
         self.pressed_child = None
 
     def on_mouse_down(self, pos):