diff --git a/build/mkactor.pl b/build/mkactor.pl
index 8156a854b..f73216925 100644
--- a/build/mkactor.pl
+++ b/build/mkactor.pl
@@ -1,35 +1,26 @@
 $OutFile=shift(@ARGV);
-$InStr=shift(@ARGV);
+$Actor=shift(@ARGV);
 
-@Tmp=split('_',$InStr);
-$Chapter=shift(@Tmp);
-$Level=shift(@Tmp);
-$LevelDir =$Chapter/\$Level;
-
-# printf("I got\n0: $OutFile\n1: $InStrn\n");
-# printf("Chapter  = $Chapter\n");
-# printf("Level    = $Level\n");
-# printf("LevelDir = $LevelDir\n");
+# printf("I got\n0: $OutFile\n1: $Actor\n");
 
 $OutFile=">$OutFile";
 open(OutFile) || die "Can't create makefile $OutFile; $!";
+# print  <<eot
 print OutFile <<eot
-#print  <<eot
-.PHONY : make$Chapter\_$Level clean$Chapter\_$Level
+ACTOR_$Actor\:\t\$(ACTOR_$Actor\_OUT)
 
-make$Chapter\_$Level\:\t$Chapter\_$Level\_LVL\n
-clean$Chapter\_$Level\:\tclean$Chapter\_$Level\_LVL
+ACTOR_$Actor\_IN_DIR :=\t\$(ACTOR_IN_DIR)/$Actor
+ACTOR_$Actor\_OUT_DIR :=\t\$(ACTOR_OUT_DIR)
 
-$Chapter\_$Level\_IN_DIR :=\t\$(LEVELS_IN_DIR)/$Chapter/$Level
-$Chapter\_$Level\_IN  :=\t\$(foreach LVL, \$(LEVELS_$Chapter\_$Level), \$($Chapter\_$Level\_IN_DIR)/$Level\$(LVL).mex)
-$Chapter\_$Level\_OUT :=\t\$(foreach LVL, \$(LEVELS_$Chapter\_$Level), \$(LEVELS_OUT_DIR)/$Chapter\_$Level\$(LVL).lvl)
-$Chapter\_$Level\_TEX :=\t\$(LEVELS_OUT_DIR)/$Chapter\_$Level.tex)
+ACTOR_$Actor\_IN :=\t\$(ACTOR_$Actor\_IN_DIR)/$Actor.gin
+ACTOR_$Actor\_OUT :=\t\$(ACTOR_$Actor\_OUT_DIR)/$Actor.a3d
 
-clean$Chapter\_$Level\_LVL :\n\t\$(RM) -f \$($Chapter\_$Level\_OUT) \$($Chapter\_$Level\_TEX)
-$Chapter\_$Level\_LVL :\t\$($Chapter\_$Level\_IN)
+ACTOR_$Actor\_ANIM_LIST :=\t\$(foreach FILE, \$($Actor\_ANIM_LIST),-a:\$(ACTOR_$Actor\_IN_DIR)/\$(FILE).gin)
+ACTOR_$Actor\_TEX_LIST :=\t\$(foreach FILE,	\$($Actor\_EXTRA_TEX),-x:textures/\$(FILE).bmp)
+
+\$(ACTOR_$Actor\_OUT) : \$(ACTOR_$Actor\_IN)
+	\@\$(MKACTOR3D) \$(ACTOR_$Actor\_IN) -o:\$(ACTOR_$Actor\_OUT_DIR) -t:24,1,1 -s:256 -i:\$(INC_DIR) \$(ACTOR_$Actor\_TEX_LIST) \$(ACTOR_$Actor\_ANIM_LIST)
 
-\$($Chapter\_$Level\_OUT) : \$($Chapter\_$Level\_IN)
-\t\@\$(MKLEVEL) \$($Chapter\_$Level\_IN) -o:\$(LEVELS_OUT_DIR) -c:$Chapter -l:$Level \$(LEVELS_OPTS)
 
 eot
 ;
diff --git a/makefile.gfx b/makefile.gfx
index 6b82d3693..b98a7b3ab 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -38,7 +38,7 @@ TEMP_FILE :=			$(TEMP_BUILD_DIR)/build.tmp
 #----------------------------------------------------------------------------
 #--- Levels -----------------------------------------------------------------
 #----------------------------------------------------------------------------
-LEVELS_OPTS :=				-t:8,3,1 -s:256
+LEVELS_OPTS :=				-t:8,4,1 -s:256
 LEVELS_IN_DIR :=			$(GRAF_DIR)/levels
 LEVELS_OUT_DIR :=			$(DATA_OUT)/levels
 LEVELS_MAKEFILE_DIR :=		$(TEMP_BUILD_DIR)/levels
@@ -127,69 +127,55 @@ GFX_DATA_OUT		+=	$(COLLISION_OUT)
 #----------------------------------------------------------------------------
 # Actors
 #----------------------------------------------------------------------------
