diff --git a/data/DataCache.scr b/data/DataCache.scr
index fb86401f3..5b463814d 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -87,6 +87,31 @@ levels/CHAPTER04_LEVEL0405.Lvl
 levels/CHAPTER04_LEVEL0406.Lvl
 levels/CHAPTER04_LEVEL0407.Lvl
 
+levels/CHAPTER05_LEVEL03.TBK
+levels/chapter05_level03.tex
+levels/CHAPTER05_LEVEL0301.Lvl
+levels/CHAPTER05_LEVEL0302.Lvl
+levels/CHAPTER05_LEVEL0303.Lvl
+levels/CHAPTER05_LEVEL0304.Lvl
+levels/CHAPTER05_LEVEL0305.Lvl
+
+levels/CHAPTER05_LEVEL02.TBK
+levels/chapter05_level02.tex
+levels/CHAPTER05_LEVEL0202.Lvl
+levels/CHAPTER05_LEVEL0203.Lvl
+levels/CHAPTER05_LEVEL0204.Lvl
+levels/CHAPTER05_LEVEL0205.Lvl
+
+levels/CHAPTER06_LEVEL01.TBK
+levels/chapter06_level01.tex
+levels/CHAPTER06_LEVEL0101.Lvl
+levels/CHAPTER06_LEVEL0102.Lvl
+
+levels/CHAPTER06_LEVEL03.TBK
+levels/chapter06_level03.tex
+levels/CHAPTER06_LEVEL0301.Lvl
+
+
 collision/colltab.dat
 
 actors/spongebob.a3d
diff --git a/makefile.gfx b/makefile.gfx
index 318ed3219..5fad03a93 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -44,7 +44,7 @@ LEVELS_OUT_DIR :=			$(DATA_OUT)/levels
 LEVELS_MAKEFILE_DIR :=		$(TEMP_BUILD_DIR)/levels
 LEVELS_DIRS_TO_MAKE :=		$(LEVELS_MAKEFILE_DIR) $(LEVELS_OUT_DIR)
 
-LEVELS_CHAPTERS :=			CHAPTER01 CHAPTER02 CHAPTER03 CHAPTER04 CHAPTER05
+LEVELS_CHAPTERS :=			CHAPTER01 CHAPTER02 CHAPTER03 CHAPTER04 CHAPTER05 CHAPTER06
 
 LEVELS_CHAPTER01 :=			
 LEVELS_CHAPTER01_LEVEL01 :=
@@ -70,16 +70,16 @@ LEVELS_CHAPTER04_LEVEL02 :=	01 02 03 04 05
 LEVELS_CHAPTER04_LEVEL03 :=	01 02 03 04 05 06
 LEVELS_CHAPTER04_LEVEL04 :=	01 02 03 04 05 06 07
 
-LEVELS_CHAPTER05 :=			
+LEVELS_CHAPTER05 :=			LEVEL02 LEVEL03
 LEVELS_CHAPTER05_LEVEL01 :=
-LEVELS_CHAPTER05_LEVEL02 :=
-LEVELS_CHAPTER05_LEVEL03 :=
+LEVELS_CHAPTER05_LEVEL02 := 02 03 04 05
+LEVELS_CHAPTER05_LEVEL03 :=	01 02 03 04 05
 LEVELS_CHAPTER05_LEVEL04 :=
 
-LEVELS_CHAPTER06 :=			
-LEVELS_CHAPTER06_LEVEL01 :=
+LEVELS_CHAPTER06 :=			LEVEL01 LEVEL03
+LEVELS_CHAPTER06_LEVEL01 :=	01 02
 LEVELS_CHAPTER06_LEVEL02 :=
-LEVELS_CHAPTER06_LEVEL03 :=
+LEVELS_CHAPTER06_LEVEL03 := 01
 LEVELS_CHAPTER06_LEVEL04 :=
 
 
diff --git a/source/level/level.cpp b/source/level/level.cpp
index 04b140c60..8b5b2d8d5 100644
--- a/source/level/level.cpp
+++ b/source/level/level.cpp
@@ -59,7 +59,7 @@ sLvlTab	LvlTable[]=
 	{LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0304_LVL,LEVELS_CHAPTER04_LEVEL03_TEX},	//	24
 	{LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0305_LVL,LEVELS_CHAPTER04_LEVEL03_TEX},	//	25
 	{LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0306_LVL,LEVELS_CHAPTER04_LEVEL03_TEX},	//	26
-// C3 L4 - 7 parts
+// C4 L4 - 7 parts
 	{LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX},	//	27
 	{LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0402_LVL,LEVELS_CHAPTER04_LEVEL04_TEX},	//	28
 	{LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0403_LVL,LEVELS_CHAPTER04_LEVEL04_TEX},	//	29
