diff --git a/data/gfx/tileset01.bmp b/data/gfx/tileset01.bmp
index 99f8196..9ce510b 100644
Binary files a/data/gfx/tileset01.bmp and b/data/gfx/tileset01.bmp differ
diff --git a/src/Draw.pbi b/src/Draw.pbi
index 7f645be..33ba040 100644
--- a/src/Draw.pbi
+++ b/src/Draw.pbi
@@ -33,5 +33,5 @@ EndProcedure
 Procedure DrawRunningGame()
   ;Box(0, 0, 200, 200, RGB(0, 255, 0))
   
-  DisplaySprite(#Tile01, 20, 20)
+  DrawImage(ImageID(#Tile01), 20, 20)
 EndProcedure
diff --git a/src/Functions.pbi b/src/Functions.pbi
index bf3409b..2f2e9d3 100644
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@@ -3,10 +3,8 @@
 
 ; *****************************************************************************
 ; * Tileset
-UsePNGImageDecoder()
-
 Procedure InitTileset()
-	LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
+	
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure
 
diff --git a/src/Globals.pbi b/src/Globals.pbi
index b93ef07..fd6e8bd 100644
--- a/src/Globals.pbi
+++ b/src/Globals.pbi
@@ -29,3 +29,8 @@ EndEnumeration
 ; Sounds
 LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
 LoadSound(1, #DATA_PATH + "sound/menu_select.wav")
+
+: Images
+UseJPEGImageDecoder()
+Debug LoadImage(#Tile01, #DATA_PATH+"gfx/tileset01.jp")
+
diff --git a/src/Main.pb b/src/Main.pb
index d22aa46..7d192a7 100644
--- a/src/Main.pb
+++ b/src/Main.pb
@@ -95,7 +95,7 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
       EndIf
     EndIf
     
-    Debug CurrentState
+    ; Debug CurrentState
     
     ; Handle the events for the current state
     GameStates(CurrentState)\HandleEventFun()