+#----------------------------------------------------------------------------
+SPONGEBOB_ANIM_LIST :=	Spongebob buttbounceend buttbouncestart deathbackwards deathdry  deathforwards deathspin deathtar electricshock electricshockend electricshockstart faceback facefront \
+						fall getup getuprun hitground hover hoverend hoverstart idlebreathe idlehoola idlelook idlewigglearm jumpend karate run \
+						runstart runstop soakup talk01 teeterback teeterfront \
+						idlewind
+
+SPONGEBOB_EXTRA_TEX :=	SBBackNormal \
+						SBEyesAngry SBEyesBlink SBEyesDown SBEyesfiece SBEyesLeft SBEyesNormal SBEyesRight SBEyesSheepish SBEyesUp SBEyesWorried \
+						SBHandNormal \
+						SBMouthGasp SBMouthNormal SBMouthSheepish SBMouthSmile SBMouthTerror SBMouthWhistle \
+						SBPantsideNormal \
+						SBPantsNormal \
+						SBSideNormal \
+						SBSocksNormal \
+						SBSoleNormal \
+						SBTopNormal
+
 #----------------------------------------------------------------------------
 ACTOR_IN_DIR :=			$(GRAF_DIR)/Characters
 ACTOR_OUT_DIR :=		$(DATA_OUT)/Actors
 ACTOR_MAKEFILE_DIR :=	$(TEMP_BUILD_DIR)/Actors
 ACTORS_DIRS_TO_MAKE :=	$(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
 
-# Global flags
-GENERIC_ACT_TEX_FLAGS =	-c+ -t:27,1,1 -w+ -b+
-GEN_GRP_TEX_FLAGS=		-t:28,1,1
 
-actors:			player
-	
-cleanactors:	cleanplayer
+ACTORS_LIST :=			SPONGEBOB
+
+ACTORS_MAKEFILES :=		$(foreach ACTOR,$(ACTORS_LIST),$(ACTOR_MAKEFILE_DIR)/$(ACTOR).mak)
+
+$(ACTORS_MAKEFILES):	$(ACTORS_DIRS_TO_MAKE) makefile.gfx $(BUILD_DIR)/mkactor.pl
+	@$(PL) $(BUILD_DIR)/mkactor.pl $@ $(notdir $(basename $@))
+
+include $(ACTORS_MAKEFILES)
+
+ACTORS_ALL_OUT :=		$(foreach ACTOR,$(ACTORS_LIST),$(ACTOR_$(ACTOR)_OUT))
+
+GFX_DATA_OUT +=    		$(ACTORS_ALL_OUT)
+
+actors : $(ACTORS_ALL_OUT)
+	@$(ECHO) Actors made
+
+cleanactors : 	
+		@$(RM) -f $(ACTORS_ALL_OUT)
+		@$(ECHO) Actors cleaned
 
 #----------------------------------------------------------------------------
 # Player
 #----------------------------------------------------------------------------
 
-PLAYER_FILE :=		Spongebob
-PLAYER_IN_DIR:=		$(ACTOR_IN_DIR)/$(PLAYER_FILE)
-PLAYER_OUT_DIR :=	$(ACTOR_OUT_DIR)
 
-PLAYER_MOD_IN :=	$(PLAYER_IN_DIR)/$(PLAYER_FILE).Gin
-PLAYER_MOD_OUT :=	$(PLAYER_OUT_DIR)/$(PLAYER_FILE).a3d
-PLAYER_TEX_DIR :=	$(PLAYER_IN_DIR)/textures
-PLAYER_TEX_IN :=	$(PLAYER_TEX_DIR)/*.bmp
-PLAYER_TEX_OUT :=	$(PLAYER_OUT_DIR)/$(PLAYER_FILE).Tex
-
-PLAYER_ANIM	:=		buttbounceend buttbouncestart deathbackwards deathdry  deathforwards deathspin deathtar electricshock electricshockend electricshockstart faceback facefront \
-					fall getup getuprun hitground hover hoverend hoverstart idlebreathe idlehoola idlelook idlewigglearm jumpend karate run \
-					runstart runstop soakup talk01 teeterback teeterfront \
-					idlewind
-
-PLAYER_ANIM_LIST :=		$(foreach FILE,	$(PLAYER_ANIM),-a:$(PLAYER_IN_DIR)/$(FILE).gin)
-PLAYER_ANIM_DEP_IN :=	$(foreach FILE,	$(PLAYER_ANIM),$(PLAYER_IN_DIR)/$(FILE).gin)
-PLAYER_ANIM_DEP_OUT :=	$(ANIM_OUT_DIR)/SpongeBob.Abk
-
-PLAYER_EXTRA_TEX :=	SBBackNormal \
-					SBEyesAngry SBEyesBlink SBEyesDown SBEyesfiece SBEyesLeft SBEyesNormal SBEyesRight SBEyesSheepish SBEyesUp SBEyesWorried \
-					SBHandNormal \
-					SBMouthGasp SBMouthNormal SBMouthSheepish SBMouthSmile SBMouthTerror SBMouthWhistle \
-					SBPantsideNormal \
-					SBPantsNormal \
-					SBSideNormal \
-					SBSocksNormal \
-					SBSoleNormal \
-					SBTopNormal
-
-PLAYER_EXTRA_TEX_LIST :=	$(foreach FILE,	$(PLAYER_EXTRA_TEX),-x:textures/$(FILE).bmp)
-
-PLAYER_DEP_IN :=	$(PLAYER_MOD_IN) $(PLAYER_TEX_IN) $(PLAYER_ANIM_IN)
-PLAYER_DEP_OUT :=	$(PLAYER_MOD_OUT) $(PLAYER_TEX_OUT) $(PLAYER_ANIM_OUT)
-
-player: $(PLAYER_DEP_OUT)
-	
-cleanplayer:
-	@$(RM) -f $(PLAYER_DEP_OUT)
-	@$(ECHO) Player Cleaned
-	
-$(PLAYER_DEP_OUT) : $(PLAYER_DEP_IN)
-	@$(MKACTOR3D) $(PLAYER_MOD_IN) -o:$(PLAYER_OUT_DIR) -t:24,1,1 -s:256 -i:$(INC_DIR) $(PLAYER_EXTRA_TEX_LIST) $(PLAYER_ANIM_LIST)
-
-GFX_DATA_OUT +=	$(PLAYER_DEP_OUT)
 
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------