@@ -68,7 +68,27 @@ sLvlTab	LvlTable[]=
 	{LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0406_LVL,LEVELS_CHAPTER04_LEVEL04_TEX},	//	32
 	{LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0407_LVL,LEVELS_CHAPTER04_LEVEL04_TEX},	//	33
 
+// C5 L2 - 4 parts
+//	{LEVELS_CHAPTER05_LEVEL02_TBK,LEVELS_CHAPTER05_LEVEL0201_LVL,LEVELS_CHAPTER05_LEVEL02_TEX},	//	34
+	{LEVELS_CHAPTER05_LEVEL02_TBK,LEVELS_CHAPTER05_LEVEL0202_LVL,LEVELS_CHAPTER05_LEVEL02_TEX},	//	35
+	{LEVELS_CHAPTER05_LEVEL02_TBK,LEVELS_CHAPTER05_LEVEL0203_LVL,LEVELS_CHAPTER05_LEVEL02_TEX},	//	36
+	{LEVELS_CHAPTER05_LEVEL02_TBK,LEVELS_CHAPTER05_LEVEL0204_LVL,LEVELS_CHAPTER05_LEVEL02_TEX},	//	37
+	{LEVELS_CHAPTER05_LEVEL02_TBK,LEVELS_CHAPTER05_LEVEL0205_LVL,LEVELS_CHAPTER05_LEVEL02_TEX},	//	38
+
+// C5 L3 - 5 parts
+	{LEVELS_CHAPTER05_LEVEL03_TBK,LEVELS_CHAPTER05_LEVEL0301_LVL,LEVELS_CHAPTER05_LEVEL03_TEX},	//	34
+	{LEVELS_CHAPTER05_LEVEL03_TBK,LEVELS_CHAPTER05_LEVEL0302_LVL,LEVELS_CHAPTER05_LEVEL03_TEX},	//	35
+	{LEVELS_CHAPTER05_LEVEL03_TBK,LEVELS_CHAPTER05_LEVEL0303_LVL,LEVELS_CHAPTER05_LEVEL03_TEX},	//	36
+	{LEVELS_CHAPTER05_LEVEL03_TBK,LEVELS_CHAPTER05_LEVEL0304_LVL,LEVELS_CHAPTER05_LEVEL03_TEX},	//	37
+	{LEVELS_CHAPTER05_LEVEL03_TBK,LEVELS_CHAPTER05_LEVEL0305_LVL,LEVELS_CHAPTER05_LEVEL03_TEX},	//	38
+
+// C6 L1 - 2 parts
+	{LEVELS_CHAPTER06_LEVEL01_TBK,LEVELS_CHAPTER06_LEVEL0101_LVL,LEVELS_CHAPTER06_LEVEL01_TEX},	//	39
+	{LEVELS_CHAPTER06_LEVEL01_TBK,LEVELS_CHAPTER06_LEVEL0102_LVL,LEVELS_CHAPTER06_LEVEL01_TEX},	//	40
+	{LEVELS_CHAPTER06_LEVEL03_TBK,LEVELS_CHAPTER06_LEVEL0301_LVL,LEVELS_CHAPTER06_LEVEL03_TEX},	//	41
+
 };
+const	static int	LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab);
 
 extern int	s_globalLevelSelectThing;
 #if defined(__USER_daveo__)
@@ -80,6 +100,8 @@ void 	CLevel::init()
 #if defined(__USER_daveo__)
 		if (Lvl>-1) s_globalLevelSelectThing=Lvl;
 #endif
+		if (s_globalLevelSelectThing>=LvlTableSize) s_globalLevelSelectThing=0;
+
 		for (int i=0; i<CLayerTile::LAYER_TILE_TYPE_MAX; i++)
 		{
 			TileLayers[i]=0;
@@ -91,7 +113,6 @@ void 	CLevel::init()
 		LevelHdr=(sLvlHdr *)CFileIO::loadFile(LEVELS_CHAPTER02_LEVEL0401_LVL,"Level Data");
 		m_levelTPage=TPLoadTex(LEVELS_CHAPTER02_LEVEL04_TEX);
 */
-		if (s_globalLevelSelectThing>33) s_globalLevelSelectThing=0;
 		TileBankHdr=(sTileBankHdr *)CFileIO::loadFile(LvlTable[s_globalLevelSelectThing].TileBank,"Tile Bank Data");
 		LevelHdr=(sLvlHdr *)CFileIO::loadFile(LvlTable[s_globalLevelSelectThing ].Level,"Level Data");
 		m_levelTPage=TPLoadTex(LvlTable[s_globalLevelSelectThing ].Tex);
diff --git a/tools/Data/bin/MkLevel.exe b/tools/Data/bin/MkLevel.exe
index 243797f0a..4106fcc49 100644
Binary files a/tools/Data/bin/MkLevel.exe and b/tools/Data/bin/MkLevel.exe differ