From 0f272027d8b9382688c35882254acfd7a63e7b86 Mon Sep 17 00:00:00 2001
From: SunakazeKun <nintendo.rpgforum@gmail.com>
Date: Wed, 31 Aug 2016 19:17:31 +0200
Subject: [PATCH] v1.4.2.2

---
 build.xml                                     |    2 +-
 nbproject/private/private.xml                 |   19 +-
 nbproject/project.properties                  |    2 -
 src/Resources/Hash.txt                        | 4998 +----------------
 src/whitehole/AboutForm.java                  |    7 +-
 src/whitehole/BcsvEditorForm.form             |  132 +-
 src/whitehole/BcsvEditorForm.java             |  444 +-
 src/whitehole/CheckBoxList.java               |    7 +-
 src/whitehole/GalaxyEditorForm.form           |   18 +-
 src/whitehole/GalaxyEditorForm.java           |  354 +-
 src/whitehole/HashForm.form                   |   32 +-
 src/whitehole/HashForm.java                   |  100 +-
 src/whitehole/Iterator2Enumeration.java       |    9 +-
 src/whitehole/LayerForm.form                  |   99 +
 src/whitehole/LayerForm.java                  |  134 +
 src/whitehole/MainFrame.form                  |   27 +-
 src/whitehole/MainFrame.java                  |   55 +-
 src/whitehole/ObjListTreeNode.java            |    7 +-
 src/whitehole/ObjTreeNode.java                |    7 +-
 src/whitehole/ObjectDB.java                   |   83 +-
 src/whitehole/ObjectDBUpdater.java            |   11 +-
 src/whitehole/ObjectSelectForm.form           |  320 +-
 src/whitehole/ObjectSelectForm.java           |  197 +-
 src/whitehole/PropertyGrid.java               |    9 +-
 src/whitehole/Settings.java                   |   25 +-
 src/whitehole/SettingsForm.form               |   67 +-
 src/whitehole/SettingsForm.java               |   88 +-
 src/whitehole/StrictThreadGroup.java          |    7 +-
 src/whitehole/SuperFastHash.java              |    7 +-
 src/whitehole/ToolbarFlowLayout.java          |    7 +-
 src/whitehole/Whitehole.java                  |   27 +-
 src/whitehole/fileio/ExternalFile.java        |    7 +-
 src/whitehole/fileio/ExternalFilesystem.java  |    7 +-
 src/whitehole/fileio/FileBase.java            |    7 +-
 src/whitehole/fileio/FilesystemBase.java      |    7 +-
 src/whitehole/fileio/MemoryFile.java          |    7 +-
 src/whitehole/fileio/RarcFile.java            |    7 +-
 src/whitehole/fileio/RarcFilesystem.java      |    7 +-
 src/whitehole/fileio/Yaz0.java                |    7 +-
 src/whitehole/fileio/Yaz0File.java            |   16 +-
 src/whitehole/rendering/AreaCubeRenderer.java |    7 +-
 src/whitehole/rendering/BmdRenderer.java      |    7 +-
 src/whitehole/rendering/BtiRenderer.java      |    8 +-
 .../rendering/ColorCubeRenderer.java          |    7 +-
 .../rendering/DoubleBmdRenderer.java          |    7 +-
 src/whitehole/rendering/GLRenderer.java       |    7 +-
 src/whitehole/rendering/Helper.java           |    7 +-
 .../rendering/ObjectModelSubstitutor.java     |  191 +-
 src/whitehole/rendering/PlanetRenderer.java   |   11 +-
 src/whitehole/rendering/RendererCache.java    |    7 +-
 src/whitehole/rendering/ShaderCache.java      |    7 +-
 src/whitehole/rendering/TextureCache.java     |    7 +-
 .../rendering/TripleBmdRenderer.java          |   75 +
 .../rendering/objRenderer/AstroPart.java      |    7 +-
 .../rendering/objRenderer/AstroSky.java       |    7 +-
 .../rendering/objRenderer/Kinopio.java        |    7 +-
 src/whitehole/rendering/objRenderer/Pole.java |   14 +-
 .../rendering/objRenderer/PoleSquare.java     |   62 -
 .../rendering/objRenderer/PowerStar.java      |   32 +-
 .../objRenderer/SuperSpinDriver.java          |   56 +
 .../rendering/objRenderer/UFOKinoko.java      |    7 +-
 src/whitehole/smg/Bcsv.java                   |   49 +-
 src/whitehole/smg/Bmd.java                    |    7 +-
 src/whitehole/smg/Bti.java                    |    7 +-
 src/whitehole/smg/Bva.java                    |    7 +-
 src/whitehole/smg/DataHelper.java             |    7 +-
 src/whitehole/smg/GalaxyArchive.java          |    7 +-
 src/whitehole/smg/GameArchive.java            |   31 +-
 src/whitehole/smg/LevelObject.java            |    7 +-
 src/whitehole/smg/ZoneArchive.java            |  198 +-
 src/whitehole/smg/object/AreaObj.java         |   67 +-
 src/whitehole/smg/object/CameraCubeObj.java   |   55 +-
 src/whitehole/smg/object/ChangeObj.java       |    9 +-
 src/whitehole/smg/object/ChildObj.java        |   17 +-
 src/whitehole/smg/object/DebugObj.java        |    7 +-
 src/whitehole/smg/object/DemoObj.java         |    9 +-
 src/whitehole/smg/object/GeneralObject.java   |   49 +-
 src/whitehole/smg/object/GeneralPosObj.java   |    9 +-
 src/whitehole/smg/object/MapPartObj.java      |   55 +-
 src/whitehole/smg/object/PathObject.java      |   14 +-
 src/whitehole/smg/object/PathPointObject.java |    7 +-
 src/whitehole/smg/object/PlanetObj.java       |   30 +-
 src/whitehole/smg/object/SoundObj.java        |    8 +-
 src/whitehole/smg/object/StageObj.java        |  102 +
 src/whitehole/smg/object/StartObj.java        |    8 +-
 src/whitehole/vectors/Color4.java             |    7 +-
 src/whitehole/vectors/Matrix4.java            |    7 +-
 src/whitehole/vectors/Vector2.java            |    7 +-
 src/whitehole/vectors/Vector3.java            |    7 +-
 89 files changed, 2370 insertions(+), 6337 deletions(-)
 create mode 100644 src/whitehole/LayerForm.form
 create mode 100644 src/whitehole/LayerForm.java
 create mode 100644 src/whitehole/rendering/TripleBmdRenderer.java
 delete mode 100644 src/whitehole/rendering/objRenderer/PoleSquare.java
 create mode 100644 src/whitehole/rendering/objRenderer/SuperSpinDriver.java
 create mode 100644 src/whitehole/smg/object/StageObj.java

diff --git a/build.xml b/build.xml
index f1cd9dc..bc602ed 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="Whitehole v1.4" default="default" basedir=".">
+<project name="Whitehole" default="default" basedir=".">
     <description>Builds, tests, and runs the project Whitehole.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 75b0ab1..3ddf11e 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -4,24 +4,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PlanetObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/ObjectModelSubstitutor.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/BcsvEditorForm.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/ObjectDBUpdater.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/ChildObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PathPointObject.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PathObject.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/ChangeObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/GeneralObject.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/RendererCache.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/MapPartObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/AreaObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/StartObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/GeneralPosObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/DebugObj.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/SettingsForm.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/PlanetRenderer.java</file>
-            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/SoundObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/Whitehole.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 54b4913..2dde70a 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -91,7 +91,6 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.external.vm=false
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -117,7 +116,6 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
-project.licensePath=./nbproject/licenseheader.txt
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/src/Resources/Hash.txt b/src/Resources/Hash.txt
index 5fa2dca..a5d2324 100644
--- a/src/Resources/Hash.txt
+++ b/src/Resources/Hash.txt
@@ -1,1671 +1,282 @@
-1stDamage
-2DWater
-2PGuidance
-2PGuidanceIcon
-2Way
-2bytes/flag
-2ndDamage
-AButtonPosC
-AButtonPosD
-AButtonPosU
-AButtonPosition
-ATGroupName
-ATR1
-AbsorbCoin
+# 000113F5 - LightData
+# 02BA7D47 - BackToEgg
+# 043838B2 - PointPos
+# 04C33057 - Shadow
+# 04C33058 - Shadow
+# 04C33059 - Shadow
+# 059A5892 - LightData
+# 0A71F2C8 - LightData
+# 0B1C280F - LightData
+# 0B1C2810 - LightData
+# 0B1C2815 - LightData
+# 0B1C2820 - LightData
+# 0DB31919 - ActorStateWalk
+# 0ECF2D59 - LightData
+# 0ECF2D5A - LightData
+# 0ECF2D5F - LightData
+# 0ECF2D6A - LightData
+# 0F67A990 - LightData
+# 0F67A991 - LightData
+# 0F67A996 - LightData
+# 0F67A9A1 - LightData
+# 15ADC947 - StageInfo
+# 165C8F89 - LightData
+# 17175211 - LightData
+# 18916416 - Shadow
+# 18916417 - Shadow
+# 18916418 - Shadow
+# 1BEEEC47 - LightData
+# 267DEBC6 - DynamicJointCtrl
+# 27D98908 - LightData
+# 2EC2FBC8 - ActorAnimCtrl
+# 33922D02 - ActionSound
+# 36010F09 - ActorAnimCtrl
+# 3C8BEA81 - LightData
+# 3C8BEA82 - LightData
+# 3C8BEA87 - LightData
+# 3C8BEA92 - LightData
+# 3E264686 - ActorAnimCtrl
+# 40026350 - LightData
+# 40026351 - LightData
+# 40026356 - LightData
+# 40026361 - LightData
+# 433A5DB7 - SpaceParts
+# 43B5689A - LightData
+# 43B5689B - LightData
+# 43B568A0 - LightData
+# 43B568AB - LightData
+# 43EA1591 - HeapSizeExcept
+# 444DE4D1 - LightData
+# 444DE4D2 - LightData
+# 444DE4D7 - LightData
+# 444DE4E2 - LightData
+# 4D6DBDAE - SpaceParts
+# 4D899144 - ActorAnimCtrl
+# 4DB4F9C4 - InitSensor
+# 50F5D5E6 - CubeCamera
+# 528AC841 - InitSensor
+# 55CFC442 - ChangeObj
+# 5B36581D - ActorAnimCtrl
+# 5FF07156 - LightData
+# 5FF07157 - LightData
+# 5FF07158 - LightData
+# 5FFE88D7 - LightData
+# 5FFE88D8 - LightData
+# 5FFE88D9 - LightData
+# 60CB6B62 - SoundIdToInstList
+# 62746B5E - ActorAnimCtrl
+# 6882CDE8 - ActorAnimCtrl
+# 690EA42B - LightData
+# 69B44F36 - LightData
+# 69B44F37 - LightData
+# 69B44F38 - LightData
+# 69C266B7 - LightData
+# 69C266B8 - LightData
+# 69C266B9 - LightData
+# 6A99A2DB - ActorAnimCtrl
+# 6BEC7F26 - ActorAnimCtrl
+# 6D52E4A8 - BackToEgg
+# 6F563064 - ActorAnimCtrl
+# 6F9CA5E9 - ActorAnimCtrl
+# 7193684C - LightData
+# 7232F698 - ActorAnimCtrl
+# 75C8535F - LightData
+# 75C85360 - LightData
+# 75C85361 - LightData
+# 75D66AE0 - LightData
+# 75D66AE1 - LightData
+# 75D66AE2 - LightData
+# 77608395 - LightData
+# 77608396 - LightData
+# 77608397 - LightData
+# 776DC061 - LightData
+# 776DC062 - LightData
+# 776DC067 - LightData
+# 776DC072 - LightData
+# 776E9B16 - LightData
+# 776E9B17 - LightData
+# 776E9B18 - LightData
+# 77D9EB32 - ActorStateWalk
+# 79D6BACA - LightData
+# 79D6BACB - LightData
+# 79D6BAD0 - LightData
+# 79D6BADB - LightData
+# 79FCED99 - ActorAnimCtrl
+# 7CD48D69 - LightData
+# 7D098080 - LightData
+# 7D098081 - LightData
+# 7D098086 - LightData
+# 7D098091 - LightData
+# 8451FAB6 - MarioFaceShipEventCastTable
+# 8451FAB7 - MarioFaceShipEventCastTable
+# 8451FAB8 - MarioFaceShipEventCastTable
+# 8451FAB9 - MarioFaceShipEventCastTable
+# 8451FABA - MarioFaceShipEventCastTable
+# 8451FABB - MarioFaceShipEventCastTable
+# 8451FABC - MarioFaceShipEventCastTable
+# 8451FABD - MarioFaceShipEventCastTable
+# 8451FABE - MarioFaceShipEventCastTable
+# 8451FABF - MarioFaceShipEventCastTable
+# 8BFDE078 - ActorAnimCtrl
+# 8E5186E8 - LightData
+# 912C1F84 - SpaceParts
+# 93430C6E - SpaceParts
+# 93430C6F - SpaceParts
+# 93430C70 - SpaceParts
+# 95CB4ED0 - PosShell
+# 95CB4ED0 - ShotPos
+# 95CB4ED0 - SpaceParts
+# 95CB4ED1 - PosShell
+# 95CB4ED1 - ShotPos
+# 95CB4ED1 - SpaceParts
+# 95CB4ED2 - PosShell
+# 95CB4ED2 - ShotPos
+# 95CB4ED2 - SpaceParts
+# B5B9663D - PosShell
+# B5B9663D - ShotPos
+# B5B9663D - SpaceParts
+# B5B9663E - PosShell
+# B5B9663E - ShotPos
+# B5B9663E - SpaceParts
+# B5B9663F - PosShell
+# B5B9663F - ShotPos
+# B5B9663F - SpaceParts
+# B7AB8F70 - LightData
+# B7AB8F71 - LightData
+# B7AB8F76 - LightData
+# B7AB8F81 - LightData
+# B812BAE6 - MarioFaceShipEventCastTable
+# B812BAE7 - MarioFaceShipEventCastTable
+# B812BAE8 - MarioFaceShipEventCastTable
+# B812BAE9 - MarioFaceShipEventCastTable
+# B812BAEA - MarioFaceShipEventCastTable
+# B812BAEB - MarioFaceShipEventCastTable
+# B812BAEC - MarioFaceShipEventCastTable
+# B812BAED - MarioFaceShipEventCastTable
+# B812BAEE - MarioFaceShipEventCastTable
+# B812BAEF - MarioFaceShipEventCastTable
+# B8713CCD - ActorAnimCtrl
+# C4F73392 - ChangeObj
+# C6672A7E - BackToEgg
+# CDC4FEAD - CubeCamera
+# D6C80400 - ScenarioData
+# DB99E8F5 - LightData
+# DE82372A - ChangeSceneListInfo
+# E6759A6C - LightData
+# EC91CAB1 - LightData
+# EC91CAB2 - LightData
+# EC91CAB7 - LightData
+# EC91CAC2 - LightData
+# F730F24A - ActorAnimCtrl
 AccelRateToBckPos
-Accell
-Access
-AcidFrontL
-AcidFrontR
-AcidRearL
-AcidRearR
-AcidSplash
-Action
 ActionName
 ActionSe
 ActionType
-Activate
-Active
-ActorAnimCtrl
 ActorAnimName
-ActorParam
-ActorStateWalk
-AddMailStarPiece
-AddScore
-AddScoreL
-AddTimer
 Affect
-Afraid
-AfraidTalk
-AfraidWait
-After
-Aggressive
-AirControl
-AirMeter
-AirRecover
-AirRotation
-AlartHigh
-AlartMiddle
-AlartNormal
-AliveWait
-AllCompleteImage
-AllLiveActorGroup
-AllRights
-AllRoot
 AllSoundStopFrame
-AllStarList
-Alpha
-Anger
-AngerSearch
-Angry
-AngryAppear
-AngryAttackHit
-AngryChase
-AngryChaseEnd
-AngryChaseStart
-AngryDash
-AngryDemo
-AngryDive
-AngryEffectWalk
-AngryEffectWalkAppear
-AngryEffectWalkHide
-AngryEnd
-AngryHide
-AngryJump
-AngryLastWait
-AngryMore
-AngryPunchDamage
-AngryRunStart
-AngrySign
-AngrySmoke
-AngryStart
-AngryWait
-AngryWalk
 AnimCameraEndFrame
 AnimCameraName
 AnimCameraStartFrame
 AnimName
-AnmModelKill
-AnmModelMoveLoop
-AnmModelMoveStart
-AnmModelReverse
-AnmModelStop
-Antenna
-Appear
-AppearAgain
-AppearBee
-AppearBoss
-AppearBossFormer
-AppearBossLatter
-AppearCritical
-AppearDemo
-AppearDirect
-AppearDiveIn
-AppearDiveOut
-AppearFireFlower
-AppearFirst
-AppearFoo
-AppearFromBox
-AppearFromGenerator
-AppearGhost
-AppearGoodsSmoke
-AppearGround
-AppearHopper
-AppearIceFlower
-AppearLand
-AppearLava
-AppearLight
-AppearLow
-AppearMini
-AppearNone
-AppearOneLine
-AppearPicture
+AnimName
 AppearPowerStarObj
-AppearRock
-AppearSign
-AppearSmoke
-AppearStarPiece
-AppearTeresa
-AppearTwoLine
-AppearWall
-Appearance
-Applause
-AppleHit
-Apron
-ArciveName
 AreaLightName
-AreaMove
-AreaObjInfo
 AreaShapeNo
-ArmL
-ArmL1
-ArmL2
-ArmR
-ArmR1
-ArmR2
-Armor
-ArmorBreakFixPos
-Arrested
-ArrestedTalk
-Arrival
-Arrow
-ArrowDownButton
-ArrowSwitch
-ArrowUpButton
-AssemblyBlock
-Attack
-Attack1st
-Attack2nd
-Attack2ndJump
-Attack2ndJumpLand
-Attack2ndJumpSign
-Attack2ndJumpSign2nd
-Attack3rd
-AttackA
-AttackB
-AttackBite
-AttackBlur
-AttackC
-AttackDive
-AttackDiveBlur
-AttackDiveDown
-AttackDiveFlyOut
-AttackDiveSign
-AttackDiveUnderground
-AttackEnd
-AttackFire
-AttackFireLong
-AttackFireShort
-AttackFireStart
-AttackFootL
-AttackFootR
-AttackFront
-AttackFrontStart
-AttackFrontToWait
-AttackHipDrop
-AttackHit
-AttackJaw
-AttackJawCancel
-AttackJawDown
-AttackJawSign
-AttackJump
-AttackJump1st
-AttackJump2nd
-AttackJumpLand
-AttackJumpLand1st
-AttackJumpLand2nd
-AttackJumpSign
-AttackJumpSign1st
-AttackJumpSign2nd
-AttackLeft
-AttackLoop
-AttackLoopL
-AttackLoopR
-AttackMeteor
-AttackNear
-AttackOnGround
-AttackQuake
-AttackRight
-AttackRockFallBreak
-AttackRockHill
-AttackRoll
-AttackRollEnd
-AttackRollLand
-AttackRollReceiver
-AttackRollStarPiece
-AttackRollStart
-AttackRush
-AttackSecond
-AttackShell
-AttackShockWave
-AttackSign
-AttackSpin
-AttackStart
-AttackSuccess
-AttackSuccessWait
-AttackTail
-AttackThrow
-AttackWait
-Attacksuccess
-Attr
-AudBgmConductor
-AudCameraWatcher
-AudioRes
-AutoEat
-AutoEatStart
-AutoScale
-Awake
-Away
-BClearTime
-BRunTalk
-BSign
-BSpinHit
-BTalkCry
-BTalkHelp
-BTalkNormal
-BTalkSpin
-BTalkSpring
-BTalkSurprise
-BTalkSurvive
-BTrampled
-BWait
-BWaitRun
-BWaitStand
-Back
-Back1
-Back2
-Back3
-BackBone01
-BackBone02
-BackBone03
-BackBone04
-BackBone05
-BackBone06
-BackBone07
-BackBone08
-BackBone09
-BackBone10
-BackBone11
-BackButton
-BackButton0
-BackButton1
-BackButton2
-BackDash
-BackEnd
-BackFin
-BackInMagma
-BackLeg
-BackSideDamage
-BackSideDamageSecond
-BackSmoke
-BackToFace
-BackWait
-Ball
-BallAppear
-BallBeamer
-BallFall
-BallGuidance
-BallHit
-BallIdle
-BallJump
-BallLand
-BallRoll
-BallRollEnd
-BallRollStart
-BallRun
-BallSquat
-BallWalk
-BallWalkSoft
-Balloon
-BalloonDamage
-BalloonEnd
 BankProgNo
-BannerCreator
-BarrierBound
-Base
-Base1
-Base2
-Base3
-Base4
-Base5
-Base6
-Battery01
-Battery02
-Battery03
-Battery04
-Battery05
-Battery06
-BatteryInfo
-BatteryLayout
-Battle1st
-Battle2nd
-Battle2ndStart
-BattleDamage
-BattleEnd
-BattleLv1
-BattleLv2
-BattleStart
-BattleStartEnd
-BattleStartLoop
-BattleWait
-BattleWaitNoInter
-Bazooka
 BckName
-BckName1st
-BckName2nd
-BckName3rd
+BckName
 BckStartFrame
-Bd
-Beach
-Beak
-Beam
-BeamEnd
-BeamEndAir
-BeamFire
-BeamFireBreak
-BeamFireBurn
-BeamFireReady
-BeamFireVanish
-BeamStart
-BeamSurface
-BeamTurtle
-BeamTurtleBreak
-BeamTurtleReady
-BeamTurtleVanish
 BeatRatio
-BeeBallHit
-BeeCreepLand
-BeeCreepWait
-BeeCreepWalk
-BeeCreepWallWalk
-BeeEaterBody
-BeeFlowerHover
-BeeFlowerPollen
-BeeFly
-BeeFlyWait
-BeeHipDrop
-BeeHipDropLand
-BeeHipDropStart
-BeeJump
-BeeLand
-BeeLuigi
-BeeMario
-BeeMarioWing
-BeeSpin
-BeeSpinGround
-BeeWait
-BeeWallJump
-Before
 BendMaxDegree
-BenefitItemInvincible
-BenefitItemObj
-BesideGalaxy
-BestRecord
-BestScore
-BestTime
-BestTimeCounter
+Bgm
 BgmFadeStep
 BgmIdName
 BgmName
 BgmStateNo
 BgmWipeoutFrame
-Big0
-Big1
-Big2
-BigFanWind
-BigJumpBlur
-BigJumpLand
-Bind
-BindAfter
-BindEnd
-BindHeight
 Binder
-BinderWaterLower
-BinderWaterUpper
-Bite
-Bl
-Black
-BlackHoleRange
-BlackHoleSuction
-BlackSmoke
-Blink
-BlinkTwice
-Bloom
 BloomFlag
-BloomMagma
-BlosBase
-Blow
-BlowDown
-BlowDownLand
-BlowDownRock
-BlowEnd
-BlowHead
-BlowL
-BlowR
-BlowStart
-Blue
-BlueFireDamageSmoke
-BlueStarGuidance
-BlueToGreen
-BlueToRed
-Blur
-Blur1
-Blur2
-Blur3
-Blur4
-Blur5
 BlurAlpha
-BlurFaceOutStep
-BlurFadeInStep
+BlurFadeInInStep
 BlurFadeOutStep
-BlurGold
 BlurOffset
-BlurRed
 BlurTotalStep
-Body
-Body00
-Body01
-Body03
-Body04
-Body1
-Body2
-Body3
-Body4
-Body5
-BodyAttack
-BodyBubble
-BodyCol
-BodyColor
-BodyCylinder
-BodyDeath
-BodyFire
-BodyGear
-BodyGear1
-BodyGear2
-BodyGear3
-BodyGround
-BodyHip
-BodyHipDrop
-BodyIce
-BodyIceOff
-BodyLeft
-BodyRight
-BodySpace
-BodySphere
-BodyUpper
-BoltL
-BoltR
-BombPos
-BombTimeAttackLv1
-BombTimeAttackLv2
-BombTimer
-BombTimerLayout
-Bone
-BoneBreakEnd
-BoneBreakStart
-BoneBreakWait
-BoneLuigi
-BoneMario
-Born
-Boss
-Bottom
-Bounce
-Bound
-BoundHipDrop
-BoundJump
-BoundLittle
-BoxArrowL
-BoxArrowR
-BoxBButton
-BoxBase
-BoxButton
-BoxButton1
-BoxButton1_00
-BoxButton1_01
-BoxButton2
-BoxButton3
-BoxButton4
-BoxButton5
-BoxButton6
-BoxButton7
-BoxButton8
-BoxButton9
-BoxDButton
-BoxDelete
-BoxIcon
-BoxLButton
-BoxLeft
-BoxMario
-BoxMii
-BoxOut
-BoxP2
-BoxRButton
-BoxRight
-BoxStartButton
-BoxTButton
-BoxUButton
-BoxVanish
-Bp
-Brake
-BrakeL
-BrakeLamp
-BrakeR
-BrakeSmokeL
-BrakeSmokeR
-Break
-Break1
-Break123
-Break2
-Break3
-BreakBody
-BreakDust
-BreakFirst
-BreakInside
-BreakLevel
-BreakLight
-BreakLong
-BreakObject
-BreakOutside
-BreakPress
-BreakSecond
-BreakStart
-BreakThird
-BreakWater
-BreakWatermelon
-BreakWhite
-BreakYellow
-BreakableCageBreak
-Breathe
-BringBubble
-BringBubbleBreak
-BringEnemy
-Broken01
-BrosButton
-BrosIcon
-Bubble
-BubbleAttack
-BubbleBreak
-BubbleChase
-Bullet
-BulletAppearAS
-BulletExplosionAS
-BulletMoveGoundAS
-BulletMoveUndergroundAS
-BulletReflectAS
-BulletSearch
-BulletStepDowmByEnemyAS
-BulletWater
-BumpAppearPlanetPull
-BumpAppearPlanetPush
-Burn
-Burrow
-Burst
-Bury
-BurySmoke
-BuryStandEnd
-BuryStandWait
-Button
-ButtonAppear
-ButtonDecide
-ButtonEnd
-ButtonGuidance
-ButtonOff
-ButtonPosition
-ButtonReaction
-ButtonSelectIn
-ButtonSelectOut
-ButtonShow
-ButtonWait
-CLOSE
-CPosition1
-CPosition2
-CPosition3
-CakeVanish
 CalcGravity
-CallBack
-Camera
-CameraCharmedVecRegTower
-CameraCover
-CameraCubeInfo
-CameraFreeze
-CameraHeightArrange
-CameraInfo
-CameraInnerCylinder
-CameraMoveIntensity
-CameraMoveSpeed
-CameraParam
-CameraRaceFollow
-CameraRepulsiveArea
+Callback
 CameraSetId
-CameraShakeDistance
 CameraShakeName
 CameraShakeNameFar
 CameraShakeNameMiddle
-CameraStartType
-CameraStopType
 CameraTargetCastID
 CameraTargetName
 Camera_id
 Camera_through
-Cancel
-Cannon1
-Cannon3
-CannonFlyLand
-CannonFlyLoop
-CannonFlyStart
-Cap0
-Cap1
-Cap2
-Cap3
-CapPosition
-Capture
-CaptureJump
-CareTakerHunter
-Careless
-Caretaker
-Caretaker1
-Caretaker2
-Carpet
-Carry
-CarryAirStart
-CarryDrillShortStart
-CarryDrillStart
-CarryDrillWait
-CarryStart
-CarryStartShort
-CarryWait
 CastID
+CastId
 CastName
 CastNum
-CastleAssault
-Catch
-CatchBoomerang
-CatchLand
-CatchV
-CatchWait
-Catepillar
-Caught
-CaughtLand
-CaughtWait
-CeilingCrash
-Celestrial
-Center
-CenterFur
-CenterHandL3
-CenterHandR3
-CenterJoint
-CenterPlayerLeft
-Challenge
-Chance
-ChanceDamage
-ChanceDamageLast
-ChanceEnd
-ChanceSliding
-ChanceStart
-ChanceTime
-ChanceVoice
-ChanceWait
-ChanceWaitEndSign
-Change
-ChangeBack
 ChangeBgmIdName0
 ChangeBgmIdName1
 ChangeBgmIdName2
 ChangeBgmIdName3
 ChangeBgmIdName4
-ChangeBgmState0
-ChangeBgmState1
-ChangeBgmState2
-ChangeBgmState3
-ChangeBgmState4
-ChangeBlue
-ChangeColors
-ChangeMarks
-ChangeOn
-ChangeRed
-ChangeRoomOpen
-ChangeSceneListInfo
-ChangeSide
-ChangeSideJump
-ChangeSign
-Chapter1
-Chapter2
-Chapter3
-Chapter4
-Chapter5
-Chapter6
-Chapter7
-Chapter8
-Chapter9
-Character
-Charge
-Chase
-Chase1st
-Chase2nd
-ChaseDash
-ChaseNoInterpole
-ChaseRoll
-ChaseRollAttack
-ChaseRollEnd
-ChaseRollFace
-ChaseRollLand
-ChaseRollStarPiece
-ChaseRollStart
-ChaseRun
-ChaseSight
-ChaseStart
-ChaseTurn
-ChaseVoice
-Chem
-ChildCenter
-ChildDeath
-ChildObj
+ChangeBgmStage0
+ChangeBgmStage1
+ChangeBgmStage2
+ChangeBgmStage3
+ChangeBgmStage4
 ChildObjId
-ChimneySmokeMove
-ChimneySmokeWait
-Chip1
-Chip2
-Chip3
-Chip4
-Chip5
-ChipBase
-ChipGet
-CinemaFrame
-CinemaSuper
-Clash
 ClassName
-Clear
-ClearStarLight
-ClimbTurn
-ClippedMapParts
-Clipping
 ClippingGroupId
-Close
-CloseDamage
-CloseEye
 CloseGameFlag
-CloseSignal
 CloseStageName
 CloseStageScenarioNo
-CloseStart
-CloseTalk
-CloseWait
-Cloud
-CloudSpin
-CloudSpinGround
-Cockpit
-CocoNutBall
-CocoNutBlur
-CocoNutBreak
-CocoNutLight
-CocoSamboAttack
-CocoSamboBody
-CocoSamboHead
-CocoSamboSmoke
-CoconutTree
-CoconutTreeLeaf
-CocoonFly
-CocoonLand
-CocoonReaction
-CocoonStretch
-CocoonWait
-Coin
-CoinBlock
-CoinCounter
-CoinCounterLight
-CoinFlower
-CoinGet
-CoinGroup
-CoinSpinBlur
-Coinx1
-ColPos
-CollectCounter
-CollectTico
-CollectTicoLight
-Collection
 Collision
-CollisionMapObj
-CollisionMapObjIndirectNoCalcAnim
-CollisionMapObjNoShadow
-CollisionMapObjNoShadowNoCalcAnim
-CollisionMapObjWeakLight
 CollisionName
 CollisionParts
-Color
 ColorChange
-ColumnKey
-ComeOff
 Comet
-Comet1Status
-Comet2Status
-Comet3Status
-Comet4Status
-Comet5Status
-Comet6Status
-CometAppear
 CometAppearMedalNum
-CometEnd
-CometEventExecutorTimeLimitDestroy
-CometFireDanceArea
-CometGreen
-CometHopperArea
-CometIcon
-CometIconAppear
-CometIconGreenAppear
 CometLimitTimer
-CometMark
-CometMedalCounter
-CometName
-CometNearOrbitSky
-CometNoSpinArea
-CometNormal
-CometPosition
-CometRainbowArea
-CometScreenFilter
-CometTico
-CometTicoTell
-CometWait
-CometWindow
-CommandStream
-Common
-CommonPathInfo
 CommonPath_ID
-CommonPhotonDustCircle
-Comp
-Complete
-Complete1
-Complete2
-CompleteDemo
-CompleteInstant
-ConcreteBlock
-ConfirmEndGame
-Congratulate1
-Contents
 ContinueAnimEnd
-Cool
-CoolDown
-Copy
-CopyButton
-Core
-CoreWait
-Count
-CountDown
-CountEnd
-CountFast
-CountVeryFast
-Counter
-Crack
-Crack1
-Crack2
-CrestGetFlyC
-CrossFade1
-CrossFade2
-CrossFade3
-Crow
-Crown
-Crown1
-Crown2
-CrownDamage
-CryDemo
-Crystal
-CrystalItem
 CtrlJointNumMax
-CubeCamera
-CurMarking
-CymbalsStepClose
-DBody
-DH
-DISC_01
-DISC_02
-DISC_03
-DISC_04
-DPDHit
-DPDHitDown
-DPDHitDownWait
-DPDPointer
-DPDPointerNumber
-DPDPointerSub
-DVDOpen() failed
-Daiya_v
-Damage
-Damage0
-Damage1
-Damage1Color
-Damage2
-Damage2Color
-Damage3
-DamageAS
-DamageAbove
-DamageBelow
-DamageBit
-DamageCore
-DamageDown
-DamageElec
-DamageElectric
-DamageElectricEnd
-DamageEnd
-DamageEscape
-DamageEscapeBody
-DamageEscapePush
-DamageFire
-DamageFirst
-DamageFlick
-DamageFlickEnd
-DamageHead
-DamageHitSound
-DamageLand
-DamageLast
-DamageLastBreak
-DamageLastCrack
-DamageLastHitSound
-DamageLeft
-DamageLong
-DamageMario
-DamageMiddle
-DamageMiddleBack
-DamageMiddleBackAir
-DamageMiddleBackLand
-DamageMiddleFront
-DamageMiddleFrontAir
-DamageMiddleFrontLand
-DamageMini
-DamageMini2nd
-DamageMini3rd
-DamageNormal
-DamageNumb
-DamageNumbEnd
-DamageOpenWait
-DamageOpenWaitEnd
-DamagePop
-DamageRight
-DamageRush
-DamageS
-DamageShell
-DamageShellLand
-DamageShort
-DamageSmallBack
-DamageSmallFront
-DamageSmoke1
-DamageSmoke2
-DamageSmokeL1
-DamageSmokeL2
-DamageSmokeS1
-DamageSmokeS2
-DamageStart
-DamageTailRun
-DamageTailRunEnd
-DamageTailRunFast
-DamageTailRunFastStart
-DamageTailRunStart
-DamageTop
-DamageWait
-DamageWeakFront
-DamageWeakFrontAir
-DamageWeakFrontLand
-Danger
-Danger1
-Danger2
-DangerBrk
-DangerSignBoard
-DangerWait
-Dark
-DarkMatter
-Dash
-DashA
-DashChargeArea
-DashEnd
-DashFootNoteAddL
-DashFootNoteAddR
-DashFruitStem
-DashGroundSpark
-DashHitWall
-DashJump
-DashJumpL
-DashLV
-DashLVFire
-DashLVWind
-DashRun
-DashSign
-DashSignMove
-DashStart
-DashTopWater
-DashWait
-DashWater
-DashYoshiStep
 Data
-Dead
-Death
-DeathAS
-DeathArea
-DeathFall
-DeathInstant
-DeathSmokeHead
-DeathSmokeKuribo
-DeathSmokeSpine1
-DeathSmokeSpine2
-DeathSmokeSpine3
-DeathWater
-Decide
-Default
-DefaultPos
-Defeat
-DefenseCollision
-DefenseEnd
-DefenseStart
 DegreeMax
-DegreeMaxHL
-DegreeMaxHR
-DegreeMaxV
 DegreeMaxVertical
-Delete
-DeleteButton
-Delight
-DelightDeepSea
-Demo
-DemoBattanKingDown
-DemoBattanKingOpening
-DemoBattleEnd
-DemoBattleStairsStart
-DemoBattleStart
-DemoBellyDragon
-DemoBossKameckDown
-DemoBossKameckDown2
-DemoBossKameckPowerUp
-DemoBossKameckPowerUp2
-DemoBossKameckStart
-DemoBossKameckStart2
-DemoButlerDomeLecture1
-DemoButlerDomeLecture2
-DemoButlerMapLecture
-DemoButlerReport
-DemoButlerStarPiece1
-DemoButlerStarPiece2
-DemoDeath
-DemoDown
-DemoEndPlayerPos
-DemoEnding1st
-DemoEnding1stLoop
-DemoEnding2nd
-DemoEnding3rd
-DemoEnding3rdLoop
-DemoEnding4th
-DemoEndingBossJugem
-DemoEndingWait
-DemoEpilog
-DemoEpilogueB
-DemoExplosion
-DemoFlyLightDemo
-DemoGetPower
-DemoGetPowerStartWait
 DemoGroupId
-DemoHide
-DemoIn
-DemoIntoBossLv1
-DemoIntoBossLv2
-DemoIntoBossLv3
-DemoIntoGalaxy
-DemoKoopa
-DemoKoopaArm
-DemoKoopaBattleStairsVs3Start
-DemoKoopaBattleStairsVs3Start01
-DemoKoopaBattleStairsVs3Start02
-DemoKoopaBattleStairsVs3Start03
-DemoKoopaCastle
-DemoKoopaFall
-DemoKoopaFallSun
-DemoKoopaGrandStar
-DemoKoopaGrandStarVs3
-DemoKoopaLastBattleEnd
-DemoKoopaLastBattleStart
-DemoKoopaMeetPeach
-DemoKoopaPowerUp
-DemoKoopaPowerUpFinal
-DemoKoopaStayLoop
-DemoKoopaVs1Down
-DemoKoopaVs1Opening
-DemoKoopaVs1Start
-DemoKoopaVs2Down
-DemoKoopaVs2Opening
-DemoKoopaVs2Start
-DemoKoopaVs3Down
-DemoKoopaVs3Opening
-DemoKoopaVs3Start
-DemoKoopaVs3Wait
-DemoLastBattleEnd
-DemoMove
 DemoName
-DemoObjInfo
-DemoOpening
-DemoPowerUp
-DemoPowerUpKoopaJrCastle
-DemoRideSpinDriver
-DemoRideSpinDriverBlue
-DemoRosettaReading
-DemoRosettaReadingWait
-DemoSandyDown
-DemoSandyPowerUp
-DemoSandyPowerUpL
-DemoSandyPowerUpR
-DemoSandyStart
-DemoSimpleCastAll
 DemoSkip
-DemoSpinTeach
-DemoTitle
-DemoTransform
-DemoWait
-DemoWeakPointHead
-DemoWeakPointHeadKoopaJrRobot
-DemoWithButler
-DemoWithShadow
-DepthLow
-Design
-DestroyCounter
-DieBlackHole
-DieBlackHoleBee
-DieBlackHoleCloud
-DieBlackHoleCloudLuigi
-DieBlackHoleLuigi
-DieBury
-DieBuryBody
-DieBuryHand
-DieCannonFly
-DieDarkMatter
-DieDeathMudBody
-DieDeathMudHand
-DieElectric
-DieEvent
-DieFall
-DieFire
-DieOver
-DieSit
-DieSwimEvent
-DieUnder
-DigStart
-DigWallIn
-DigWallOut
-DigWallOutSign
-Digging
-Dirt
-Disappear
-DisappearDamage
-DisappearDiveIn
-DisappearDiveOut
-DisappearElectric
-DisappearEnd
-DisappearFire
-DisappearLong
-DisappearSign
-Discharge
-DischargePosition
-Disperse
-DisplayInformationForResult
 DistanceFar
 DistanceInvalid
 DistanceMin
 DistanceNear
 Distant
-Dive
-DiveBack
-DiveBlowL
-DiveBlowR
-DiveBubble
-DiveWait
-DmDokanWarp
-DmMeetBoss
-DmTicofatMorphWipeIn
-DmTicofatMorphWipeOut
-DodoryuBank
-DodoryuDemoAngry
-DodoryuDemoAppear
-DodoryuDemoDown
-DodoryuDemoOpening
-DodoryuHill
-DodoryuHillA
-DodoryuHillB
-DodoryuHillC
-DodoryuLeadHill
-DodoryuRabbit
-DodoryuStateLv1
-DodoryuStateLv2
-DodoryuStateLv3
-DodoryuStateWait
-DogPaddle
-DokanWarp
-Dome1
-Dome2
-Dome3
-Dome4
-Dome5
-Dome6
-DomeColor
-DomeHalo
-DomeIn
-DomeOut
-DoorClose
-DoorOpen
-Down
-DownBack
-DownBody
-DownButton
-DownButtonPos
-DownCount
-DownCountOne
-DownDemo
-DownDemoExplosion
-DownEnd
-DownFront
-DownHead
-DownLand
-DownMouth1
-DownRecover
-DownRecoverAngry
-DownSmoke
-DownSpin
-DownStart
-DownStep
-DownToUp
-DpdHit
-DrawBackSign
 DrawOrder
-Drawer
-Dreamer
-DreamerCommon000
-DreamerEnd
-Drift
-DrillCancel
-DrillDamage
-DrillDigStart
-DrillDiveEnd
-DrillDiveLoop
-DrillDiveStart
-DrillEnd
-DrillHoleIn
-DrillHoleOut
-DrillPod
-DrillStart
-Drop
-Drop1
-Drop2
-Drop3
-DropEffect
-DropFire
 DropLength
-DropOffset
 DropStart
-Drown
 Dummy
-DummyGalaxy
-DummyItem
-DummyPageCurrent
-DummyPageNext
-DummyPoly
-Dust
-DynamicJointCtrl
-DynamicMapObj
-Eat0Normal
-Eat1Normal
-Eat2Normal
-EatDemo
-EatDemoCoin
-EatEnd
-EatStart
-EatStart0
-EatStart1
-EatStart2
-EatTargetDistMax
-Eating
-EdgeSpark
-EffPosTCoin
-Effect
-EffectBetweenOffset
-EffectCylinder
-EffectEmitLoop
-EffectEmitStart
-EffectEmitting
 EffectName
-EffectWalk
-EffectWalkAppear
-EffectWalkHide
-EggBroken
-EggDamageTop
-EggShell
-EggWalk
-ElbowL
-ElbowR
-Electric
-ElectricDamage
-ElectricDeath
-ElectricHit
-ElementEnd
-ElementGet
-ElementGetGround
-Empty
 EnName
-EndCritical
-EndDemo
 EndDirMaxDegree
 EndFrame
-EndGlow
 EndLocalDirX
 EndLocalDirY
 EndLocalDirZ
-EndLoop
-EndLow
-EndNone
-EndOneLine
-EndTwoLine
-EndWait
-Ending
-Enemy
-EnemyAttack
-EnemyDecoration
-EnemyIndirect
-EnemyNoMovement
-EnemyNoShadow
-EnemySilhouette
-EnemySimple
-EnergyLv
-EngineStarting
-English
-EnterDemo
-EnterDirect
-EnterGalaxy
-EnterHome
-EnterKoopaCastle
-EnterWorld
-EntryActorList
 EnvColor
-Erase
-ErrorMessage
-ErrorMessageWindow
-ErrorTextHalf
-ErrorWatcher
-Eruption
-Escape
-Escape1st
-Escape2nd
-EscapeEnd
-EscapeLand
-EscapeLeft
-EscapeRight
-EscapeRock
-EscapeRun
-EscapeRunStart
-EscapeRunStartLand
-EscapeRunStartLoop
-EscapeSight
-EscapeStart
-EscapeStart1st
-EscapeStart2nd
-EscapeTurn
-EscapeTurnEnd
-EscapeTurnStart
-Esper
-EstablishDamage
-EuDutch
-EuEnglish
-EuFrench
-EuGerman
-EuItalian
-EuSpanish
-Event
-EventCoin100CometStarter
-EventCometStarter
-EventHunter
-EventKinopioExplorerOrganize
-EventKinopioExplorerRescued
 EventNo
-EventRace
-EventScore
 EventType
-EventWait
-Excite
-Excite0
-Excite1
-Excite2
-Executor
-ExistGreen
-Exit
-Explode
-Explosion
-Explosion1
-Explosion2
-ExplosionEye1
-ExplosionEye2
-ExplosionGold
-ExplosionL
-ExplosionM
-ExplosionRed
-ExplosionS
-Extend
-Extends
-ExtendsKeep
-ExtendsSign
-Exterminate
-ExterminationGeneralChecker
-Extinguish
-Extinguish01
-Extinguish02
-ExtinguishSide
-ExtinguishSideLight
-ExtinguishSmoke
-ExtraWallCheckArea
-ExtraWallCheckCylinder
-EyeBall
-EyeClose
-EyeDamage
-EyeLid_v
-EyeLight
-EyeOpen
-FEN1
-FF
-FLW2
-FOR_2D_MODEL
-FSign
-FWait
-Face
-Face0
 FaceCtrl
-FaceJointCtrl
-FacePosition
-FaceToBack
-FaceWait
-Fade
-FadeIn
-FadeOut
-Fadein
-Failure
-FailureHit
-Fall
-FallAttack
-FallBreak
-FallDamage
-FallDash
-FallDashStart
-FallDown
-FallDownEnd
-FallDownLand
-FallDownLoop
-FallLand
-FallLv
-FallRecover
-FallRecovery
-FallSand
-FallStart
-FallType
-FallWave
-FallWind
-Falling
-FallingRock
-FallingSmallRock
-Falls
-FallsCube
-FanWind
 FarClip
-FarClipDistance
 FarLimitRate
-FarMax
-FatRed
 FileCacheSize
-FileInfo
-FileName
-FileNumber
-FilePoint
-FileSelect
-FileSelectButton
-FileSelectItem
-FileUnUsedPoint
-FinalBattle
-FinalBreak
-FinalFall
-FinalFloat
-FinalPower
-FinalWait
-Find
-FindingLuigi
-FingerL
-FingerLA1
-FingerLA2
-FingerLB1
-FingerLB2
-FingerLC1
-FingerLC2
-FingerLD1
-FingerLD2
-FingerR
-FingerRA1
-FingerRA2
-FingerRB1
-FingerRB2
-FingerRC1
-FingerRC2
-FingerRD1
-FingerRD2
-FinishDemo
-Fire
-Fire00
-Fire01
-Fire02
-FireAttack
-FireBall
-FireBallBreak
-FireBallSpread
-FireBallSpreadBreak
-FireBallSpreadLava
-FireBallThrow
-FireBarBall
-FireBarCore
-FireBubble
-FireBullet
-FireChase
-FireColor
-FireDamage
-FireDamageSmoke
-FireDance
-FireDown
-FireEnd
-FireInd
-FireLoop
-FireLoopStart
-FireMarioSpinLight
-FirePoint0
-FirePoint1
-FirePoint2
-FirePoint3
-FirePoint4
-FirePoint5
-FirePoint6
-FireRingBall
-FireRun
-FireRunStart
-FireShot
-FireShotEnd
-FireShotStart
-FireSign
-FireSpin
-FireStart
-FireWoodBoxPlay
-Firedown
-First
-FirstPerson
-FirstWait
-FirstWaitTurn
-FixedBad
-FixedGood
-FlagName
-FlagPoint
 FlagType
-Flash
-Flat
-FlatDown
-FlatDownReverse
-Float
-FloatEnd
-FloatIgnition
-FloatUp
 Floor_code
-FlowerAll
-FlowerCircle
-FlowerMat_v
-FlowerMimicUnder
-FlowerSphereLoop
-FlowerSpin
-FluffFly
-FluffFlyLast
-FluffFlyWind
-FluffLeaf
-FluffSpin
-FluffStart
-Flustered
-Flutter
-FlyDemo
-FlyEnd
-FlyFall
-FlyHighSpeed
-FlyHighSpeedVoice
-FlyLectureA
-FlyLectureB
-FlyLectureWait
-FlyLowSpeed
-FlyMeter
-FlyRide
-FlyRollEndRight
-FlyRollRight
-FlyRollSignRight
-FlyRollWaitRight
-FlyRustle
-FlyStart
-FlyTrg
-FlyTurn
-FlyTurnSign
-FlyWait
-FlyWaitNoInterpole
-FlyWaitNormal
-FlyWind
-FocusItem
 Follow
 FollowId
-FollowMe
-FollowPlayer
-FollowPoint
 FollowScale
-FollowStart
-Follower1
-Follower2
-Follower3
-Follower4
-Font
-FontPosition1to2
-FontPosition2to1
-FooEnd
-FooFly
-FooFlyStart
-FooMarioBrakeLampL
-FooMarioBrakeLampR
-FooMarioEndL
-FooMarioEndR
-FooMarioHandGlowL
-FooMarioHandGlowR
-FooMat
-FooSpin
-FooStart
-FooWait
-Foot05
-Foot06
-Foot08
-Foot10
-Foot12
-Foot14
-FootL
-FootL1
-FootL2
 FootNumMax
-FootPrintCtrl
-FootR
-FootR1
-FootR2
-Forbid
-ForceDeath
 ForceLowScenarioName0
 ForceLowScenarioName1
 ForceLowScenarioName2
@@ -1674,509 +285,24 @@ ForceLowScenarioName4
 ForceLowScenarioName5
 ForceLowScenarioName6
 ForceLowScenarioName7
-ForeArmL
-ForeArmR
-Forward
-ForwardSmoke
-FountainBig
-FountainBigSign
-Fourth
-Frame
-FrameIn
-FrameOut
-Freeze
-FreezeWait
 Friction
-Froat
-From
-FromBox
-Front
-FrontHandL3
-FrontHandR3
-FrontL
-FrontR
 FrontSize
-FruitPos
-GCapture
-GCaptureBreak
-GCaptureCancel
-GCaptureFall
-GCaptureHold
-GCaptureTarget
-GCaptureTraction
-GMario1
-GMario2
-GMario3
-GMario4
-GMario5
-GMario6
-Galaxy
-Galaxy1
-Galaxy1a
-Galaxy1b
-Galaxy1c
-Galaxy1d
-Galaxy1e
-Galaxy2
-Galaxy2a
-Galaxy2b
-Galaxy2c
-Galaxy2d
-Galaxy2e
-Galaxy3
-Galaxy3a
-Galaxy3b
-Galaxy3c
-Galaxy3d
-Galaxy3e
-Galaxy4
-Galaxy4a
-Galaxy4b
-Galaxy4c
-Galaxy4d
-Galaxy4e
-Galaxy5
-Galaxy5a
-Galaxy5b
-Galaxy5c
-Galaxy5d
-Galaxy5e
-Galaxy6
-Galaxy6a
-Galaxy6b
-Galaxy6c
-Galaxy6d
-Galaxy7
-Galaxy7a
-Galaxy7b
-Galaxy7c
-Galaxy7d
-Galaxy7e
-Galaxy7f
-Galaxy7g
-Galaxy8a
-Galaxy9a
-Galaxy9b
-Galaxy9c
-GalaxyAa
-GalaxyCometState
-GalaxyDetail
-GalaxyIcon
-GalaxyInfo
-GalaxyInfoTexture
-GalaxyMap
-GalaxyMapController
-GalaxyMapEnter
-GalaxyMapExit
 GalaxyName
-GalaxyNamePlate
-GalaxyNamePlateNew
-GalaxyNamePlateU
-GalaxyNameU
-GalaxySelect
-Game
-GameOver
-GameScene
-GameScreen
-GameSet
-GameSystem
-GatekeeperWait
-Gear
-GearL
-GearL1
-GearL10
-GearL11
-GearL12
-GearL13
-GearL14
-GearL2
-GearL3
-GearL4
-GearL5
-GearL6
-GearL7
-GearL8
-GearL9
-GearR
-GearR1
-GearR10
-GearR11
-GearR12
-GearR13
-GearR14
-GearR2
-GearR3
-GearR4
-GearR5
-GearR6
-GearR7
-GearR8
-GearR9
-General
-GeneralPos
-GeneralRestartPos
-Generate
-GenerateGroundRock
-GenerateGroundRockEnd
-GenerateGroundRockSign
-GenerateGroundRockStart
-GenerateItem
-GenerateRock
-GenerateRockStart
-GenerateRockToWait
 GeneratorID
-GetAble
-GetAgain
-GetEnemy
-GetEnemySuccess
-GetEnemyWait
-GetFilled
-GetGrandStar
-GetInvalid
-GetLight
-GetStar
-GetUp
-Getaway
-Getup
-Ghost
-Ghost2DWater
-GhostData
-GhostLuigi
-GhostMario
-GhostMazeMask
-GhostStarWait
-GhostStarWaitAir
-GhostStarWaitStart
-GhostStartWait
-GhostThroughCode
-Gift
-GiveUpTalk
-Glad
-GlandDamage
-GlareGlow
-GlareLine
-Glass
-GlassIce
-GlideDown
-GlideDownFast
-GlideStartUpLoop
-GlideStartUpVoice
-GlideUp
-GlideWait
-Glow
-GlowBee
-GlowFire
-GlowFoo
-GlowHopper
-GlowIce
-GlowTeresa
-GoMarioPlanet
-GoNext
-GoNext2
-GoOut
-GoThrough
-Goal
-GoalBestTime
-GoalIn
-GoroRockBreakFance
-GoroRockCoverCageFrame
-GorogoroSand
-GrabTarget
-GrandGalaxyMapNewsGrandGalaxyExplain
-GrandGalaxyNo
-GrandStar
-GrandStarAppear
-GrandStarBronze
-GrandStarEmpty
-GrandStarGet
-GrandStarGetKoopaVs3
 GrandStarNo
 Gravity
-GravityBgmCtrl
-GravityChange
-GravityFollowLift
-GravityFollowLiftB
-GravityFollowLiftBig
-GravityFollowLiftLongPanel
-GravityFollowPanel
-GravityLightA
-GravityLightRoad
-Gravity_id
 Gravity_type
-Gray
-GrayDummy
-GrayToWhite
-Green
-GreenComet
-GreenCometAppear
-GreenStarDemo
-GreenToBlue
-GreenToRed
-GreenToYellow
-Grip
-Ground
-GroundApproach
-GroundBoss
-GroundDamage
-GroundHit
-GroundRide
-GroundRun
-GroundSpark
-GroundTurnLeft
-GroundTurnRight
-GroundWait
-GroundWalk
-GroupClipping
 GroupId
 GroupName
-GroupRing
-Grow
-GrowPlantCatch
-GrowPlantHangDown
-GrowPlantHangUp
-GrowPlantJump
-GrowUp
-Guard
-GuardAppearNumLv
-GuardBody
-GuardFace
-GuardOffsetLv
-GuardPosLv
-GuardReturn
-GuardWaitLv
-Guidance
-HBMCalcRSO
-HBMCreateRSO
-HBMDrawRSO
-HBMGetSelectBtnNumRSO
-HBMInitRSO
-HBMSetAdjustFlagRSO
-HBMStartBlackOutRSO
-HD中ラッシュ
-HOMEボタン
-HPMeter
-HalfTurn
-Hand1
-HandArrow
-HandBlur1
-HandBlur2
-HandBlur3
-HandL
-HandL0
-HandPointer
-HandR
-HandR0
-HandType
-HandyGlow
-HandyRush
-HangSlipUp
-HangSlipUpStart
-HangStart
-HangStartUnder
-HangUp
-HangWait
-HardWind
-Haze
-Head
-Head1
-Head2
-Head3
-Head5
-HeadAttack
-HeadCol
-HeadCover
-HeadDeath
-HeadFire
-HeadLight
-HeadPos
-HeadReceive
-HeadShake
-HeadShoot
-HeadShootSign
-Heat
-Heavy
-HelperWitch
-HelperWitchBall
-HelperWitchEffect
-HiScoreCount
-Hidden
-Hide
-HideAppear
-HideAttack
-HideDrill
-HideFlyMeter
-HideWait
-HideWall
-High
-HintShake
-HintShakeLeaf
-HipDamage
-HipDrop
-HipDropAttackDown
-HipDropBlur
-HipDropBlurLuigi
-HipDropCrash
-HipDropDown
-HipDropDownReverse
-HipDropFlower
-HipDropHoming
-HipDropHomingLand
-HipDropHomingStart
-HipDropJump
-HipDropJumpStart
-HipDropLand
-HipDropMoveBlockHShape
-HipDropMoveBlockSwitch
-HipDropReaction
-HipDropRush
-HipDropSand
-HipDropSmoke
-HipDropSnow
-HipDropStar
-HipDropStarMove
-HipDropStart
-HipDropWait
-HipDropWater
-Hirgh1
-Hit2
-HitBack
-HitBackStart
-HitByRock
-HitEnd
-HitMark
-HitMarkNormal
-HitPoint
-HitPointMeter
-HitPointNumber
-HitPointW
-HitPunch
-HitReaction
 HitSensorNumMax
-HitSmoke
-HitWall
-Hold
-HoldFootNoteAddL
-HoldFootNoteAddR
-HomeButton2
-Homing
-Honey
-HoneyCircle
-HoneyCircleLoop
-HoneyQueen
-HoneyQueenWing
-HoneySphere
-HoneySphereLoop
-HookTargetDistMax
-HopEnd
-HopJump
-HopStart
-HopWait
-Hopper
-HopperJumpA
-HopperJumpB
-HopperLuigi
-HopperLuigiHipDropBlur
-HopperMario
-HopperMarioHipDrop
-HopperMarioHipDropBlur
-HopperMarioHipDropStart
-HopperRunA
-HopperRunB
-HopperWaitA
-HopperWaitB
-HopperWallJump
-Horror
-HorrorEnd
-HorrorStart
-Hovering
-HoveringWater
-IKJointCtrl
-INDIRECT
-IceBox
-IceEnd
-IceFlick
-IceJump
-IceJump2
-IceJump3
-IceJumpLand
-IceJumpStopLand
-IceLuigi
-IceManIce
-IceMario
-IceMarioHandL
-IceMarioHandR
-IceMarioSpinLight
-IceMeteorBall
-IceSkateSpin
-IceSpin
-IceSpinAir
-IceStart
-IceStep
-IceStepNoSlip
-IceSurface
-IceSwim
-IceSwimStart
-IceSwimTurn
-IceWallJump
-Icon
-IconAButton
-IconComet
-IconMario
 IconOffsetX
 IconOffsetY
-IconSave
-Ignite
-Ignition
-IgnorePauseNameObj
-Impact
-InGame
-InHelp
-InRotation
-InStage
-InTeresa
-IndDummy
-IndTest
-Index
-Indirect
 IndirectFlag
-IndirectScale
-InfConfirmC
-InfConfirmD
-InfConfirmU
-Inferno
-InfernoMario
-InfernoMarioGenerator
-InfoWindow
-InfoWindowCenter
-InfoWindowDown
-InfoWindowM
-InfoWindowUp
-InformationPlanet
-InformationWindow
 InitFunction
-InitStageEffectCamera
-InitStageEffectPad
-Inner
-InnerLight
-InnerSoundEmitting
-Intermission
-IntermissionScene
 Interpolate
-Into
 IntoBeat
-Invalid
-InvalidHitMark
-InvalidMove
 InvalidateClipping
 Inverse
-Invincible
-InvincibleLuigi
-InvincibleMario
-InvincibleMarioHandL
-InvincibleMarioHandR
-Invitation
-IqFadeIn
-Irregular
 IsBgmStop
 IsBreakCrystal
 IsColorChange
@@ -2185,657 +311,34 @@ IsFixRoot
 IsHidden
 IsPrepare
 IsRight
-IsStopSceneForHitEffect
 IsSubRoute
-Item
-ItemBlockSwitch
-ItemBubble
-ItemDrop
-ItemGenerator
-ItemGet
 ItemInfoName
-ItemRevival
-ItemRoomDoorClose
-ItemRoomDoorOpen
-ItemWait
-JawA
-JetStartV
-Jitabata
-Jitabata2
 Joint
-Joint00
-Joint01
-Joint02
-Joint03
-Joint04
-Joint05
-Joint06
-Joint07
-Joint08
-Joint09
-Joint10
-Joint11
-Joint12
 JointName
-JointName
-JointRoot
-Joy0
-Joy1
-Joy2
-JrCastleFireBallMoveNear
-JrRobotBeam
-JrRobotWeakPoint
-JrRobotWeakPointB
-JrRobotWeakPointL
-JrRobotWeakPointR
-JugemCloud
-Jump
-Jump2
-Jump2Land
-JumpAway
-JumpAwayLand
-JumpAwayStart
-JumpBack
-JumpBackLand
-JumpBroad
-JumpBroadLand
-JumpEnd
-JumpFast
-JumpFromPlant
-JumpFromYoshi
-JumpGuarder
-JumpGuarderHead
-JumpHDrop
-JumpHardly
-JumpHigh
-JumpHole
-JumpLV
-JumpLongV
-JumpLow
-JumpLv
-JumpM
-JumpMM
-JumpMV
-JumpMiddle
-JumpNormal
-JumpObj
-JumpParasol
-JumpPress2nd
-JumpPress3rd
-JumpRoll
-JumpRollLand
-JumpRush
-JumpS
-JumpSV
-JumpSign
-JumpSkate
-JumpSoon
-JumpSpider
-JumpSpin
-JumpSpinLectureMove
-JumpStand
-JumpStandAuto
-JumpStandJoint03
-JumpStart
-JumpStartFast
-JumpStartLoop
-JumpTurn
-JumpTurnLand
-JumpTwin
-KameckPosition
-KarikariCrystalBreak
-KarikariCrystalLight
-KarikariSmokeLand
-KeepMouthKiller
-Kick
-KickStoneLight
-KillerPointA
-KillerPointB
-KillerPointC
-KillerPointD
-KillerPointE
-KillerPointF
-KillerPointG
-KillerPointH
-KillerTargetMapObj
-Kind
-KitchenSmoke
-KnockOnTheDoor
-KoopaArmorBreak
-KoopaBattleVs
-KoopaFire
-KoopaJr
-KoopaJrShipBreak
-KoopaJrShipCannonMainShell
-KoopaJrShipCannonShell
-KoopaJrShipPod
-KoopaRock
-KoopaRockBreak
-KoopaRollBall
-KoopaShockWave
-KoopaShockWaveShadow
-KoopaThorn
-KoopaThornBreak
-LArm01
-LArm02
-LBL1
-LFoot001
-LKoopaJr
-LStaffRollTexture
-LTalkCry
-LTrickRabbit
-Land
-LandAttrWater
-LandEffect
-LandFast
-LandPressDown
-LandRotation
-LandRubber
-LandScenarioStart
-LandSkate
-LandSlope
-LandSmoke
-LandSmokePyudon
-LandStiffen
-LandWait
-LandWater
-LandWaterDive
-LandWave
-LargeChain
-LargeChainFixPoint
-LastAttack
-LastAttackEnd
-LastAttackMoveEndRoll
-LastAttackMoveLoop
-LastAttackSign
-LastBattle
-LastBattleStart
-LastChaseRoll
-LastDamage
-LastDamageLeft
-LastDamageRight
-LastDamageRoll
-LastDamageRollEnd
-LastDamageTop
-LastMoveEndLeft
-LastMoveEndLeftLoop
-LastMoveEndRight
-LastMoveEndRightLoop
-LastMoveStartLeft
-LastMoveStartRight
-Laugh
-Launch
-Launcher
-LavaAcrossFloater
-LavaAppear
-LavaBeforeRepeatBlockFloater
-LavaColumn
-LavaColumnAttrDamageFire
-LavaColumnAttrDefault
-LavaDown
-LavaFall
-LavaLeft
-LavaProminenceBloom
-LavaRight
-LavaVanish
-Lawn
-LayerA
-LayerB
-LayerC
-LayerD
-LayerE
-LayerF
-LayerG
-LayerH
-LayerI
-LayerJ
-LayerK
-LayerL
-LayerM
-LayerN
 LayerNo
-LayerO
-LayerP
-LayoutActor
-LayoutData
-Lead
-LeafCenter
-Leak
-LeakSign
-Leave
-LeaveAppearanceInnerLight
-LeaveAppearanceSmoke
-LectureAnswer
-LectureUnbalance
-Left
-LeftButton
-LeftFinJoint
-LeftFootA3
-LeftFootB3
-LeftFootC3
-LeftLeg
-LeftName
-LeftRotate
-LeftText
-LegL
-LegL1
-LegL2
-LegL3
-LegR
-LegR1
-LegR2
-LegR3
-LegSmoke
-LensFlare
-LensFlareArea
-LetterAppear
-LetterButton
-LevelNum
-LibraryOpenNewStarCount
-LibraryOpenRequirement
-LibraryRoom
-LieDown
-Life
-LifeAlertTrg
-LifeUp
-LiftFlowerFrame
-Light
 LightAffectValue
-LightArea
-LightBreak
-LightConeLeft
-LightConeRight
-LightDome
-LightGrow
 LightID
-LightSplash
-Line
-Line10
-Line20
-LineD
-LineEnd
-LineEndRadius
-LineL
-LineR
-LineStart
-LineStartRadius
-LineU
-List1
-List2
-ListButton
-ListButtonPos
-LocalRotate
-Locator1
-LockOn
-LocusFire
-LocusSmoke
-Logo
-LogoScene
-LookAround
-LookUp
-Loop
-LoopActionName
 LoopBeat
 LoopEndSample
 LoopStartSample
-Lose
-Loss
-LoveChase
-LoveEnd
-LoveFind
-LoveHit
 LowFlag
-LowerJaw
-LuigiEvent
-LuigiEventState
-LuigiFace
-LuigiHair
-LuigiHairAnim
-LuigiIn
-LuigiJump
-LuigiJumpBack
-LuigiJumpRoll
 LuigiModeTimer
-LuigiOut
-LuigiResultWaitStart
-LuigiRun
-LuigiRunEnd
-LuigiShadow
-LuigiSpaceFlyShort
-LuigiSpin
-LuigiSpinGround
-LuigiTalkAfterRescued
-LuigiTalkNpc
-LuigiTornado
-LuigiWait
-LuigiWaitSlopeD
-LuigiWaitSlopeL
-LuigiWaitSlopeR
-LuigiWaitSlopeU
-LuigitoMario
-MagmaAttack
-MagmaMeteorBall
-MagmaMonsterRotateSeasaw
-MagmaSliceRotateStep
-MagmaWait
-Magnet
 MainPartName
 MainPartStep
-MapButton
-MapDomeIcon
-MapDummy
-MapGalaxyArrow
-MapGalaxyBg
-MapGalaxyIcon
-MapGalaxyReport
-MapGalaxyState
-MapGalaxyWorld
-MapGalaxyZoomButton
-MapGrandGalaxy
-MapList
-MapObj
-MapObjActorAppear
-MapObjActorBreak
-MapObjDecoration
-MapObjIndirect
-MapObjIndirectStrongLight
-MapObjMovement
-MapObjNoCalcAnim
-MapObjNoMovement
-MapObjNoMovementNoCalcAnimIndirectStrongLight
-MapObjNoShadow
-MapObjNoSilhouetted
-MapObjPress
-MapObjSimple
-MapObjStrongLight
-MapPaneName
-MapParts
-MapPartsData
-MapPartsFloaterMoveDown
-MapPartsFloaterMoveUp
-MapPartsFloaterMoveUpEnd
-MapPartsFloaterRidden
-MapPartsInfo
-MapPartsRotateLoop
-MapPartsSeesaw1AxisRotatorBound
-MapPartsSeesaw1AxisRotatorMove
-MapPartsSeesaw2AxisRollerRotatorMove
 MapParts_ID
-MapTicoIcon
-MapTitle
-Marble
-Marble_Beach
-Marble_Sand
-Marble_Snow
-Marble_Soil
-MarineSnow
-Mario
-Mario1
-Mario2
-Mario3
-Mario4
-Mario5
-Mario6
-Mario7
-MarioAnime
-MarioBlowDown
-MarioCap
-MarioCloudLand
-MarioDemo
-MarioDisappear
-MarioDummyItem
-MarioFace
-MarioFaceShip
-MarioFileSelect
-MarioFireBall
-MarioFreezeIce
-MarioHair
-MarioHairAnim
-MarioHandL
-MarioHandR
-MarioHang
-MarioIcon
-MarioIn
-MarioKoopaStage
 MarioNo
-MarioOut
-MarioPassLv
-MarioPassLvSlider
-MarioPos
-MarioPosition
-MarioPosition01
-MarioPosition10
-MarioPunchLBlur
-MarioPunchRBlur
-MarioShadow
-MarioShipBesideThis
-MarioShipTakeOff
-MarioSpaceDust
-MarioTornado
-MarioTornadoEnd
-MarioTornadoLoop
-MarioTornadoStart
-MarioWait
-MariottoLuigi
-Max20
-Max30
-Medal
-Melt
-MeltBody
-MeltHead
-Memory
-MenboFreezeIce
-MenboRippleBackL
-MenboRippleBackR
-MenboRippleFrontL
-MenboRippleFrontR
-Merge
-Message
-MessageAlreadyRead
 MessageId
-Metal
-MetalHeavy
-Metal_Soil
-MetamorphoseScreenEffect
-MetamorphoseScreenEffectLight
-Metamorphosis
-MetamorphosisEnd
-MeteoMagic
-Meteor
-Middle
 MiddleFlag
-MiiButton
-MiiConfirmIcon
-MiiIcon
-MiiName
-MiiSelect
-Mimic
-Mini
-MiniBreak
-MiniPandaSpinLoopLeg
-MiniTouch
-MiniWait
 MiniatureName
-MirrorTex
-MisFire
-MissCounter
-MissNum
-MissPointForLetter
-Model
 ModelName
-ModelWipeScene
-Module
-ModuleData
-MokuMoku
-Morph
-Morph2
-MorphConditionTable
-MorphEnd
-MorphTimeAttack
-Mouth
-Mouth1
-MouthBubble
-MouthPreShoot
-MouthUp
-Move
-MoveA
-MoveAway
-MoveB
-MoveBack
-MoveBlur
-MoveBoss
-MoveClick
 MoveConditionType
-MoveDown
-MoveEnd
-MoveEndBack
-MoveEndFront
-MoveEndLeft
-MoveEndRight
-MoveEnding
-MoveFast
-MoveFront
-MoveInGMap
-MoveL
-MoveLR
-MoveLeft
-MoveLimit
-MoveLoop
-MoveLv
-MoveMeter
-MoveMeterW
-MoveMidHigh
-MoveMiddle
-MoveNear
-MoveR
-MoveRight
-MoveRotate
-MoveSign
-MoveSignLeft
-MoveSignRight
-MoveSlow
-MoveStart
-MoveStartReverse
-MoveStop
-MoveToGoal
-MoveUp
-MoveWind
-Movement
-MovieData
-Moving
-MsgFlwBn
-MsgStdBn
-MudCircle
-MudCircleLoop
-MudMove
-MudSphere
-MudSphereLoop
-MuimuiHole
-MuimuiPlay
 MultiBgmName
-MultiFileName
-NANDError
-NAND_02
-NAND_03
-NAND_05
-NAND_06
-NAND_07
-NAND_08
-NAND_11
-NAND_11_2
-NAND_12
-NBackDown
-NBackUp
-NGLevel
-NGTrig
-NPointerGuide
-NULL
-NWC24Messenger
 Name
 NamePlatePosX
 NamePlatePosY
 NamePlatePosZ
-NameSingle
 NearLimitRate
-NearPlayer
-NearWater
-Neck
-Need
-NeedRead
-NeedWrite
-NeedWriteAuto
-Needle
-Needle1
-NeedlePlant
-NeedlePlantHill
-NewBlink
-NewComet
-NewGreenComet1
-NewGreenComet2
-NewGreenComet3
-NewOpen
-NewOpenSign
-NewStar
-NewStar1
-NewStar2
-NewStarGreen
-NewWait
-News
-Next
-NextAppear
-NextEnd
-NextMii
-NextPage
-NextPageOver
 No
-NoAction
-NoCap
-NoDig
-NoHit
-NoIter
-NoMessageArea
-NoModel
-NoMove
-NoPowerEnd
-NoPowerLand
-NoPowerStart
-NoPowerWait
-NoShadow
-NoSlip
-NoSound
-NoStampSand
-NoThrough
-Noctiluca
-NoctilucaFast
-Nomal
-NonActive
-NonSleep
-NonSleepCube
-Normal
-NormalEnding
-NormalEnemyAttack
-NormalMapTestObj
-Nose
-NotGrab
-NotSideStep
-NotWallJump
-NotWallSlip
-Note
-NoteFairy
-Notice
-NpcBodyAttack
-NpcBodyReceive
-NpcBodyReceive2
-NpcNoCalcAnim
-NpcNoShadow
-Nswap_
-Number
-NumberMax
-NyoroponBody
-NyoroponHead
-OKAppear
-OKEnd
-ObjInfo
 ObjName
 Obj_ID
 Obj_arg0
@@ -2846,87 +349,16 @@ Obj_arg4
 Obj_arg5
 Obj_arg6
 Obj_arg7
-ObjectData
-ObjectInfluenceTable
-OffFire
-OffNormal
-OffWait
-Offset
 OffsetX
 OffsetY
 OffsetY0
 OffsetY1
 OffsetZ
-OnAndOff
-OnBee
-OnFire
-OnGalaxy
-OnGroundSpark
-OnMario
-OnNormal
-OnWait
-OneLine
-OneUp
-OneUpGet
-OnlyCamera
-Open
-OpenDamage
-OpenEnd
-OpenEye
-OpenGalaxy
-OpenL
-OpenM
-OpenS
-OpenStart
-OpenWait
-Opening
-OpeningAppear
-OpeningDemo
-OpeningWalk
 OrScenarioNo
 OrStageName
-OutEnd
-OutLoop
-OutStart
-Outer
-Outside
-Overturn
-OverturnBound
-OverturnLand
-OverturnPress
-OverturnWait
-P2Button
-P2Manual
-P2ManualButton
-PAL60
-PAUSE_IGNORE
-PPolta
-PPosition1
-PPosition2
-PPosition3
-PPosition4
-P_PlanetMap
-PadAndCameraCtrl
-PadMoveType
-PadRumbleDistance
 PadRumbleName
 PadRumbleNameFar
 PadRumbleNameMiddle
-PadStartType
-PadStopType
-PageChange
-PageChangeInvalid
-PageIn
-PageNext
-PageNumber
-PageOut
-Panel
-PanelA
-PanelB
-PanelEnd
-Panic
-PanicStart
-Param
 Param00
 Param00F32
 Param00Int
@@ -2938,615 +370,53 @@ Param01
 Param01F32
 Param02
 Param03
-ParamEscapeFromPlayer
-ParamJump
-ParamMove
 ParamName
-ParamRebound
 ParamScale
-ParamSight
 ParamType
-ParamWalkToPlayer
+ParentID
 ParentId
 ParentName
 PartName
-ParticleData
-PartsControl
 PartsIndex
-PartsTypeName			
 PartsTypeName
-Pass
-PassFinal
 Path_ID
-PattanBreak
-PauseBlur
-PauseMenu
-PgDamage
-PgDamageBelowNAbove
-PgDamageLeftNRight
-PgDamageToPowerUp
-PgDamageVo
-PgDown
-PgFall
-PgLastDamage
-PgLastDown
-PhantomTorchRotate
-PhaseBattle
-PhaseOpening
-PhaseSequence
-Photo
-PicArrow
-PicArrowR
-PicBG
-PicBase
-PicBeak
-PicBeakU
-PicBelt1
-PicBelt2
-PicBelt3
-PicBelt4
-PicCopy
-PicDelete
-PicDummy
-PicFrameShine
-PicLButton
-PicLD
-PicLU
-PicLeftPage
-PicMario
-PicMii
-PicMiiDummy
-PicMiiShine
-PicNStarPiece
-PicNStarPieceR
-PicNozzle
-PicPlate
-PicPlayer1
-PicPlayer2
-PicRButton
-PicRD
-PicRU
-PicRibbon
-PicRightPage
-PicStagebase
-PicStagebase1
-PicStarA
-PicStarB
-PicStarC
-PicStarD
-PicStarE
-PicStarF
-PicStarG
-PicTStarPiece
-PicTStarPieceR
-PicToneDown
-PicTurnLeftPage
-PicTurnRightPage
-Pichan1
-Pichan2
-PichanRace
-PickUpBall
-Pickel
-Picket
-Picture
-PictureBook
-PictureBookA
-PictureBookB
-PictureBookC
-PictureBookD
-PictureBookE
-PictureBookF
-PictureBookG
-PictureBookH
-PictureBookI
-PictureBookTexture
-PictureLD
-PictureLU
-PictureRD
-PictureRU
-Piece
-Pink
-PipeMode
-PitchChangeArg0
 PitchChangeArg1
 PitchChangeArg2
 PitchChangeArg3
 PitchChangeArg4
 PitchChangeType
-Placement
-Plane
-PlaneCircularMode
-PlaneCollision
-PlaneMat_v
-PlaneMode
-PlaneModeCube
-Planet
-PlanetA
-PlanetIndirect
 PlanetName
-PlanetObjInfo
-Plant
-PlantGroup
-PlantLeaf
-PlantMember
-PlantSeed
-PlantSlider
-PlantSliderJump
-PlantSliderLeaf
-PlantSliderStart
-PlantTop
-PlaySound
-PlayTimerScene
-Player
-PlayerBlow
-PlayerDecoration
-PlayerFlyStart
-PlayerLeft
-PlayerOnSand
-PlayerTakeOff
-PmDemoReturnLight
-PmLvTornadeFlying
-PmMarioLauncherLaunch
-PmMarioLauncherPrep
-PmSpinDivInWater2
-PmSpinDrvInWater1
-PmSpinHit
-Point
-PointEvent
 PointIndex
 PointIndexA
 PointIndexB
-PointLink
-PointMove
-PointOff
-PointOn
-PointParts
-PointPos
 PointPosIndex
 PointPosX
 PointPosY
 PointPosZ
-PointWarp
-PointerFrame1
-PointerFrame2
-PointerGuidance
-PointerTouch
-PointerTouchManual
-Pointing
-Pole
-Pole3
-Pole9m
-PoleBottom
-PoleNoModel
-PoleSquare
-PoleTop
-PoleTopStopMat_v
-PoleTree
-PoleTreeA
-PoleTreeB
-PopSign
+PosName
 PosName
 PosOffsetX
 PosOffsetY
 PosOffsetZ
-PosShellCenter
-PosShellHip
-PosShellLeft
-PosShellRight
-Position
-Position0001
-Position001
-Position0010
-Position010
-Position0100
-Position1
-Position100
-Position1000
-Position2
-Position3
-Position4
-Position5
-Position6
-Position7
-PositionList
-PostLetter
-Pote
-PoteSmoke
 Power
-PowerStar
-PowerStarAppear
-PowerStarC
-PowerStarColor
-PowerStarComplete
-PowerStarGet
 PowerStarId
 PowerStarNum
 PowerStarType
-PowerUp
-PowerUp1
-PowerUp2
-PowerUpDemo
-PowerUpDemoArmL
-PowerUpDemoArmR
-PreAttack
-PreDemoWait
-PreDownEnd
-PreEscape
-PreFire
-PreLandTurn
-PreRecover
-PreShoot
-Press
-PressA
-PressAB
-PressAndNoSlip
-PressB
-PressDown
-PressDownClose
-PressDownOpen
-PressRecover
-PressStart
 PressType
-PressY
-Pressed
-Previous
-PreviousAppear
-PreviousEnd
-PreviousMii
-PreviousPage
-PreviousPageOver
-PriorBinder
 Priority
-PrizeRing
 PrmColor
-Progress
-ProgressTico
-Prologue
-Prologue01
-Prologue02
-PrologueA
-PrologueB
-PrologueDemo
-PrologueStarSteward
-PrologueText
-ProminenceSetA
-Propeller
-Propeller00
-Propeller1
-Propeller2
-Propeller3
-Propeller4
-PropellerCap
-Provoke
-PukupukuFreezeIce
-Pull
-PullBack
-PullBackLand
-PullBreak
-PullEnd
-PullMoving
-PullOut
-PullOutWait
-PullStart
-PullStop
-PullSuccess
-PullTarget
-PullTargetDistMax
-PullTargetPos
-PullToMouth
-PulledOut
-PulledOutInstant
-Punch
-PunchBox
-PunchDamage
-PunchDown
-PunchHit
-PunchLeft
-PunchLeftStart
-PunchLeftToWait
-PunchRight
-PunchRightStart
-PunchRightToWait
-Punched
-PunchedTailLeft
-PunchedTailRight
-PunchedTailTop
-Purple
-PurpleCoinCounter
-PurpleCoinCounterLight
-Pursue
-Push
-PushAButton
-PushCollision
-PushOff
-PushWind
-Quake
-QuakeShockWave
-QuakeSign
-QuestionCoinJump
-QuestionCoinJumpStart
-Quick
-RArm01
-RArm02
-REF1
-RFL_01
-RFL_02
-RFoot001
-RTime
-Rabbit
-Race
-RaceBlurBlue
-RaceBlurGreen
-RaceBlurLeader
-RaceBlurPurple
-RaceBlurRed
-RaceCountDown
-RaceFlap
-RaceFly
-RaceGoal
-RaceJudge
-RaceStart
-RaceStartCrouch
-RaceStartGhost
-RaceTime
-RacerLandSwim
-RacerLandSwimSlow
-RacerSwim
-RacerSwimDamage
-RacerSwimSlow
-RacerSwimSurfaceSoon
-RacerSwimWaitSoon
-RacerSwimWaitSurface
-RacerTalk
-RacerWait
-RacerWaitSoon
-RacerWalkSoon
 Radius
-Rail
-RailBlockBig
-RailDown
-RailIDLv
-RailMove
-RailMoveSign
-RailMoveWaterAreaSplash
-RailMoverMoveLoop
-RailMoverMoveStart
-RailMoverRestartAtEnd
-RailMoverSignLoop
-RailMoverSignStart
-RailMoverStop
-RailMoverStopAtEnd
-RailMoverStopAtEndAfter
-RailMoverStopAtEndLoop
-RailMoverStopAtEndWithPlayerOn
-RailMoverStopAtPoint
-RailMoverStopAtPointAfter
-RailMoverStopAtPointLoop
-RailMoverWaitStart
-RailMoverWaitStartMove
-RailMoverWaiting
-RailObj
-RailPoint
-RailRevival
-RailRevivalStart
-RailRotatorRotateLoop
-RailRotatorRotateStart
-Rain
-RainSlow
-RaiseOK
 Range
-Rank
 RateValue
-Ratio
-Rattle
-ReBirth
-React
-Reaction
-ReactionA
-ReactionB
-ReactionName
-RearHandL3
-RearHandR3
-RearL
-RearR
-RebindTimer
-Rebound
-ReceiverTail
-ReceiverTailTop
-Record
-Recover
-RecoverAngry
-RecoverFlyMeter
-RecoverLand
-Recovery
-RecoveryAir
-RecoveryBubbleBreak
-RecoveryCount
-RecoveryFloorControlArea
-RecoveryLoop
-RedBlueTurnBlockBase
-RedToBlack
-RedToBlue
-RedToBlueShort
-RedToGreen
-RedToGreenShort
-Reflect
-ReflectSensorBase
-Region
-Release
-Repair
-RepairArmL
-RepairArmR
-RepairWait
-RepeatBlockLavaBoxPlanetProminence
-Repel
-Replace
-Request
-ResetPlayer
-ResetPlayerEnd
-ResetPlayerStart
-ResetWallGravity
 ResourceName
-Rest
-Restart
-Restore
-Result
-ResultCoinCounter
-ResultFly
-ResultFlyEnd
-ResultFlyGrandStar
-ResultFlyGrandStarEnd
-ResultFlyGrandStarFlyAway
-ResultFlyGrandStarRush
-ResultMap
-ResultMapBG
-ResultMapEnd
-ResultMapStart
-ResultPieceCounter
-ResultStarCounter
-ResultWait
-ResultWaitGrandStar
-ResultWaitStart
-ResultWindow
-RetryButton
-Return
 ReturnBgm
-ReturnMarioPlanet
-ReturnMoving
-ReturnStop
 ReturnType
-Reverse
-ReverseSign
-Revival
-RevivalBack
-RevivalFront
-RevivalStart
-Revive
-RibbonBreak
-RibbonPoint
-Riddle
-RiddleSE
-Ride
-RideOff
-RideOn
-RideOnClosed
-RideOnTrg
-RideSilhouette
-Right
-RightButton
-RightFinJoint
-RightFootA3
-RightFootB3
-RightFootC3
-RightLeg
-RightName
-RightRotate
-RightText
-Rightened
-Ring
-RingBeam
-Ripple
-Rise
-RiseBubble
-RisePictureBookPrismA
-RisePictureBookPrismATop
-RisePictureBookPrismB
-RisePictureBookPrismBTop
-RisePictureBookPrismC
-RisePictureBookPrismCTop
-RisePictureBookPrismD
-RisePictureBookPrismDTop
-RisePictureBookWallParts
-RiseSign
-RiseUpStart
-RisingUp
-RoadExtend
-RoboAppearDemo
-Rock
-RockAccel
-RockBreak
-RockBreakFixPos
-RockDashStart
-RockFixPos
-RockRollStart
-Roll
-RollBallFixPos
-RollEnd
-RollGnd
-RollGravityAReverse
-RollGravityB
-RollGravityBReverse
-RollInWater
-RollOutWater
-RollStart
-Rolling
-RollingAttack
-RollingEnd
-RollingLoop
-RollingRockEnd
-RollingRockHitEnd
-RollingRockStart
-RollingSmoke
-RollingSmokeAttrSand
-RollingSmokeAttrWater
-RollingStart
-RollingStartAccell
-Root
-Rosetta1
-Rosetta2
-Rosetta3
-Rosetta4
-Rosetta5
-RosettaFinalBattle
-RosettaTalkAboutTico
-RosettaTalkAfterNormalEnding
-Rotate
 RotateAccelType
 RotateAngle
 RotateAxis
-RotateLeft
-RotateMoveObjMove
-RotateMoveObjStart
-RotateMoveObjStop
-RotateNoGlavity
-RotateNutStep
-RotateRight
-RotateSign
-RotateSignWood
 RotateSpeed
 RotateStopTime
-RotateTorpedo
 RotateType
-RotateWood
-Rotation
-RotatorRotateLoop
-RotatorRotateSignLoop
-RotatorRotateSignStart
-RotatorRotateStart
-RotatorStopAtEnd
-RotatorStopAtEndLoop
-RouteCreateTico
-RouteOpen
-Rumble
-RunAwayDemo
-RunAwayJump
-RunAwayLand
-RunDash
-RunDashSplash
-RunDust
-RunEnd
-RunFukashi
-RunMouthFull
-RunSlope
-RunSmoke
-RunStart
-RunTired
-Rush
-RushInfluenceTable
-RushSmoke
-RushStart
-RushStop
-SButton
 SW_A
 SW_APPEAR
 SW_AWAKE
@@ -3554,1559 +424,124 @@ SW_B
 SW_DEAD
 SW_PARAM
 SW_SLEEP
-Sand
-SandCircle
-SandColumn
-SandColumnS
-SandFall
-SandSliderSmoke
-SandSphereLoop
-SandSpin
-SandStreamSmoke
-Sandstorm
-SaveAfterStaffRoll
-SaveDataHandler
-SaveDataStorageTicoFat
-SaveDataStorageWorldMap
-SaveIcon
-SaveIconPosition
-Scale
-ScaleDownRelayPlanet
 ScaleMax
 ScaleMin
 ScaleValue
-Scenario
-ScenarioAppear
-ScenarioFrame
-ScenarioHide
 ScenarioName
 ScenarioNo
-ScenarioSelect
-ScenarioSelectEffect
-ScenarioSelectSky
-ScenarioSelect_HighScore
-ScenarioSelect_RaceTime
-ScenarioStar
-ScenarioTitle
-SceneDataInitializer
-SceneExitArea
-SceneNameObjMovementController
 SceneNo
-ScoreAttack
-ScoreAttackContinue
-ScoreAttackCounter
-ScoreAttackPlay
-ScoreCount
-ScoreCounter
-ScoreNumber
-ScoreSuccess
-ScoreTime
-ScoreUpNormal
-Scream
-ScreenDummy
-ScreenEffect
-ScreenEffectFog
-ScreenEffectLight
-Screw
-Screw00
-Screw01
-ScrewCol
-ScrewReceive
-ScrewReceiveCol
-ScrewReverseCol
-SeaSmoke
-SealFixPosMulti0
-SealFixPosMulti1
-SealFixPosMulti2
-SealFixPosMulti3
-SealFixPosMulti4
-SealFixPosSingle
-Search
-SearchBeamer
-SearchLight
-SearchLightCone
-SearchOn
-SearchRotate
-SearchSmoke
-SearchWait
-Second
-Select
-SelectButton
-SelectIn
-SelectNext
-SelectNo
-SelectOK
-SelectOut
-SelectYes
-Selecting
-SelectingActionName
-SendOffOnce
-SensorHeight
-SensorMin
 SensorName
 SensorType
-Sequence
-ShaBCounter
-ShaBeak
-ShaBeakU
-ShaCoin
-ShaCoinNum
-ShaLuigi
-ShaMario
-ShaMarioNum
-ShaMedal
-ShaMii
-ShaMiiDummy
-ShaPiece
-ShaPieceDNum
-ShaPieceNum
-ShaPieceUNum
-ShaRCounter
-ShaStageTitle
-ShaStar
-ShaStarA
-ShaStarB
-ShaStarC
-ShaStarD
-ShaStarE
-ShaStarF
-ShaStarG
-ShaStarNum
-ShaStars
-ShaTCoin
-ShaTPieceLNum
-ShaTPieceRNum
-ShaTime
-ShadeCube
-Shadow
-Shadow00
-Shadow2D
-ShadowAppear
-ShadowControllerParam
-ShadowDummy
-ShadowKoopaJrCastle
-ShadowProjDummy
 ShadowType
-ShadowVolumeCylinder
-ShadowVolumeSphere
-Shake
-Shallow
 ShapeModelNo
-Shay
-Shell
-Shell2
-ShellCenter
-ShellEnd
-ShellHip
-ShellLeft
-ShellRight
-ShellRotate
-ShellStart
-ShellStartFace
-ShellStartLand
-ShellStartPunch
-ShellStartShell
-ShellWait
-ShimmerBoard
-Shine
-Shining
-Shock
-ShockWave
-ShockWaveJump
-ShockWaveJump3rd
-ShockWaveJumpStart
-ShockWaveLand
-Shoot
-ShootJ0
-ShootJ1
-ShootJ2
-ShootJ4
-ShootJ5
-ShootJ6
-Shooting
-ShootingBefore
-ShootingStar
-ShootingStarAppear
-ShootingStarBlur
-ShootingStarBreak
-ShortShot
-Shot
-ShotPos
-ShotRoll
-ShotSign
-ShotSignWait
-ShotStart
-ShotWait
-ShoulderL
-ShoulderR
-Show
-ShowHide
 ShowModel
-Shower
-Shrink
-Shurink
-ShurinkEnd
 SideOffset
-SideShadow
 SideSize
-Sight
-Sign
-SignAttack
 SignMotionType
-SignOff
-SignOn
-SignRotate
-SignWait
-Signal
-Simple
-Sink
-SinkDeath
-SinkDeathMud
-SinkDown
-SinkFast
-SinkPoison
-SitDown
-SitDownTalk
-Size
-SizeUpRate
-SkateBackL
-SkateBackR
-SkateL
-SkateR
-SkateSwitchL
-SkateSwitchR
-SkateTurn
-SkeltalDamageLast
-SklRoot
-Sleep
-SleepLie
-SleepReaction
-SleepStart
-SleepWait
-Slide
-SlideDown
-SlideHipBackward
-SlideHipEnd
-SlideHipForWard
-SlideHipLeft
-SlideHipRecover
-SlideHipRight
-SlideStmach
-SlideStmachEnd
-SlideStomachRecover
-Slider
-SliderDamageLand
-SliderDamageLand2nd
-SliderSpinLight
-SliderWallHitL
-SliderWallHitR
-Sliding
-Slip
-SlipCurve
-SlipIce
-SlipNormal
-SlipSandCurving
-SlipUp
-SlipWood
-Slope
-SlopeHold
-SlopeOK
-SlopeRunningCancelArea
-Small0
-SmallLandSmoke
-SmallStone
-SmallStoneMember
-Smoke
-Smoke3f
-Smoke6f
-SmokeChase
-SmokeCircle
-SmokeCircleFollow
-SmokeCircleLoop
-SmokeCircleLoopFollow
-SmokeEffectColorArea
-SmokeEmitting
-SmokeLand
-SmokeSphere
-SmokeSphereFollow
-SmokeSphereFollow1Time
-SmokeSphereLoop
-SnakeheadShadow
-SnakeheadSmallShadow
-Snow
-SnowAndNoSlip
-SnowCircle
-SnowCircleLoop
-SnowRabbit
-SnowRabbitCollect
-SnowSphere
-SnowSphereLoop
-SnowSpin
-SnowStep
-Soil
-Sound
-SoundId
 SoundIdName
 SoundLabel
 SoundName
 SoundType
 Sound_code
-SpaceCocoonBlur
-SpaceFlyEnd
-SpaceFlyLoop
-SpaceFlyShort
-SpaceFlyShortStart
-SpaceFlyStart
-SpaceInner
-SpaceStruggle
-SpaceWait
-Spark
-SparkMat
-SpeedLv
-SpherePlayer
-SpherePlayerBind
-SpherePlayerHit
-SpiderCocoonLand
-SpiderCocoonStretch
-SpiderCocoonWait
-SpikeAttack
-Spin
-Spin1
-Spin1st
-Spin2
-Spin2nd
-Spin3
-Spin3rd
-SpinAction
-SpinAttack
-SpinAttackStart
-SpinBlur
-SpinBlurGold
-SpinBlurRed
-SpinBreak
-SpinCatch
-SpinDamage
-SpinDamageWater
-SpinDriver
-SpinDriverCapture
-SpinDriverFall
-SpinDriverFlyEnd
-SpinDriverFlyLoop
-SpinDriverFlyStart
-SpinDriverLight
-SpinDriverPath
-SpinDriverShadow
-SpinDriverShoot
-SpinDriverStart
-SpinDriverWait
-SpinDrvCoolDown
-SpinEnd
-SpinEven
-SpinGround
-SpinGuidance
-SpinGuidanceCube
-SpinGuidanceDemo
-SpinHit
-SpinHitMark
-SpinLecture
-SpinLeverSwitch
-SpinLight
-SpinLightBurst
-SpinLightConcentrate
-SpinLow
-SpinPickel
-SpinReaction
-SpinReactionChance
-SpinRide
-SpinRing
-SpinRotate
-SpinScattarGrass
-SpinSign
-SpinStarPiece
-SpinStart
-SpinTico
-SpinTimer
-SpinWait1
-SpinWait2
-SpinWait3
-SpinWeapon
-SpinX
-Spine
-Spine1
-Spine2
-Spine3
-Spine4
-SpiralRadius
-SpiralRot
-SpkRes
-Splash
-SplashCoinBlock
-SplashPieceBlock
-SpotMarkLight
-Spread
-SpringJoint3
-SpringJoint5
-Square
-SquarePole180TurnL
-SquarePole180TurnR
-SquarePoleClimb
-SquarePoleFall
-SquarePolePushWait
-SquarePoleStart
-SquarePoleTurnEnd
-SquarePoleTurnL
-SquarePoleTurnR
-SquarePoleWait
-Squat
-SquatEnd
-SquatStart
-SquatWait
-SquatWalk
-Stable
-StaffLetter
-StaffList000
-StaffRoll
-StaffRollPicture
-StaffRollTitle
-StageData
-StageDataHolder
-StageInfo
 StageName
-StageObjInfo
 StageScenarioNo
-StageStartGround
-StageStartGroundSand
-StageStartGroundSmoke
-StageTitle
 StageType
-Stagger
-StaggerEnd
-StaggerLv1
-StaggerLv2
-StaggerNormal
-StaggerStart
-StampLeft
-StampRight
-StandPressDown
-Standby
-Star
-Star1
-Star2
-Star3
-Star4
-Star5
-Star6
-Star7
-StarCheckPoint
-StarCheckPointGrand
-StarCounter
-StarCreekPlanet
-StarDown
-StarDust
-StarFrame
-StarIcon
-StarJump
-StarListButton
-StarNumPictureBookB
-StarNumPictureBookC
-StarNumPictureBookD
-StarNumPictureBookE
-StarNumPictureBookF
-StarNumPictureBookG
-StarNumber01
-StarNumber01_v_x
-StarNumber1
-StarNumber10
-StarPieceAlmsStorage
-StarPieceBank
-StarPieceBreak
-StarPieceBreakS
-StarPieceCounter
-StarPieceCounterLight
-StarPieceCounterStop
-StarPieceDummy
-StarPieceFlyingBlur
-StarPieceGet
-StarPieceGetBlur
-StarPieceGetS
-StarPieceHit
-StarPieceHoming
-StarPieceL
-StarPieceLight
-StarPieceLightS
-StarPieceMine
-StarPieceR
-StarPieceReaction
-StarPieceReactionAir
-StarPieceScatter
-StarPieceTargetCounter
-StarPieceTargetMeter
-StarPieceTouchLight
-StarPieceWait
-StarPointer
-StarPointerHold
-StarPointerTargetDummy
-StarPositionDown
-StarPositionTop
-StarRingStart
-StarRoadWarpPoint
-StarTop
-StarWait
-StarWandHitMark
-Starpiece
-Stars
-Start
-StartButton
-StartCountdown
-StartCruise
-StartDemo
-StartEvent
 StartFrame
-StartNormal
-StartPage
-StartSlow
-StartSmoke
-StartTalk
 StartType
-StartWait
-Starting
-State
 StateName
 StateStep
-StaticSound
-StaticSound1st
-Status
-Steam
-SteamWaitA
-SteamWaitB
-SteamWaitC
-SteamWaitD
-StemFruit
-StepAdjust
-StepBreak
-StepDown
-StepEnd
-StepFix
-StepOn
-StepStorm
-Stepped
-Stick
-StickCancel
-StickWait
-Stomp
-Stomped
-Stone
-Stop
-StopEnd
-StopSceneController
-StopSceneFrame
-StopSceneStateControl
-StormIn
-StormWait
-StoryBook
-StoryBookFilter
-StoryBookShadow
-StoryBookText
-StorySequenceExecutor
-StraightAppear
-StraightBack
-StraightForward
-StraightForwardSmoke
-StraightPunch
-StraightPunchEnd
-StraightPunchHit
-StraightPunchLoop
-StraightPunchStart
-StraightWait
-Strap
 StreamName
-Stretch
-Strong
-Stumble
-Stun
-StunEnd
-StunStart
-SubPart
 SubPartName
 SubPartTotalStep
 SubPoint
-SuddenDeathMeter
-Summon
-SummonWait
-Sunshade
-SurfFall
-SurfFallL
-SurfFallR
-SurfJump
-SurfJumpHigh
-SurfLand
-SurfLectureAnswer
-SurfLectureUnbalance
-SurfRay
-SurfRide
-SurfRideDash
-SurfRideDashL
-SurfRideDashLoop
-SurfRideDashLoopL
-SurfRideDashLoopR
-SurfRideDashR
-SurfRideL
-SurfRideLoop
-SurfRideLoopL
-SurfRideLoopR
-SurfRideR
-SurfaceBox
-SurfaceCircle
-SurfaceOval
-SurfaceWave
-Suso1
-Suspect
 SuspendFlag
-Swallow
-Sway1
-Sway2
-Sweat
-Swell
-Swim
-SwimBreast
-SwimBreastSurface
-SwimBubble
-SwimBubbleRed
-SwimDamageMiddle
-SwimDamageMiddleSurface
-SwimDamageMiddleSurfaceLand
-SwimDamageSmall
-SwimDashRing
-SwimDashRingStart
-SwimDie
-SwimDive
-SwimDrift
-SwimFlutter
-SwimFlutterBoardDamageSmall
-SwimFlutterBoardDashRing
-SwimFlutterBoardDashRingStart
-SwimFlutterSurface
-SwimFlutterboard
-SwimFlutterboardStart
-SwimFlutterboardThrow
-SwimFlutterboardTurn
-SwimGetUp
-SwimJump
-SwimNormal
-SwimPaddle
-SwimRise
-SwimSpin
-SwimSpinAttack
-SwimSpinAttackSurface
-SwimSpinLight
-SwimSpinSurface
-SwimSplash
-SwimStart
-SwimStartSurface
-SwimSurface
-SwimSurfaceNormal
-SwimSurfaceTalk
-SwimTurnForward
-SwimTurnL
-SwimTurnR
-SwimTurtle
-SwimTurtleTalk
-SwimV
-SwimWait
-SwimWaitNormal
-SwimWaitRipple
-SwimWaitSurface
-SwimWaitSurfaceNormal
-SwimWaitTalk
-SwimWallHit
-SwimmingSchool
-Swing
-SwingRope
-SwingRopeAccel
-SwingRopeCommon
-SwingRopeSlideDown
-SwingRopeSlideDownStart
-SwingRopeSpin
-SwingRopeSwingWait
-SwingRopeWait
-SwingStop
-SwingThrow
-Switch
 SwitchA
 SwitchB
-SwitchBox
-SwitchChildJ
-SwitchEndA
-SwitchEndB
-SwitchFreezePlanet
 SwitchName
 SwitchNo
-SwitchOff
-SwitchOffSign
-SwitchOffSignQuick
-SwitchOn
-SwitchOnSign
-SwitchOnSignQuick
-SwitchStartA
-SwitchStartB
-SwitchWatcherHolder
-SwitchingScreenEffect
-Swoon
-SwoonEnd
-SwoonLand
-SwoonPressDown
-SwoonSpin
-SwoonStart
-SwoonToThreat
-SwoonWait
-SwoonWaitEnd
-SwoonWalk
-SwoonWalkEnd
-SwoonWalkStart
-Syaka
-SyncOff
-SyncOn
 SyncShow
-SysInfoWindow
-SysInfoWindowMini
-SysPALInfo
 SystemSe
-SystemStart
-SystemWipe
-TCounter
-TITLE_MAIN
-TITLE_SUB
-TPosition0001
-TPosition0010
-TPosition0100
-TPosition1000
-TSPieceCounter
-TStarPieceCounterLight
-TXT2
-Tackle
-TackleSign
-Tactile
-Tail
-Tail1
-Tail2
-Tail3
-Tail4
-Tail5
-Tail6
-Tail7
-TailBall
-TailDrag
-TailDragBlack
-TailFire
-TailFireMisFire
-TailRoot
-TailThornBigFixPos
-TailThornSmallFixPos
-TailTop
-TakeOff
-TakeOutStar
-TakoHei
-TakoHeiInk
-Takobo
-TakoboDeath
-Talk
-TalkA
-TalkAngry
-TalkB
-TalkBalloon
-TalkBalloonEvent
-TalkBalloonLetter
-TalkBalloonStretch
-TalkC
-TalkCool
-TalkCry
-TalkNormal
-TalkOk
-TalkPickel
-TalkSmile
-TalkStarPiece
-TalkTurn
-TalkWait
-TalkWeapon
-TamakoroLand
-TamakoroTutorial
-TamakoroTutorial2nd
-Target
-TargetLight
-TargetMax
-TargetMeter
-Telescope
-TennisRun
-TennisShotAir
-TennisShotL
-TennisShotM
-TennisShotR
-TennisWait
-Teresa
-TeresaAtomicPosition
-TeresaFollower
-TeresaThru
-TestMarioBaobabooPowerDown
-TexChange
-Text
-Text00
-TextC
-TextColor
-TextComet
-TextD
-TextDDemo
-TextTitle
-TextU
-ThankYou
-ThankYouLuigi
-ThankYouMario
-Thaw
-TheEnd
-ThicketJump
-Third
-ThornBreakFixPos
-Thow
-Threat
-Through
-ThroughMario
-Throw
-ThrowAll
-ThrowBoth
-ThrowL
-ThrowOne
-ThrowOneSign
-ThrowR
-ThrowSign
-ThrowStart
-ThrowTwo
-ThrowTwoSign
-ThrowV
-Thrown
-ThrownLv
-ThunderBottom
-ThunderCharge
-ThunderMiddle
-ThunderTop
-TicoBabyAnim
-TicoBuild
-TicoFatCoinGive
-TicoFat_Request000
-TicoFat_StarPiece000
-TicoReturnHomeWipeIn
-TicoShopExchange
-TicoShopWhich
-TiltGuidance
-TiltPress
-Time
-TimeCounter
-TimeLimit
-TimeLimitLayout
-TimeOut
-TimeOutLong
-TimeOutShort
 TimeSheetName
-TimeSignal
-TimeStopEffectEnd
-TimeStopEffectStart
-TimeStopScreenEffect
-TimeUp
-Timeout
-Timer
-Timer1
-Timer2
-TimerCount
-TimerCount1
-TimerCount2
-TimerCount4
-TimerEnd
-TimerFast
-TimerMedium
-TimerNearlyUp
-TimerPieceBlock
-TimerScaleUp
-TimerSlow
-TimerStart
-TimerUp
-TimerZero
-Tired
-Title
-TitleAppear
-TitleEnd
-TitleLogo
-TitleLogoAppear
-TitleLogoLight
-TitleLogoLightB
-TitleLogoLightC
-TitleLogoLightD
-TitleLogoLightE
-TitleLogoLightF
-TitleLogoLightG
-TitleLogoTicoLightA
-TitleLogoTicoLightB
-TitleLogoTicoLightC
-TitleLogoTicoLightD
-TitleLogoWait
-TitleWait
-TogeFailure
-TogepinHole
-Tongue1
-Tongue2
-Tongue3
-TongueCollisionHit
-TongueHit
-TongueHitNpc
-TongueHitWall
-TonguePos
-TongueTouch
-TooBad
-TorchA
-TorchB
-Tornado
-TornadoCharge
-TornadoChargeEnd
-TornadoElement
-TossStart
-TossWait
-TotalCoin
-TotalMedal
-TotalPiece
-TotalStar
 TotalStep
-Touch
-Touch1
-Touch2
-Touch3
-TouchAble
-TouchJump
-TrackFire
-TradeDownButton
-TradeUpButton
-Trample
-TrampleCombo
-TrampleDown
-TrampleReaction
-TrampleStarShare
-Trampled
-Trampoline
-TrampolineJumpHigh
-TrampolineJumpLow
-TrampolineJumpMiddle
-Trans
-Transform
-TransformTico
-Transparency
-TrapezeBackSpin
-TrapezeCommon
-TrapezeFrontSpin
-TrapezeSlideDown
-TrapezeSlideDownStart
-TrapezeSlowSwingBackEnd
-TrapezeSlowSwingBackStart
-TrapezeSlowSwingFrontEnd
-TrapezeSlowSwingFrontStart
-TrapezeSwingBackEnd
-TrapezeSwingBackStart
-TrapezeSwingFrontEnd
-TrapezeSwingFrontStart
-TrapezeWait
-TreeClimb
-TreeClimbStart
-TreeFall
-TreeHandStandJump
-TreeHandstandEnd
-TreeHandstandStart
-TreeHandstandTurn
-TreeHandstandWait
-TreeHit
-TreeLand
-TreeTrampled
-TreeWait
 TriggerName
 TriggerType
-Tumble
-Turn
-TurnA
-TurnB
-TurnDown
-TurnDownHold
-TurnDownOK
-TurnEnd
-TurnEndL
-TurnEndR
-TurnL
-TurnLEnd
-TurnLeft
-TurnLeftHold
-TurnLeftOK
-TurnLoop
-TurnLoopStart
-TurnOverPage1
-TurnOverPage2
-TurnPage
-TurnPageCharge
-TurnPageChargeMore
-TurnPageShort
-TurnPickel
-TurnR
-TurnREnd
-TurnReverse
-TurnRight
-TurnRightHold
-TurnRightOK
-TurnRightened
-TurnSmall
-TurnSplash
-TurnStarPiece
-TurnStart
-TurnToEgg
-TurnWeapon
-Turtle
-Tutorial
-TutorialTimer
-TutorialTimer2
-TutorialTimer3
-TwistStart
-TwoLine
 Type
-Under
-UnderGroundWalk
-Underground
-Undifined
 UniqueName
-Unknown
-Unused
-UpButton
-UpButtonPos
-UpCount
-UpCountOne
-UpShadow
-UpToDown
-UpperArmL
-UpperArmR
 UpperFlag0
 UpperFlag1
-UpperJaw
-UsEnglish
-UsFrench
-UsSpanish
-UseRead
-UseResource
-UseScaleForParam
 UseTimeKeepDemo
 UseType
-UseWrite
-UseWriteAuto
 Valid
 Validity
-Valve
-ValveCol
-ValveSwitch
-ValveSwitchOn
-ValveSwitchReverseOn
-Vanish
-VanishBad
-VanishGold
-VanishGood
-VanishRed
-Vaunt
-VecReg
-Vibration
-ViewCompleteEnding
-ViewCompleteMarioAndLuigi
-ViewGroupCtrl
-ViewGroupCtrlCube
 ViewGroupId
-ViewNormalEnding
 Visible
-VolDownBgm
 Volume
-VolumeBox
-VolumeCenter
-VolumeChangeArg0
 VolumeChangeArg1
 VolumeChangeArg2
 VolumeChangeArg3
 VolumeChangeArg4
 VolumeChangeType
-VolumeCone
 VolumeCut
-VolumeCylinder
 VolumeEnd
-VolumeFlatModel
-VolumeLine
-VolumeOval
-VolumeOvalPole
-VolumeSphere
-VolumeSphereLow
 VolumeStart
-Vs-DharmaSambo
-WC24_01
-WC24_02
-WC24_03
-WC24_04
-WC24_08
-WC24_09
-WC24_10
-WC24_SENDLIMIT
-WCUBE_IN_WATER
-WCUBE_ON_WATER
-WCUBE_OUTOF_WATER
-WCUBE_SIDE_WATER
-WCUBE_UNDER_WATER
-WKFALL
-WMap
-WORLD_MAP_MINI_ICON
-Wait
-Wait0
-Wait1
-Wait2
-WaitA
-WaitAButton
-WaitActive
-WaitAir
-WaitAngry
-WaitB
-WaitC
-WaitCritical
-WaitDeepSea
-WaitDown
-WaitFall
-WaitFar
-WaitFree
-WaitHold
-WaitL
-WaitLow
-WaitNear
-WaitNoInterpole
-WaitNone
-WaitNormal
-WaitOpen
-WaitOpenTalk
-WaitPickel
-WaitPinch
-WaitR
-WaitRaise
-WaitRaiseHold
-WaitReverse
-WaitRotation
-WaitRun
-WaitS
-WaitSlopeD
-WaitSlopeL
-WaitSlopeR
-WaitSlopeU
-WaitSmoke
-WaitStand
-WaitStarPiece
-WaitStart
-WaitSummon
-WaitThrow
-WaitUp
 WaitUserInputFlag
-WaitVolDown
-WaitWeapon
-Waiting
-Walk
-WalkBury
-WalkBuryJumpHi
-WalkBuryJumpLow
-WalkBuryJumpLow2
-WalkChance
-WalkDown
-WalkFast
-WalkFastWait
-WalkNormal
-WalkPickel
-WalkSmoke
-WalkSoft
-WalkSticky
-WalkWait
-WallHit
-WallHitLand
-WallHitSlider
-WallJump
-WallKeep
-WallSlide
-WallSpark
-WallWait
-WallWalkL
-WallWalkR
 Wall_code
-Wand
-Wander
-WanderNoInterpole
-WanderRun
-WanderSight
-WanderVoice
-Warning
-WarpCube
-WarpEnd
-WarpPod
-WarpPodEnd
-WarpPodSaveBits
-WarpPodStart
-WarpStart
-Watch
-WatchTowerRotateStepLift
-WatchTurn
-WatchTurnSwim
-WatchUp
-WatchUpMore
 WatchedEventNo
-Water
-WaterApproach
-WaterBlur
-WaterBottomH
-WaterBottomL
-WaterBottomM
-WaterBound
-WaterBullet
-WaterBulletStart
-WaterBulletWait
-WaterCameraFilter
-WaterCameraFilterParam
-WaterCircle
-WaterCircleLoop
-WaterColumn
-WaterColumnS
-WaterExplosion
-WaterFall
 WaterFlag
-WaterInOutFx
-WaterInOutRush
-WaterLayerBreak
-WaterLeakPipe
-WaterMelon
-WaterPowerStream
-WaterPressureBullet
-WaterRipple
-WaterRoad
-WaterRoadCaveStepA
-WaterRoadIn
-WaterSphere
-WaterSphereLoop
-WaterSpin
-WaterSplashDash
-WaterSplashLeft
-WaterSplashRight
-WaterSplashSLeft
-WaterSplashSRight
-WaterSplashWalk
-WaterSplashWalkAlone
-WaterSurface
-WaterWheelGear
-Watermelon
-Waylay
-Weak
-WeakBody
-WeakPointB
-WeakPointBack
-WeakPointFL
-WeakPointFR
-WeakPointHead
-WeakPointLeft
-WeakPointRight
-Weaken
-Weaken0
-Weaken1
-Weaken1st
-Weaken2nd
-Welcome
-WheelL
-WheelR
-Whistle
-White
-WhiteToGray
-WideInSide
-WideOutSide
-WiiRemoteStrap
-WinBattery1
-WinBattery2
-WinBelt4
-WinFadeIn
-WinFadeOut
-WinGhost
-WinInfoWindow
-WinInfoWindowM
-Wind
-WindEnd
-WindLoop
-WindMillPropeller
-WindReceiver
-WindRing
-WindRingVacuum
-Windmill1
-Windmill2
-Windmill3
-Windmill4
-WindowSize
-WingBlock
-WingL
-Wipe
 WipeFrame
-WipeIn
-WipeKoopa
-WipeMap
-WipeMario
-WipeModelCloud
-WipeModelGalaxy
-WipeModelSpace
 WipeName
-WipeOut
-WipeRing
 WipeType
-WireCoverCageDrill
-Witch
-Wither
-WoodThick
-WoodThin
-World
-WorldMap
-WorldNews
 WorldNo
-WorldWarp
-WristL
-WristR
-XMinus
-XPlus
-YCaptureTarget
-YMinus
-YPlus
-YRotation
-Yellow
-YellowToGreen
-ZMinus
-ZPlus
-Zenmai
-Zone
-ZoneHalo
-ZoneInfo
 ZoneName
-ZoomInGalaxy
-ZoomInShip
-ZoomInTico
-ZoomOutButton
-ZoomOutGalaxy
-ZoomOutShip
-ZoomOutTico
-_default
 angleA
 angleB
-appearance
-arm_left
-arm_right
-attack
-attack_left
-attack_right
-attacker
 attribute
-axis
 axis.X
 axis.Y
 axis.Z
-beam
-bind
-binder
-blink
-blow
-body
-body0
-body1
-body2
-body3
-body4
-body5
-body6
-body7
-bomb
-break
-buttBody
 camendint
 camera_id
 camint
 camtype
-cannon
-cdummy
-change
-chaseStart
-check
-childobjinfo
-circle
-circle_end
-close
 closed
-cocoon
-coin
-collision
-config
-config1
-core
 dir_x
 dir_y
 dir_z
 dist
-drop_water
-dummy
-dup-non-group
-eatstart0
-eatstart1
-eatstart2
 eflag.enableEndErpFrame
 eflag.enableErpFrame
-electricshock
-empty scene
 en_name
 end_frame
 evfrm
-evpriority
-ex-eye
-excite0
-excite1
-excite2
-explode
-eye1
-eye2
-eye3
-eye4
-fall
-fallquicklystart
-fffAp
-fire
+evpriorit
 flag.antibluroff
 flag.collisionoff
 flag.lofserpoff
 flag.nofovy
 flag.noreset
 flag.subjectiveoff
-force Trans
-force Trs2
-force Trs3
 fovy
-front_l_attacker
-front_r_attacker
 gflag.camendint
 gflag.enableEndErpFrame
 gflag.thru
-gland_front_l
-gland_front_r
-gland_rear_l
-gland_rear_r
 gndint
-head
 id
-initNameObjOnMainThread
 interpole
-joint3
 jp_name
-killer_terget
-koura
 l_id
-lambert141_v
-lambert5_v
-lbody
-leg_left
-leg_right
-line
-lockonparams
 loffset
 loffsetv
 lower
-lower_jaw
 lplay
-luigi
-mAmbAlpha
-mAmbColor
-mAttribute
-mBackLightMode
-mBankStarPieceMax
-mBankStarPieceNum
-mBestTime
-mBinder
-mBinderSize
-mConnectTo
-mDataSize
-mEffect
-mFirstPlayFlag
-mFlag
-mGalaxyName
-mGalaxyState
-mGiftedFileNameHash
-mGiftedPlayerLeft
 mGoods0
 mGoods1
 mGoodsJoint0
 mGoodsJoint1
-mGradTexMode
-mHardLightAlphaMask
-mHardLightColorMask
-mHostIO
-mInterpole
-mIsEncouragePal60
-mLast1upCoinNum
-mLightAMode
-mLightBMode
-mLightCtrl
-mLightingHighLevel
-mLightingLowLevel
-mLodCtrl
-mMakeActor
-mMatAlpha
-mMatColor
-mMaxCoinNum
-mMessage
-mMessageOffset
-mMissNum
-mModel
-mNerve
-mPlayerLeft
-mPointer
-mPointerSize
-mPosition
-mPowerStarFlag
-mRailKeeper
-mRailRider
-mScenarioNum
-mSensor
-mSensorJoint
-mSensorMax
-mSensorSize
-mSentBytes
-mShadow
-mShadowSize
-mSound
-mSoundSize
-mStockedCoinNum
-mStockedStarPieceNum
-mSwitchAppear
-mSwitchDead
-mTevColor0
-mTevColor1
-mTimeAnnounced
-mTimeSent
-mUseModelLightReg
-mUseModelTevReg
-mappartsinfo
-mario
-mario1
-message
-mind_eye
-mouth
-move1
-move2
 name
 no
-no name
-no-g(back)
-non-group
-normal
-not-initialized
-null
 num1
 num2
 num_pnt
-objinfo
-open
-parGt0v
 path_arg0
 path_arg1
 path_arg2
@@ -5133,95 +568,32 @@ point_arg4
 point_arg5
 point_arg6
 point_arg7
-polySurface1
-polySurface2
 pos_x
 pos_y
 pos_z
-powerstarget
-progress
-pulloutgraspend
-push
-push1
-push2
-push3
-push4
 pushdelay
 pushdelaylow
-pushed_rail
-radiate
-rear_l_attacker
-rear_r_attacker
-ride
-right
 roll
-rx
-ry
-rz
 scale_x
 scale_y
 scale_z
-search
-seed
-shell
-shock
-sleep
-spin
-spin2nd
-spine1
-spine2
-spine3
-stalk
-star
-star_piece
-start
 start_frame
-state
-string
-sx
-sy
-sysconf
-sz
-tail
-trample
-tungue
-tx
-ty
 type
-tz
 udown
-unknown
 up.X
 up.Y
 up.Z
 uplay
 upper
-upper_jaw
 usage
-user
-user1
 version
-vital_spot_c
-vital_spot_l
-vital_spot_r
-vpanaxis
 vpanaxis.X
 vpanaxis.Y
 vpanaxis.Z
 vpanuse
-waist
-wait
-wait0
-wait1
-wait2
-weak
-woffset
 woffset.X
 woffset.Y
 woffset.Z
-world_root
-wpoint
 wpoint.X
 wpoint.Y
-wpoint.Z
-yoshieatstart
\ No newline at end of file
+wpoint.Z
\ No newline at end of file
diff --git a/src/whitehole/AboutForm.java b/src/whitehole/AboutForm.java
index 81e90b5..5c5eb47 100644
--- a/src/whitehole/AboutForm.java
+++ b/src/whitehole/AboutForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/BcsvEditorForm.form b/src/whitehole/BcsvEditorForm.form
index 80c68e6..ad133ca 100644
--- a/src/whitehole/BcsvEditorForm.form
+++ b/src/whitehole/BcsvEditorForm.form
@@ -96,6 +96,109 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subZoneInfoActionPerformed"/>
                   </Events>
                 </MenuItem>
+                <Menu class="javax.swing.JMenu" name="mnuUseResource">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="UseResource"/>
+                  </Properties>
+                  <SubComponents>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURcommon">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="common"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURcommonActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subUR1">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="scenario_1"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subUR1ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subUR2">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="scenario_2"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subUR2ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subUR3">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="scenario_3"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subUR3ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURarcCommon">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="wave_arc_common"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURarcCommonActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURarc1">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="wave_arc_scenario_1"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURarc1ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURarc2">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="wave_arc_scenario_2"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURarc2ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURarc3">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="wave_arc_scenario_3"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURarc3ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURsoundCommon">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="sound_common"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURsoundCommonActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURsound1">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="sound_scenario_1"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURsound1ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURsound2">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="sound_scenario_2"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURsound2ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                    <MenuItem class="javax.swing.JMenuItem" name="subURsound3">
+                      <Properties>
+                        <Property name="text" type="java.lang.String" value="sound_scenario_3"/>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="subURsound3ActionPerformed"/>
+                      </Events>
+                    </MenuItem>
+                  </SubComponents>
+                </Menu>
               </SubComponents>
             </Menu>
             <Menu class="javax.swing.JMenu" name="mnuZone">
@@ -539,7 +642,6 @@
         </Component>
         <Component class="javax.swing.JTextField" name="tbArchiveName">
           <Properties>
-            <Property name="text" type="java.lang.String" value="/StageData/RedBlueExGalaxy/RedBlueExGalaxyScenario.arc"/>
             <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[375, 20]"/>
@@ -559,7 +661,6 @@
         </Component>
         <Component class="javax.swing.JTextField" name="tbFileName">
           <Properties>
-            <Property name="text" type="java.lang.String" value="/RedBlueExGalaxy/ScenarioData.bcsv"/>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[375, 20]"/>
             </Property>
@@ -652,6 +753,20 @@
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="spr5">
         </Component>
+        <Component class="javax.swing.JButton" name="btnDuplicateRow">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Duplicate row"/>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnDuplicateRowActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JToolBar$Separator" name="spr6">
+        </Component>
         <Component class="javax.swing.JButton" name="btnDeleteRow">
           <Properties>
             <Property name="text" type="java.lang.String" value="Delete row"/>
@@ -663,6 +778,19 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnDeleteRowActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JToolBar$Separator" name="spr7">
+        </Component>
+        <Component class="javax.swing.JButton" name="btnClear">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Delete all rows"/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnClearActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/src/whitehole/BcsvEditorForm.java b/src/whitehole/BcsvEditorForm.java
index b54e1a0..b294db0 100644
--- a/src/whitehole/BcsvEditorForm.java
+++ b/src/whitehole/BcsvEditorForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -22,7 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.*;
 import javax.swing.JOptionPane;
 import javax.swing.table.*;
 import whitehole.fileio.*;
@@ -41,10 +38,14 @@ public BcsvEditorForm()
         
         archive = null;
         bcsv = null;
-        zoneName = "RedBlueExGalaxy";
+        zoneName = "";
         
-        if (Whitehole.getGameType == 1)
+        if (Whitehole.gameType == 1)
         {
+            tbArchiveName.setText("/StageData/CocoonExGalaxy/CocoonExGalaxyScenario.arc");
+            tbFileName.setText("/CocoonExGalaxyScenario/ScenarioData.bcsv");
+            zoneName = "CocoonEXGalaxy";
+            mnuUseResource.setVisible(false);
             mnuAudio.setVisible(false);
             mnuSystem.setVisible(false);
             subWorldMapCamera.setVisible(false);
@@ -58,8 +59,11 @@ public BcsvEditorForm()
             subTicoShopDice.setVisible(false);
         }
         
-        if (Whitehole.getGameType == 2)
+        if (Whitehole.gameType == 2)
         {
+            tbArchiveName.setText("/StageData/RedBlueExGalaxy/RedBlueExGalaxyScenario.arc");
+            tbFileName.setText("/RedBlueExGalaxyScenario/ScenarioData.bcsv");
+            zoneName = "RedBlueExGalaxy";
             subAstroNamePlateData.setVisible(false);
         }
     }
@@ -89,7 +93,8 @@ private void bcsvOpen() {
                 if (bcsv != null) bcsv.close();
                 if (archive != null) archive.close();
             }
-            catch (IOException ex2) {}
+            catch (IOException ex2) {
+            }
             bcsv = null; archive = null;
             return;
         }
@@ -165,13 +170,10 @@ private void bcsvSave() {
                         case 6: entry.put(field.nameHash, ""); break;
                     }
                 }
-                
                 c++;
             }
-            
             bcsv.entries.add(entry);
         }
-        
         try
         { 
             bcsv.save();
@@ -185,7 +187,7 @@ private void bcsvSave() {
     
     private void bcsvExport() {
         try {
-            File file = new File("ExportedBcsv/" + enterFileName() + "Exported.txt");
+            File file = new File("ExportedBcsv/" + fileArchive + fileBcsv + ".txt");
             file.getParentFile().mkdirs();
             file.createNewFile();
             
@@ -199,7 +201,7 @@ private void bcsvExport() {
             for (int h = 0 ; h < model.getColumnCount();h++)
             {
                 pwriter.write(model.getColumnName(h));
-                if (h+1 != model.getColumnCount());
+                if (h-1 != model.getColumnCount());
                     pwriter.write(",");
             }
             pwriter.write("\r\n");
@@ -213,20 +215,21 @@ private void bcsvExport() {
                         String value = model.getValueAt(i, j).toString();
                         pwriter.write(value);
                     }
-                    if(j+1 != clmCnt);
+                    if(j-1 != clmCnt);
                         pwriter.write(",");
                 }
                 pwriter.write("\r\n");
             }
             pwriter.flush();
             pwriter.close();
+            JOptionPane.showMessageDialog(null, "The BCSV file has been exported.", Whitehole.fullName, JOptionPane.OK_CANCEL_OPTION);
         }
 	catch (IOException e)
         {
             e.printStackTrace();
         }
     }
-    
+
     private void enterZoneName() {
         String s = (String)JOptionPane.showInputDialog(this,
                     "Enter the name of the stage:",
@@ -234,13 +237,6 @@ private void enterZoneName() {
         zoneName = s;
     }
     
-    private String enterFileName() {
-        String s = (String)JOptionPane.showInputDialog(this,
-                    "Enter the name of the file:",
-                    Whitehole.fullName,JOptionPane.PLAIN_MESSAGE,null,null,null);
-        return s;
-    }
-
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -266,7 +262,11 @@ private void initComponents() {
         spr4 = new javax.swing.JToolBar.Separator();
         btnAddRow = new javax.swing.JButton();
         spr5 = new javax.swing.JToolBar.Separator();
+        btnDuplicateRow = new javax.swing.JButton();
+        spr6 = new javax.swing.JToolBar.Separator();
         btnDeleteRow = new javax.swing.JButton();
+        spr7 = new javax.swing.JToolBar.Separator();
+        btnClear = new javax.swing.JButton();
         menubar = new javax.swing.JMenuBar();
         mnuFile = new javax.swing.JMenu();
         subOpen = new javax.swing.JMenuItem();
@@ -279,6 +279,19 @@ private void initComponents() {
         subGalaxyInfo = new javax.swing.JMenuItem();
         subZoneList = new javax.swing.JMenuItem();
         subZoneInfo = new javax.swing.JMenuItem();
+        mnuUseResource = new javax.swing.JMenu();
+        subURcommon = new javax.swing.JMenuItem();
+        subUR1 = new javax.swing.JMenuItem();
+        subUR2 = new javax.swing.JMenuItem();
+        subUR3 = new javax.swing.JMenuItem();
+        subURarcCommon = new javax.swing.JMenuItem();
+        subURarc1 = new javax.swing.JMenuItem();
+        subURarc2 = new javax.swing.JMenuItem();
+        subURarc3 = new javax.swing.JMenuItem();
+        subURsoundCommon = new javax.swing.JMenuItem();
+        subURsound1 = new javax.swing.JMenuItem();
+        subURsound2 = new javax.swing.JMenuItem();
+        subURsound3 = new javax.swing.JMenuItem();
         mnuZone = new javax.swing.JMenu();
         subCameraParam = new javax.swing.JMenuItem();
         subLightDataZone = new javax.swing.JMenuItem();
@@ -344,7 +357,6 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
         lblArchive.setText(" Archive: ");
         jToolBar1.add(lblArchive);
 
-        tbArchiveName.setText("/StageData/RedBlueExGalaxy/RedBlueExGalaxyScenario.arc");
         tbArchiveName.setToolTipText("");
         tbArchiveName.setMaximumSize(new java.awt.Dimension(375, 20));
         tbArchiveName.setMinimumSize(new java.awt.Dimension(375, 20));
@@ -354,7 +366,6 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
         lblFile.setText("                    File: ");
         jToolBar1.add(lblFile);
 
-        tbFileName.setText("/RedBlueExGalaxy/ScenarioData.bcsv");
         tbFileName.setMaximumSize(new java.awt.Dimension(375, 20));
         tbFileName.setMinimumSize(new java.awt.Dimension(375, 20));
         tbFileName.setPreferredSize(new java.awt.Dimension(375, 20));
@@ -424,6 +435,19 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         jToolBar3.add(btnAddRow);
         jToolBar3.add(spr5);
 
+        btnDuplicateRow.setText("Duplicate row");
+        btnDuplicateRow.setToolTipText("");
+        btnDuplicateRow.setFocusable(false);
+        btnDuplicateRow.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnDuplicateRow.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnDuplicateRow.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnDuplicateRowActionPerformed(evt);
+            }
+        });
+        jToolBar3.add(btnDuplicateRow);
+        jToolBar3.add(spr6);
+
         btnDeleteRow.setText("Delete row");
         btnDeleteRow.setFocusable(false);
         btnDeleteRow.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -434,6 +458,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
         jToolBar3.add(btnDeleteRow);
+        jToolBar3.add(spr7);
+
+        btnClear.setText("Delete all rows");
+        btnClear.setFocusable(false);
+        btnClear.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnClear.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnClear.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnClearActionPerformed(evt);
+            }
+        });
+        jToolBar3.add(btnClear);
 
         mnuFile.setText("File");
 
@@ -512,6 +548,106 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         mnuGalaxy.add(subZoneInfo);
 
+        mnuUseResource.setText("UseResource");
+
+        subURcommon.setText("common");
+        subURcommon.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURcommonActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURcommon);
+
+        subUR1.setText("scenario_1");
+        subUR1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subUR1ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subUR1);
+
+        subUR2.setText("scenario_2");
+        subUR2.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subUR2ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subUR2);
+
+        subUR3.setText("scenario_3");
+        subUR3.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subUR3ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subUR3);
+
+        subURarcCommon.setText("wave_arc_common");
+        subURarcCommon.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURarcCommonActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURarcCommon);
+
+        subURarc1.setText("wave_arc_scenario_1");
+        subURarc1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURarc1ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURarc1);
+
+        subURarc2.setText("wave_arc_scenario_2");
+        subURarc2.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURarc2ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURarc2);
+
+        subURarc3.setText("wave_arc_scenario_3");
+        subURarc3.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURarc3ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURarc3);
+
+        subURsoundCommon.setText("sound_common");
+        subURsoundCommon.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURsoundCommonActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURsoundCommon);
+
+        subURsound1.setText("sound_scenario_1");
+        subURsound1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURsound1ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURsound1);
+
+        subURsound2.setText("sound_scenario_2");
+        subURsound2.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURsound2ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURsound2);
+
+        subURsound3.setText("sound_scenario_3");
+        subURsound3.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                subURsound3ActionPerformed(evt);
+            }
+        });
+        mnuUseResource.add(subURsound3);
+
+        mnuGalaxy.add(mnuUseResource);
+
         mnuOpen.add(mnuGalaxy);
 
         mnuZone.setText("Zone");
@@ -893,15 +1029,38 @@ private void btnAddRowActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST
         table.addRow((Object[])null);
     }//GEN-LAST:event_btnAddRowActionPerformed
 
+    private void btnDuplicateRowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDuplicateRowActionPerformed
+        DefaultTableModel table = (DefaultTableModel)tblBcsv.getModel();
+        int[] sel = tblBcsv.getSelectedRows();
+        if (sel.length < 0)
+            return;
+
+        Vector data = table.getDataVector();
+        Vector row;
+
+        for(int i=0;i<sel.length;i++) {
+            row = (Vector) data.elementAt(sel[i]);
+            table.addRow((Vector) row.clone());
+        }
+    }//GEN-LAST:event_btnDuplicateRowActionPerformed
+
     private void btnDeleteRowActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnDeleteRowActionPerformed
     {//GEN-HEADEREND:event_btnDeleteRowActionPerformed
-        int sel = tblBcsv.getSelectedRow();
-        if (sel < 0) return;
+        int[] sel = tblBcsv.getSelectedRows();
+        if (sel.length < 0)
+            return;
         
         DefaultTableModel table = (DefaultTableModel)tblBcsv.getModel();
-        table.removeRow(sel);
+        for(int i=0;i<sel.length;i++){
+            table.removeRow(sel[i]-i);
+        }
     }//GEN-LAST:event_btnDeleteRowActionPerformed
 
+    private void btnClearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnClearActionPerformed
+        DefaultTableModel table = (DefaultTableModel)tblBcsv.getModel();
+        table.setRowCount(0);
+    }//GEN-LAST:event_btnClearActionPerformed
+
     private void btnExportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExportActionPerformed
         if (tblBcsv.getColumnCount() == 0) {
             JOptionPane.showMessageDialog(null, "No BCSV file opened.", Whitehole.fullName, JOptionPane.OK_CANCEL_OPTION);
@@ -960,7 +1119,7 @@ private void subProductMapObjDataActionPerformed(java.awt.event.ActionEvent evt)
     }//GEN-LAST:event_subProductMapObjDataActionPerformed
 
     private void subObjNameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subObjNameActionPerformed
-        if (Whitehole.getGameType == 1) {
+        if (Whitehole.gameType == 1) {
             tbArchiveName.setText("/StageData/ObjNameTable.arc");
         }
         else {
@@ -1151,7 +1310,7 @@ private void subWorldMapHeapResourceActionPerformed(java.awt.event.ActionEvent e
     }//GEN-LAST:event_subWorldMapHeapResourceActionPerformed
 
     private void subLightDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subLightDataActionPerformed
-        if (Whitehole.getGameType == 1) {
+        if (Whitehole.gameType == 1) {
             tbArchiveName.setText("/ObjectData/LightData.arc");
         }
         else {
@@ -1177,81 +1336,205 @@ private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
 
     private void subScenarioDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subScenarioDataActionPerformed
         enterZoneName();
-        tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
-        tbFileName.setText("/" + zoneName + "Scenario/ScenarioData.bcsv");
-        bcsvOpen();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
+            tbFileName.setText("/" + zoneName + "Scenario/ScenarioData.bcsv");
+            bcsvOpen();
+        }
     }//GEN-LAST:event_subScenarioDataActionPerformed
 
     private void subGalaxyInfoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subGalaxyInfoActionPerformed
         enterZoneName();
-        tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
-        tbFileName.setText("/" + zoneName + "Scenario/GalaxyInfo.bcsv");
-        bcsvOpen();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
+            tbFileName.setText("/" + zoneName + "Scenario/GalaxyInfo.bcsv");
+            bcsvOpen();
+        }
     }//GEN-LAST:event_subGalaxyInfoActionPerformed
 
     private void subZoneListActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subZoneListActionPerformed
         enterZoneName();
-        tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
-        tbFileName.setText("/" + zoneName + "Scenario/ZoneList.bcsv");
-        bcsvOpen();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Scenario.arc");
+            tbFileName.setText("/" + zoneName + "Scenario/ZoneList.bcsv");
+            bcsvOpen();
+        }
     }//GEN-LAST:event_subZoneListActionPerformed
 
     private void subZoneInfoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subZoneInfoActionPerformed
         enterZoneName();
-        tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "ZoneInfo.arc");
-        tbFileName.setText("/Stage/csv/InStageFlagNameTable.bcsv");
-        bcsvOpen();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "ZoneInfo.arc");
+            tbFileName.setText("/Stage/csv/InStageFlagNameTable.bcsv");
+            bcsvOpen();
+        }
     }//GEN-LAST:event_subZoneInfoActionPerformed
 
     private void subCameraParamActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subCameraParamActionPerformed
         enterZoneName();
-        if (Whitehole.getGameType == 1) {
-            tbArchiveName.setText("/StageData/" + zoneName + ".arc");
-        }
-        else {
-            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+        if (!zoneName.isEmpty()) {
+            if (Whitehole.gameType == 1) {
+                tbArchiveName.setText("/StageData/" + zoneName + ".arc");
+            }
+            else {
+                tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+            }
+            tbFileName.setText("/Stage/camera/CameraParam.bcam");
+            bcsvOpen();
         }
-        tbFileName.setText("/Stage/camera/CameraParam.bcam");
-        bcsvOpen();
     }//GEN-LAST:event_subCameraParamActionPerformed
 
     private void subLightDataZoneActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subLightDataZoneActionPerformed
         enterZoneName();
-        if (Whitehole.getGameType == 1) {
-            tbArchiveName.setText("/ObjectData/LightData.arc");
-            tbFileName.setText("/LightData/Light" + zoneName + ".bcsv");
-        }
-        else {
-            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Light.arc");
-            tbFileName.setText("/Stage/csv/" + zoneName + "Light.bcsv");
+        if (!zoneName.isEmpty()) {
+            if (Whitehole.gameType == 1) {
+                tbArchiveName.setText("/ObjectData/LightData.arc");
+                tbFileName.setText("/LightData/Light" + zoneName + ".bcsv");
+            }
+            else {
+                tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Light.arc");
+                tbFileName.setText("/Stage/csv/" + zoneName + "Light.bcsv");
+            }
+            bcsvOpen();
         }
-        bcsvOpen();
     }//GEN-LAST:event_subLightDataZoneActionPerformed
 
     private void subStageInfoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subStageInfoActionPerformed
         enterZoneName();
-        if (Whitehole.getGameType == 1) {
-            tbArchiveName.setText("/StageData/" + zoneName + ".arc");
-        }
-        else {
-            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+        if (!zoneName.isEmpty()) {
+            if (Whitehole.gameType == 1) {
+                tbArchiveName.setText("/StageData/" + zoneName + ".arc");
+            }
+            else {
+                tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+            }
+            tbFileName.setText("/Stage/jmp/List/StageInfo");
+            bcsvOpen();
         }
-        tbFileName.setText("/Stage/jmp/List/StageInfo");
-        bcsvOpen();
     }//GEN-LAST:event_subStageInfoActionPerformed
 
     private void subChangeSceneListInfoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subChangeSceneListInfoActionPerformed
         enterZoneName();
-        if (Whitehole.getGameType == 1) {
-            tbArchiveName.setText("/StageData/" + zoneName + ".arc");
-        }
-        else {
-            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+        if (!zoneName.isEmpty()) {
+            if (Whitehole.gameType == 1) {
+                tbArchiveName.setText("/StageData/" + zoneName + ".arc");
+            }
+            else {
+                tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "Map.arc");
+            }
+            tbFileName.setText("/Stage/jmp/List/ChangeSceneListInfo");
+            bcsvOpen();
         }
-        tbFileName.setText("/Stage/jmp/List/ChangeSceneListInfo");
-        bcsvOpen();
     }//GEN-LAST:event_subChangeSceneListInfoActionPerformed
 
+    private void subURcommonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURcommonActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/common.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURcommonActionPerformed
+
+    private void subUR1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subUR1ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/scenario_1.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subUR1ActionPerformed
+
+    private void subUR2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subUR2ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/scenario_2.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subUR2ActionPerformed
+
+    private void subUR3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subUR3ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/scenario_3.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subUR3ActionPerformed
+
+    private void subURarcCommonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURarcCommonActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/wave_arc_common.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURarcCommonActionPerformed
+
+    private void subURarc1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURarc1ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/wave_arc_scenario_1.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURarc1ActionPerformed
+
+    private void subURarc2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURarc2ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/wave_arc_scenario_2.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURarc2ActionPerformed
+
+    private void subURarc3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURarc3ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/wave_arc_scenario_3.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURarc3ActionPerformed
+
+    private void subURsoundCommonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURsoundCommonActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/sound_common.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURsoundCommonActionPerformed
+
+    private void subURsound1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURsound1ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/sound_scenario_1.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURsound1ActionPerformed
+
+    private void subURsound2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURsound2ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/sound_scenario_2.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURsound2ActionPerformed
+
+    private void subURsound3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_subURsound3ActionPerformed
+        enterZoneName();
+        if (!zoneName.isEmpty()) {
+            tbArchiveName.setText("/StageData/" + zoneName + "/" + zoneName + "UseResource.arc");
+            tbFileName.setText("/" + zoneName + "Stage/csv/sound_scenario_3.bcsv");
+            bcsvOpen();
+        }
+    }//GEN-LAST:event_subURsound3ActionPerformed
+
     private FilesystemBase archive;
     private Bcsv bcsv;
     private String zoneName;
@@ -1260,7 +1543,9 @@ private void subChangeSceneListInfoActionPerformed(java.awt.event.ActionEvent ev
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btnAddRow;
+    private javax.swing.JButton btnClear;
     private javax.swing.JButton btnDeleteRow;
+    private javax.swing.JButton btnDuplicateRow;
     private javax.swing.JButton btnExport;
     private javax.swing.JButton btnOpen;
     private javax.swing.JButton btnSave;
@@ -1279,11 +1564,14 @@ private void subChangeSceneListInfoActionPerformed(java.awt.event.ActionEvent ev
     private javax.swing.JMenu mnuOpen;
     private javax.swing.JMenu mnuOther;
     private javax.swing.JMenu mnuSystem;
+    private javax.swing.JMenu mnuUseResource;
     private javax.swing.JMenu mnuZone;
     private javax.swing.JToolBar.Separator spr2;
     private javax.swing.JToolBar.Separator spr3;
     private javax.swing.JToolBar.Separator spr4;
     private javax.swing.JToolBar.Separator spr5;
+    private javax.swing.JToolBar.Separator spr6;
+    private javax.swing.JToolBar.Separator spr7;
     private javax.swing.JMenuItem subActionSound;
     private javax.swing.JMenuItem subAstroNamePlateData;
     private javax.swing.JMenuItem subAutoEffectList;
@@ -1326,6 +1614,18 @@ private void subChangeSceneListInfoActionPerformed(java.awt.event.ActionEvent ev
     private javax.swing.JMenuItem subTicoGalaxy;
     private javax.swing.JMenuItem subTicoShop;
     private javax.swing.JMenuItem subTicoShopDice;
+    private javax.swing.JMenuItem subUR1;
+    private javax.swing.JMenuItem subUR2;
+    private javax.swing.JMenuItem subUR3;
+    private javax.swing.JMenuItem subURarc1;
+    private javax.swing.JMenuItem subURarc2;
+    private javax.swing.JMenuItem subURarc3;
+    private javax.swing.JMenuItem subURarcCommon;
+    private javax.swing.JMenuItem subURcommon;
+    private javax.swing.JMenuItem subURsound1;
+    private javax.swing.JMenuItem subURsound2;
+    private javax.swing.JMenuItem subURsound3;
+    private javax.swing.JMenuItem subURsoundCommon;
     private javax.swing.JMenuItem subWorldMapCamera;
     private javax.swing.JMenuItem subWorldMapHeapGalaxy;
     private javax.swing.JMenuItem subWorldMapHeapResource;
diff --git a/src/whitehole/CheckBoxList.java b/src/whitehole/CheckBoxList.java
index 726f371..754f225 100644
--- a/src/whitehole/CheckBoxList.java
+++ b/src/whitehole/CheckBoxList.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/GalaxyEditorForm.form b/src/whitehole/GalaxyEditorForm.form
index b17aaf2..3d5044b 100644
--- a/src/whitehole/GalaxyEditorForm.form
+++ b/src/whitehole/GalaxyEditorForm.form
@@ -3,9 +3,6 @@
 <Form version="1.7" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
-    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[900, 700]"/>
-    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -25,7 +22,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-106,0,0,3,87"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,124,0,0,3,87"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -167,7 +164,7 @@
             </Container>
             <Component class="javax.swing.JLabel" name="lbStatusLabel">
               <Properties>
-                <Property name="text" type="java.lang.String" value="status text goes here"/>
+                <Property name="text" type="java.lang.String" value="Status text"/>
               </Properties>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@@ -182,7 +179,11 @@
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 5]"/>
             </Property>
+            <Property name="name" type="java.lang.String" value="" noResource="true"/>
           </Properties>
+          <AccessibilityProperties>
+            <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" value=""/>
+          </AccessibilityProperties>
           <Events>
             <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="tpLeftPanelStateChanged"/>
           </Events>
@@ -249,6 +250,9 @@
                             <Property name="horizontalTextPosition" type="int" value="0"/>
                             <Property name="verticalTextPosition" type="int" value="3"/>
                           </Properties>
+                          <Events>
+                            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddScenarioActionPerformed"/>
+                          </Events>
                         </Component>
                         <Component class="javax.swing.JButton" name="btnEditScenario">
                           <Properties>
@@ -469,7 +473,7 @@
                       <SubComponents>
                         <Component class="javax.swing.JToggleButton" name="tgbAddObject">
                           <Properties>
-                            <Property name="text" type="java.lang.String" value="Add"/>
+                            <Property name="text" type="java.lang.String" value="Add object"/>
                             <Property name="focusable" type="boolean" value="false"/>
                             <Property name="horizontalTextPosition" type="int" value="0"/>
                             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -482,7 +486,7 @@
                         </Component>
                         <Component class="javax.swing.JToggleButton" name="tgbDeleteObject">
                           <Properties>
-                            <Property name="text" type="java.lang.String" value="Delete"/>
+                            <Property name="text" type="java.lang.String" value="Delete object"/>
                             <Property name="focusable" type="boolean" value="false"/>
                             <Property name="horizontalTextPosition" type="int" value="0"/>
                             <Property name="verticalTextPosition" type="int" value="3"/>
diff --git a/src/whitehole/GalaxyEditorForm.java b/src/whitehole/GalaxyEditorForm.java
index 4f66bfc..44b398d 100644
--- a/src/whitehole/GalaxyEditorForm.java
+++ b/src/whitehole/GalaxyEditorForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -48,6 +45,7 @@
 import whitehole.smg.*;
 import whitehole.fileio.*;
 import whitehole.smg.Bcsv;
+import whitehole.smg.object.ChildObj;
 
 public class GalaxyEditorForm extends javax.swing.JFrame
   {    
@@ -208,8 +206,7 @@ public void checkBoxStatusChanged(int index, boolean status)
         
         populateObjectList(zoneModeLayerBitmask);
     }
-   
-
+    
     private void initGUI()
     {
         setTitle(galaxyName + " - " + Whitehole.fullName);
@@ -226,7 +223,7 @@ private void initGUI()
         pmnAddObjects = new JPopupMenu();
         
         if (ZoneArchive.gameMask == 2) {
-            String[] menuitems = new String[] {"Normal", "MapPart", "Gravity", "Starting point", "Area", "Camera Area", "Cutscene", "GeneralPos", "ChangeObj (Unused)", "Debug (Unused)"};
+            String[] menuitems = new String[] {"Normal", "MapPart", "Gravity", "Starting point", "Area", "Camera Area", "Cutscene", "GeneralPos", "ChangeObj (Unused)", "Debug (Unused)", "Path", "Path point"};
             for (String item : menuitems)
             {
                 JMenuItem mnuitem = new JMenuItem(item);
@@ -245,11 +242,12 @@ public void actionPerformed(ActionEvent e)
                             case 3: doAddObject("start"); break;
                             case 4: doAddObject("area"); break;
                             case 5: doAddObject("camera"); break;
-                            case 6: doAddObject("demo"); break;  
+                            case 6: doAddObject("demo"); break;
                             case 7: doAddObject("generalpos"); break;
                             case 8: doAddObject("change"); break;
-                            case 9: doAddObject("debug"); break;  
-                        
+                            case 9: doAddObject("debug"); break;
+                            case 10: doAddObject("path"); break;
+                            case 11: doAddObject("pathpoint"); break;
                         }
                     }
                 });
@@ -257,7 +255,7 @@ public void actionPerformed(ActionEvent e)
             }
         }
         else {
-            String[] menuitems = new String[] {"Normal", "MapPart", "Gravity", "Starting point", "Area", "Camera Area", "Sound", "Cutscene", "GeneralPos", "Debug (Unused)"};
+            String[] menuitems = new String[] {"Normal", "ChildObj", "MapPart", "Gravity", "Starting point", "Area", "Camera Area", "Sound", "Cutscene", "GeneralPos", "Debug (Unused)", "Path", "Path point"};
             for (String item : menuitems)
             {
                 JMenuItem mnuitem = new JMenuItem(item);
@@ -271,16 +269,18 @@ public void actionPerformed(ActionEvent e)
                         switch (i)
                         {
                             case 0: doAddObject("general"); break;
-                            case 1: doAddObject("mappart"); break;
-                            case 2: doAddObject("gravity"); break;
-                            case 3: doAddObject("start"); break;
-                            case 4: doAddObject("area"); break;
-                            case 5: doAddObject("camera"); break;
-                            case 6: doAddObject("sound"); break;
-                            case 7: doAddObject("demo"); break;  
-                            case 8: doAddObject("generalpos"); break;
-                            case 9: doAddObject("debug"); break;  
-                        
+                            case 1: doAddObject("child"); break;
+                            case 2: doAddObject("mappart"); break;
+                            case 3: doAddObject("gravity"); break;
+                            case 4: doAddObject("start"); break;
+                            case 5: doAddObject("area"); break;
+                            case 6: doAddObject("camera"); break;
+                            case 7: doAddObject("sound"); break;
+                            case 8: doAddObject("demo"); break;
+                            case 9: doAddObject("generalpos"); break;
+                            case 10: doAddObject("debug"); break;
+                            case 11: doAddObject("path"); break;
+                            case 12: doAddObject("pathpoint"); break;
                         }
                     }
                 });
@@ -540,12 +540,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         pnlGLPanel.add(jToolBar2, java.awt.BorderLayout.NORTH);
 
-        lbStatusLabel.setText("status text goes here");
+        lbStatusLabel.setText("Status text");
         pnlGLPanel.add(lbStatusLabel, java.awt.BorderLayout.PAGE_END);
 
         jSplitPane1.setRightComponent(pnlGLPanel);
 
         tpLeftPanel.setMinimumSize(new java.awt.Dimension(100, 5));
+        tpLeftPanel.setName(""); // NOI18N
         tpLeftPanel.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
                 tpLeftPanelStateChanged(evt);
@@ -569,6 +570,11 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) {
         btnAddScenario.setFocusable(false);
         btnAddScenario.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         btnAddScenario.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnAddScenario.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnAddScenarioActionPerformed(evt);
+            }
+        });
         jToolBar3.add(btnAddScenario);
 
         btnEditScenario.setText("Edit");
@@ -669,7 +675,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
         tbObjToolbar.setFloatable(false);
         tbObjToolbar.setRollover(true);
 
-        tgbAddObject.setText("Add");
+        tgbAddObject.setText("Add object");
         tgbAddObject.setFocusable(false);
         tgbAddObject.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         tgbAddObject.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -681,7 +687,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         tbObjToolbar.add(tgbAddObject);
         tbObjToolbar.add(jSeparator4);
 
-        tgbDeleteObject.setText("Delete");
+        tgbDeleteObject.setText("Delete object");
         tgbDeleteObject.setFocusable(false);
         tgbDeleteObject.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         tgbDeleteObject.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
@@ -712,6 +718,7 @@ public void valueChanged(javax.swing.event.TreeSelectionEvent evt) {
         tpLeftPanel.addTab("Objects", jSplitPane4);
 
         jSplitPane1.setLeftComponent(tpLeftPanel);
+        tpLeftPanel.getAccessibleContext().setAccessibleDescription("");
 
         getContentPane().add(jSplitPane1, java.awt.BorderLayout.CENTER);
 
@@ -744,7 +751,6 @@ public void selectionChanged()
         {
             lbStatusLabel.setText("Deselect object.");
             btnDeselect.setEnabled(false);
-            tgbDeleteObject.setText("Delete");
             
             pnlObjectSettings.doLayout();
             pnlObjectSettings.validate();
@@ -803,7 +809,6 @@ else if (cls == null)
 
                     lbStatusLabel.setText(String.format("Selected [%3$d] %1$s (%2$s), point %4$d", path.data.get("name"), path.zone.zoneName, path.pathID, selectedPathPoint.index));
                     btnDeselect.setEnabled(true);
-                    tgbDeleteObject.setText("Delete");
 
                     pnlObjectSettings.addCategory("path_settings", "Path settings");
                     if (galaxyMode)
@@ -849,7 +854,6 @@ else if (cls == null)
                     String layer = selectedObj.layer.equals("common") ? "Common" : "Layer"+selectedObj.layer.substring(5).toUpperCase();
                     lbStatusLabel.setText(String.format("Selected %1$s (%2$s, %3$s)", selectedObj.name, selectedObj.zone.zoneName, layer));
                     btnDeselect.setEnabled(true);
-                    tgbDeleteObject.setText("Delete");
 
                     LinkedList layerlist = new LinkedList();
                     layerlist.add("Common");
@@ -930,6 +934,7 @@ private void populateObjectList(int layermask)
         
         ObjListTreeNode objnode;
         objnode = new ObjListTreeNode(); objnode.setUserObject("General"); root.add(objnode); populateObjectSublist(layermask, objnode, GeneralObject.class);
+        if (ZoneArchive.gameMask==1) { objnode = new ObjListTreeNode(); objnode.setUserObject("ChildObj"); root.add(objnode); populateObjectSublist(layermask, objnode, ChildObj.class); }
         objnode = new ObjListTreeNode(); objnode.setUserObject("MapParts"); root.add(objnode); populateObjectSublist(layermask, objnode, MapPartObj.class);
         objnode = new ObjListTreeNode(); objnode.setUserObject("Gravity"); root.add(objnode); populateObjectSublist(layermask, objnode, PlanetObj.class);
         objnode = new ObjListTreeNode(); objnode.setUserObject("Starting points"); root.add(objnode); populateObjectSublist(layermask, objnode, StartObj.class);
@@ -939,7 +944,7 @@ private void populateObjectList(int layermask)
         objnode = new ObjListTreeNode(); objnode.setUserObject("Cutscenes"); root.add(objnode); populateObjectSublist(layermask, objnode, DemoObj.class);
         objnode = new ObjListTreeNode(); objnode.setUserObject("GeneralPos"); root.add(objnode); populateObjectSublist(layermask, objnode, GeneralPosObj.class);
         if (ZoneArchive.gameMask==2) { objnode = new ObjListTreeNode(); objnode.setUserObject("ChangeObj"); root.add(objnode); populateObjectSublist(layermask, objnode, ChangeObj.class); }
-        objnode = new ObjListTreeNode(); objnode.setUserObject("Debug"); root.add(objnode); populateObjectSublist(layermask, objnode, DebugObj.class);   
+        objnode = new ObjListTreeNode(); objnode.setUserObject("Debug"); root.add(objnode); populateObjectSublist(layermask, objnode, DebugObj.class);
         objnode = new ObjListTreeNode(); objnode.setUserObject("Paths"); root.add(objnode);
         
         for (PathObject obj : curZoneArc.paths)
@@ -1027,26 +1032,53 @@ private void formWindowClosing(java.awt.event.WindowEvent evt)//GEN-FIRST:event_
         }
     }//GEN-LAST:event_formWindowClosing
 
-    private void tpLeftPanelStateChanged(javax.swing.event.ChangeEvent evt)//GEN-FIRST:event_tpLeftPanelStateChanged
-    {//GEN-HEADEREND:event_tpLeftPanelStateChanged
+    private void btnShowAllPathsActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnShowAllPathsActionPerformed
+    {//GEN-HEADEREND:event_btnShowAllPathsActionPerformed
+        for (String zone : zoneArcs.keySet())
+            rerenderTasks.add("zone:" + zone);
+        
+        glCanvas.repaint();
+    }//GEN-LAST:event_btnShowAllPathsActionPerformed
+
+    private void tgbReverseRotActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_tgbReverseRotActionPerformed
+    {//GEN-HEADEREND:event_tgbReverseRotActionPerformed
+        Settings.reverseRot = tgbReverseRot.isSelected();
+        Settings.save();
+    }//GEN-LAST:event_tgbReverseRotActionPerformed
+
+    private void tgbShowFakeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tgbShowFakeActionPerformed
+        for (String zone : zoneArcs.keySet())
+            rerenderTasks.add("zone:" + zone);
+        
+        glCanvas.repaint();
+    }//GEN-LAST:event_tgbShowFakeActionPerformed
+
+    private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveActionPerformed
+        saveChanges();
+    }//GEN-LAST:event_btnSaveActionPerformed
+
+    private void btnCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCloseActionPerformed
+        dispose(); 
+    }//GEN-LAST:event_btnCloseActionPerformed
+
+    private void tpLeftPanelStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_tpLeftPanelStateChanged
         // useless
     }//GEN-LAST:event_tpLeftPanelStateChanged
 
-    private void tvObjectListValueChanged(javax.swing.event.TreeSelectionEvent evt)//GEN-FIRST:event_tvObjectListValueChanged
-    {//GEN-HEADEREND:event_tvObjectListValueChanged
+    private void tvObjectListValueChanged(javax.swing.event.TreeSelectionEvent evt) {//GEN-FIRST:event_tvObjectListValueChanged
         TreePath[] paths = evt.getPaths();
         for (TreePath path : paths)
         {
             TreeNode node = (TreeNode)path.getLastPathComponent();
             if (!(node instanceof ObjTreeNode))
-                continue;
-            
+            continue;
+
             ObjTreeNode tnode = (ObjTreeNode)node;
             if (!(tnode.object instanceof LevelObject))
-                continue;
-            
+            continue;
+
             LevelObject obj = (LevelObject)tnode.object;
-            
+
             if (evt.isAddedPath(path))
             {
                 selectedObjs.put(obj.uniqueID, obj);
@@ -1058,14 +1090,13 @@ private void tvObjectListValueChanged(javax.swing.event.TreeSelectionEvent evt)/
                 addRerenderTask("zone:"+obj.zone.zoneName);
             }
         }
-        
+
         selectionArg = 0;
         selectionChanged();
         glCanvas.repaint();
     }//GEN-LAST:event_tvObjectListValueChanged
 
-    private void tgbDeleteObjectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_tgbDeleteObjectActionPerformed
-    {//GEN-HEADEREND:event_tgbDeleteObjectActionPerformed
+    private void tgbDeleteObjectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tgbDeleteObjectActionPerformed
         if (!selectedObjs.isEmpty())
         {
             if (tgbDeleteObject.isSelected())
@@ -1079,14 +1110,14 @@ private void tgbDeleteObjectActionPerformed(java.awt.event.ActionEvent evt)//GEN
                 selectionChanged();
             }
             tgbDeleteObject.setSelected(false);
-        } 
+        }
         else
         {
             if (!tgbDeleteObject.isSelected())
             {
                 deletingObjects = false;
                 setStatusText();
-            } 
+            }
             else
             {
                 deletingObjects = true;
@@ -1095,10 +1126,9 @@ private void tgbDeleteObjectActionPerformed(java.awt.event.ActionEvent evt)//GEN
         }
     }//GEN-LAST:event_tgbDeleteObjectActionPerformed
 
-    private void tgbAddObjectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_tgbAddObjectActionPerformed
-    {//GEN-HEADEREND:event_tgbAddObjectActionPerformed
+    private void tgbAddObjectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tgbAddObjectActionPerformed
         if (tgbAddObject.isSelected())
-            pmnAddObjects.show(tgbAddObject, 0, tgbAddObject.getHeight());
+        pmnAddObjects.show(tgbAddObject, 0, tgbAddObject.getHeight());
         else
         {
             pmnAddObjects.setVisible(false);
@@ -1106,8 +1136,7 @@ private void tgbAddObjectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FI
         }
     }//GEN-LAST:event_tgbAddObjectActionPerformed
 
-    private void lbZoneListValueChanged(javax.swing.event.ListSelectionEvent evt)//GEN-FIRST:event_lbZoneListValueChanged
-    {//GEN-HEADEREND:event_lbZoneListValueChanged
+    private void lbZoneListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_lbZoneListValueChanged
         if (evt.getValueIsAdjusting())
         {
             return;
@@ -1131,8 +1160,7 @@ private void lbZoneListValueChanged(javax.swing.event.ListSelectionEvent evt)//G
         glCanvas.repaint();
     }//GEN-LAST:event_lbZoneListValueChanged
 
-    private void btnEditZoneActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnEditZoneActionPerformed
-    {//GEN-HEADEREND:event_btnEditZoneActionPerformed
+    private void btnEditZoneActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnEditZoneActionPerformed
         if (childZoneEditors.containsKey(curZone))
         {
             if (!childZoneEditors.get(curZone).isVisible())
@@ -1150,8 +1178,7 @@ private void btnEditZoneActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIR
         childZoneEditors.put(curZone, form);
     }//GEN-LAST:event_btnEditZoneActionPerformed
 
-    private void lbScenarioListValueChanged(javax.swing.event.ListSelectionEvent evt)//GEN-FIRST:event_lbScenarioListValueChanged
-    {//GEN-HEADEREND:event_lbScenarioListValueChanged
+    private void lbScenarioListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_lbScenarioListValueChanged
         if (evt.getValueIsAdjusting())
         {
             return;
@@ -1189,31 +1216,9 @@ private void lbScenarioListValueChanged(javax.swing.event.ListSelectionEvent evt
         lbZoneList.setSelectedIndex(0);
     }//GEN-LAST:event_lbScenarioListValueChanged
 
-    private void btnShowAllPathsActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnShowAllPathsActionPerformed
-    {//GEN-HEADEREND:event_btnShowAllPathsActionPerformed
-        for (String zone : zoneArcs.keySet())
-            rerenderTasks.add("zone:" + zone);
-        
-        glCanvas.repaint();
-    }//GEN-LAST:event_btnShowAllPathsActionPerformed
-
-    private void tgbReverseRotActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_tgbReverseRotActionPerformed
-    {//GEN-HEADEREND:event_tgbReverseRotActionPerformed
-        Settings.reverseRot = tgbReverseRot.isSelected();
-        Settings.save();
-    }//GEN-LAST:event_tgbReverseRotActionPerformed
+    private void btnAddScenarioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAddScenarioActionPerformed
 
-    private void tgbShowFakeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tgbShowFakeActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_tgbShowFakeActionPerformed
-
-    private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveActionPerformed
-        saveChanges();
-    }//GEN-LAST:event_btnSaveActionPerformed
-
-    private void btnCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCloseActionPerformed
-        dispose(); 
-    }//GEN-LAST:event_btnCloseActionPerformed
+    }//GEN-LAST:event_btnAddScenarioActionPerformed
                                            
     
     public void addRerenderTask(String task)
@@ -1355,101 +1360,100 @@ private void addObject(Point where)
         
         LevelObject newobj = null;
         int pnodeid = -1;
-        {
-
-            if (ZoneArchive.gameMask==2) {
+        if (ZoneArchive.gameMask==2) {
             switch (objtype)
             {
                 case "general": 
-                    newobj = new GeneralObject(curZoneArc, "Placement/" + addingOnLayer + "/ObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 0;
-                    break;
-                case "mappart": 
-                    newobj = new MapPartObj(curZoneArc, "MapParts/" + addingOnLayer + "/MapPartsInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 1; 
-                    break;
-                case "gravity": 
-                    newobj = new PlanetObj(curZoneArc, "Placement/" + addingOnLayer + "/PlanetObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 2;
-                    break;
-                case "start": 
-                    newobj = new StartObj(curZoneArc, "Start/" + addingOnLayer + "/StartInfo", ZoneArchive.gameMask, pos);
-                    pnodeid = 3;
-                    break;    
-                case "area": 
-                    newobj = new AreaObj(curZoneArc, "Placement/" + addingOnLayer + "/AreaObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 4;
-                    break;
-                case "camera": 
-                    newobj = new CameraCubeObj(curZoneArc, "Placement/" + addingOnLayer + "/CameraCubeInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 5;
-                    break;
-                case "demo": 
-                    newobj = new DemoObj(curZoneArc, "Placement/" + addingOnLayer + "/DemoObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 6;
-                    break;    
-                case "generalpos": 
-                    newobj = new GeneralPosObj(curZoneArc, "GeneralPos/" + addingOnLayer + "/GeneralPosInfo", ZoneArchive.gameMask, pos);
-                    pnodeid = 7;
-                    break;
-                case "change":
-                    newobj = new ChangeObj(curZoneArc, "Placement/" + addingOnLayer + "/ChangeObjInfo", ZoneArchive.gameMask, pos);
-                    pnodeid = 8;
-                    break;
-                case "debug":
-                    newobj = new DebugObj(curZoneArc, "Debug/" + addingOnLayer + "/DebugMoveInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 9;
-                    break;
-            }
+                        newobj = new GeneralObject(curZoneArc, "Placement/" + addingOnLayer + "/ObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 0;
+                        break;
+                    case "mappart": 
+                        newobj = new MapPartObj(curZoneArc, "MapParts/" + addingOnLayer + "/MapPartsInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 1; 
+                        break;
+                    case "gravity": 
+                        newobj = new PlanetObj(curZoneArc, "Placement/" + addingOnLayer + "/PlanetObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 2;
+                        break;
+                    case "start": 
+                        newobj = new StartObj(curZoneArc, "Start/" + addingOnLayer + "/StartInfo", ZoneArchive.gameMask, pos);
+                        pnodeid = 3;
+                        break;    
+                    case "area": 
+                        newobj = new AreaObj(curZoneArc, "Placement/" + addingOnLayer + "/AreaObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 4;
+                        break;
+                    case "camera": 
+                        newobj = new CameraCubeObj(curZoneArc, "Placement/" + addingOnLayer + "/CameraCubeInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 5;
+                        break;
+                    case "demo": 
+                        newobj = new DemoObj(curZoneArc, "Placement/" + addingOnLayer + "/DemoObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 6;
+                        break;    
+                    case "generalpos": 
+                        newobj = new GeneralPosObj(curZoneArc, "GeneralPos/" + addingOnLayer + "/GeneralPosInfo", ZoneArchive.gameMask, pos);
+                        pnodeid = 7;
+                        break;
+                    case "change":
+                        newobj = new ChangeObj(curZoneArc, "Placement/" + addingOnLayer + "/ChangeObjInfo", ZoneArchive.gameMask, pos);
+                        pnodeid = 8;
+                        break;
+                    case "debug":
+                        newobj = new DebugObj(curZoneArc, "Debug/" + addingOnLayer + "/DebugMoveInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 9;
+                        break;
+                }
             }
             else {
-            switch (objtype)
-            {
-                case "general": 
-                    newobj = new GeneralObject(curZoneArc, "Placement/" + addingOnLayer + "/ObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 0;
-                    break;
-                case "mappart": 
-                    newobj = new MapPartObj(curZoneArc, "MapParts/" + addingOnLayer + "/MapPartsInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 1; 
-                    break;
-                case "gravity": 
-                    newobj = new PlanetObj(curZoneArc, "Placement/" + addingOnLayer + "/PlanetObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 2;
-                    break;
-                case "start": 
-                    newobj = new StartObj(curZoneArc, "Start/" + addingOnLayer + "/StartInfo", ZoneArchive.gameMask, pos);
-                    pnodeid = 3;
-                    break;    
-                case "area": 
-                    newobj = new AreaObj(curZoneArc, "Placement/" + addingOnLayer + "/AreaObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 4;
-                    break;
-                case "camera": 
-                    newobj = new CameraCubeObj(curZoneArc, "Placement/" + addingOnLayer + "/CameraCubeInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 5;
-                    break;
-                case "sound": 
-                    newobj = new SoundObj(curZoneArc, "Placement/" + addingOnLayer + "/SoundInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 6;
-                    break;
-                case "demo": 
-                    newobj = new DemoObj(curZoneArc, "Placement/" + addingOnLayer + "/DemoObjInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 7;
-                    break;    
-                case "generalpos": 
-                    newobj = new GeneralPosObj(curZoneArc, "GeneralPos/" + addingOnLayer + "/GeneralPosInfo", ZoneArchive.gameMask, pos);
-                    pnodeid = 8;
-                    break;    
-                case "debug":
-                    newobj = new DebugObj(curZoneArc, "Debug/" + addingOnLayer + "/DebugMoveInfo", ZoneArchive.gameMask, objname, pos);
-                    pnodeid = 9;
-                    break;
-                
-            }
+                switch (objtype)
+                {
+                    case "general": 
+                        newobj = new GeneralObject(curZoneArc, "Placement/" + addingOnLayer + "/ObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 0;
+                        break;
+                    case "child": 
+                        newobj = new ChildObj(curZoneArc, "ChildObj/" + addingOnLayer + "/ChildObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 1; 
+                        break;
+                    case "mappart": 
+                        newobj = new MapPartObj(curZoneArc, "MapParts/" + addingOnLayer + "/MapPartsInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 2; 
+                        break;
+                    case "gravity": 
+                        newobj = new PlanetObj(curZoneArc, "Placement/" + addingOnLayer + "/PlanetObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 3;
+                        break;
+                    case "start": 
+                        newobj = new StartObj(curZoneArc, "Start/" + addingOnLayer + "/StartInfo", ZoneArchive.gameMask, pos);
+                        pnodeid = 4;
+                        break;    
+                    case "area": 
+                        newobj = new AreaObj(curZoneArc, "Placement/" + addingOnLayer + "/AreaObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 5;
+                        break;
+                    case "camera": 
+                        newobj = new CameraCubeObj(curZoneArc, "Placement/" + addingOnLayer + "/CameraCubeInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 6;
+                        break;
+                    case "sound": 
+                        newobj = new SoundObj(curZoneArc, "Placement/" + addingOnLayer + "/SoundInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 7;
+                        break;
+                    case "demo": 
+                        newobj = new DemoObj(curZoneArc, "Placement/" + addingOnLayer + "/DemoObjInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 8;
+                        break;    
+                    case "generalpos": 
+                        newobj = new GeneralPosObj(curZoneArc, "GeneralPos/" + addingOnLayer + "/GeneralPosInfo", ZoneArchive.gameMask, pos);
+                        pnodeid = 9;
+                        break;    
+                    case "debug":
+                        newobj = new DebugObj(curZoneArc, "Debug/" + addingOnLayer + "/DebugMoveInfo", ZoneArchive.gameMask, objname, pos);
+                        pnodeid = 10;
+                        break;
+                }
             }
-
-        }
         
         int uid = 0;
         while (globalObjList.containsKey(uid) 
@@ -1493,6 +1497,12 @@ private void doAddObject(String type)
                 objectBeingAdded = "change|ChangeObj";
                 addingOnLayer = "common";
                 break;
+            case "path":
+                JOptionPane.showMessageDialog(this, "Path adding isn't supported yet.", Whitehole.fullName, 0);
+                return;
+            case "pathpoint":
+                JOptionPane.showMessageDialog(this, "Path point adding isn't supported yet.", Whitehole.fullName, 0);
+                return;
             default:
                 ObjectSelectForm form = new ObjectSelectForm(this, ZoneArchive.gameMask, null);
                 form.setVisible(true);
@@ -1526,7 +1536,6 @@ private void deleteObject(int uid)
             }
         }
         
-        
         else if (globalPathPointList.containsKey(uid))
         {
             PathPointObject obj = globalPathPointList.get(uid);
@@ -1692,13 +1701,6 @@ else if (propname.equals("MarioNo"))
         unsavedChanges = true;
     }
 
-    private boolean btnAddScenarioMouseClicked() {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-    
-    
-
-    
     public class GalaxyRenderer implements GLEventListener, MouseListener, MouseMotionListener, MouseWheelListener, KeyListener
     {
         public class AsyncPrerenderer implements Runnable
@@ -1764,6 +1766,7 @@ public void init(GLAutoDrawable glad)
             objectBeingAdded = "";
             addingOnLayer = "";
             deletingObjects = false;
+            duplicatingObjects = false;
             
             renderinfo = new GLRenderer.RenderInfo();
             renderinfo.drawable = glad;
@@ -1789,7 +1792,7 @@ public void init(GLAutoDrawable glad)
             
             if (start != null)
             {
-                camDistance = 0.1f;
+                camDistance = 0.125f;
                 
                 camTarget.x = start.position.x / scaledown;
                 camTarget.y = start.position.y / scaledown;
@@ -1819,7 +1822,6 @@ public void init(GLAutoDrawable glad)
             inited = true;
         }
         
-        
         private void renderSelectHighlight(GL2 gl, String zone)
         {
             boolean gotany = false;
@@ -2426,7 +2428,6 @@ else if (mouseButton == MouseEvent.BUTTON1)
 
                 updateCamera();
             }
-            
             e.getComponent().repaint();
         }
 
@@ -2876,6 +2877,7 @@ public class SubZoneData
     private LinkedHashMap<Integer, PathPointObject> displayedPaths;
     private String objectBeingAdded, addingOnLayer;
     private boolean deletingObjects;
+    private boolean duplicatingObjects;
     
     private CheckBoxList lbLayersList;
     private JPopupMenu pmnAddObjects;
diff --git a/src/whitehole/HashForm.form b/src/whitehole/HashForm.form
index 4e8f97a..d0a9972 100644
--- a/src/whitehole/HashForm.form
+++ b/src/whitehole/HashForm.form
@@ -32,16 +32,12 @@
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="txtInput" alignment="0" max="32767" attributes="0"/>
-                  <Group type="102" alignment="1" attributes="0">
-                      <Component id="btnGenerate" min="-2" pref="135" max="-2" attributes="0"/>
-                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="btnClear" min="-2" pref="135" max="-2" attributes="0"/>
-                  </Group>
-                  <Component id="txtOutput" alignment="0" max="32767" attributes="0"/>
+                  <Component id="txtOutput" alignment="0" pref="276" max="32767" attributes="0"/>
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="lblInput" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="lblOutput" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="btnAddTo" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
@@ -61,11 +57,8 @@
               <Component id="lblOutput" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="txtOutput" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btnClear" alignment="3" min="-2" pref="39" max="-2" attributes="0"/>
-                  <Component id="btnGenerate" alignment="3" min="-2" pref="39" max="-2" attributes="0"/>
-              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="btnAddTo" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
@@ -73,6 +66,9 @@
   </Layout>
   <SubComponents>
     <Component class="javax.swing.JTextField" name="txtInput">
+      <Events>
+        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtInputKeyReleased"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JTextField" name="txtOutput">
       <Properties>
@@ -80,14 +76,6 @@
         <Property name="text" type="java.lang.String" value="00000000"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JButton" name="btnGenerate">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Generate"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnGenerateActionPerformed"/>
-      </Events>
-    </Component>
     <Component class="javax.swing.JLabel" name="lblInput">
       <Properties>
         <Property name="text" type="java.lang.String" value="Input"/>
@@ -98,12 +86,12 @@
         <Property name="text" type="java.lang.String" value="Output"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JButton" name="btnClear">
+    <Component class="javax.swing.JButton" name="btnAddTo">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Clear"/>
+        <Property name="text" type="java.lang.String" value="Add to &quot;AdditionalFieldNames&quot;"/>
       </Properties>
       <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnClearActionPerformed"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddToActionPerformed"/>
       </Events>
     </Component>
   </SubComponents>
diff --git a/src/whitehole/HashForm.java b/src/whitehole/HashForm.java
index f5467a8..13ef0aa 100644
--- a/src/whitehole/HashForm.java
+++ b/src/whitehole/HashForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -19,7 +16,12 @@
 package whitehole;
 
 import java.awt.Toolkit;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 import javax.swing.JOptionPane;
+import whitehole.smg.Bcsv;
 
 public class HashForm extends javax.swing.JFrame
 {
@@ -43,10 +45,9 @@ private void initComponents() {
 
         txtInput = new javax.swing.JTextField();
         txtOutput = new javax.swing.JTextField();
-        btnGenerate = new javax.swing.JButton();
         lblInput = new javax.swing.JLabel();
         lblOutput = new javax.swing.JLabel();
-        btnClear = new javax.swing.JButton();
+        btnAddTo = new javax.swing.JButton();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setResizable(false);
@@ -59,24 +60,23 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
             }
         });
 
-        txtOutput.setEditable(false);
-        txtOutput.setText("00000000");
-
-        btnGenerate.setText("Generate");
-        btnGenerate.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnGenerateActionPerformed(evt);
+        txtInput.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyReleased(java.awt.event.KeyEvent evt) {
+                txtInputKeyReleased(evt);
             }
         });
 
+        txtOutput.setEditable(false);
+        txtOutput.setText("00000000");
+
         lblInput.setText("Input");
 
         lblOutput.setText("Output");
 
-        btnClear.setText("Clear");
-        btnClear.addActionListener(new java.awt.event.ActionListener() {
+        btnAddTo.setText("Add to \"AdditionalFieldNames\"");
+        btnAddTo.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnClearActionPerformed(evt);
+                btnAddToActionPerformed(evt);
             }
         });
 
@@ -88,15 +88,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(txtInput)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addComponent(btnGenerate, javax.swing.GroupLayout.PREFERRED_SIZE, 135, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(btnClear, javax.swing.GroupLayout.PREFERRED_SIZE, 135, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addComponent(txtOutput)
+                    .addComponent(txtOutput, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE)
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(lblInput)
-                            .addComponent(lblOutput))
+                            .addComponent(lblOutput)
+                            .addComponent(btnAddTo))
                         .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
@@ -111,10 +108,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addComponent(lblOutput)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(txtOutput, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(30, 30, 30)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnClear, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(btnGenerate, javax.swing.GroupLayout.PREFERRED_SIZE, 39, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(btnAddTo)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
@@ -131,45 +126,38 @@ private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event
         this.setIconImage(Toolkit.getDefaultToolkit().createImage(Whitehole.class.getResource("/Resources/icon.png")));
     }//GEN-LAST:event_formWindowOpened
 
-    private void btnGenerateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGenerateActionPerformed
-        String checkinput = txtInput.getText();
-        if (checkinput.contains(" ")) {
+    private void txtInputKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtInputKeyReleased
+        if (txtInput.getText().contains(" ")) {
             JOptionPane.showMessageDialog(null, "You can not use any spaces!", Whitehole.fullName, JOptionPane.INFORMATION_MESSAGE);
+            txtInput.setText(txtInput.getText().replaceAll(" ", ""));
         }
         else {
-            txtOutput.setText(fieldNameToHash(txtInput.getText()));
+            txtOutput.setText(String.format("%1$08X",Bcsv.fieldNameToHash(txtInput.getText())));
         }
-    }//GEN-LAST:event_btnGenerateActionPerformed
+    }//GEN-LAST:event_txtInputKeyReleased
 
-    private void btnClearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnClearActionPerformed
-        txtInput.setText("");
-        txtOutput.setText("00000000");
-    }//GEN-LAST:event_btnClearActionPerformed
-    
-    public static String fieldNameToHash(String field)
-    {
-        String hash;
-        String hashf;
-        int ret = 0;
+    private void btnAddToActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAddToActionPerformed
+        try {
+            File hashCustom = new File("AdditionalFieldNames.txt");
+            PrintWriter writeFile = new PrintWriter(new FileWriter(hashCustom, true));
+            BufferedWriter writeLine = new BufferedWriter(writeFile);
         
-        for (char ch : field.toCharArray())
-        {
-            ret *= 0x1F;
-            ret += ch;
+            if (!hashCustom.exists())
+                Bcsv.createCustomHashFile();
+            
+            writeLine.write("# " + txtOutput.getText() + "\r\n" + txtInput.getText() + "\r\n");
+            writeLine.close();
         }
-        
-        hash = String.valueOf(Integer.toHexString(ret).toUpperCase());
-        hashf = new String(new char[8 - hash.length()]).replace("\0", "0");
-        hash = hashf + hash;
-        return hash;
-    }
-    
+        catch (Exception ex) {
+        }
+
+    }//GEN-LAST:event_btnAddToActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JButton btnClear;
-    private javax.swing.JButton btnGenerate;
+    private javax.swing.JButton btnAddTo;
     private javax.swing.JLabel lblInput;
     private javax.swing.JLabel lblOutput;
     private javax.swing.JTextField txtInput;
     private javax.swing.JTextField txtOutput;
     // End of variables declaration//GEN-END:variables
-}
+}
\ No newline at end of file
diff --git a/src/whitehole/Iterator2Enumeration.java b/src/whitehole/Iterator2Enumeration.java
index 1a71c7c..690cac8 100644
--- a/src/whitehole/Iterator2Enumeration.java
+++ b/src/whitehole/Iterator2Enumeration.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -42,4 +39,4 @@ public Object nextElement()
     
     
     private Iterator iterator;
-}
+}
\ No newline at end of file
diff --git a/src/whitehole/LayerForm.form b/src/whitehole/LayerForm.form
new file mode 100644
index 0000000..54008d1
--- /dev/null
+++ b/src/whitehole/LayerForm.form
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
+    <EventHandler event="windowOpened" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowOpened"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="txtOutput" max="32767" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="0" pref="11" max="32767" attributes="0"/>
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="txtInput" min="-2" pref="209" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="lblInput" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="lblOutput" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="lblInput" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="txtInput" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <Component id="lblOutput" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="txtOutput" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JTextField" name="txtInput">
+      <Events>
+        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtInputKeyReleased"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JLabel" name="lblInput">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Input"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="lblOutput">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Output"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Common +"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="txtOutput">
+      <Properties>
+        <Property name="editable" type="boolean" value="false"/>
+      </Properties>
+    </Component>
+  </SubComponents>
+</Form>
diff --git a/src/whitehole/LayerForm.java b/src/whitehole/LayerForm.java
new file mode 100644
index 0000000..e409219
--- /dev/null
+++ b/src/whitehole/LayerForm.java
@@ -0,0 +1,134 @@
+/*
+    © 2012 - 2016 - Whitehole Team
+
+    Whitehole is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
+    WARRANTY; See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along 
+    with Whitehole. If not, see http://www.gnu.org/licenses/.
+*/
+
+package whitehole;
+
+import java.awt.Toolkit;
+
+public class LayerForm extends javax.swing.JFrame
+{
+
+    /**
+     * Creates new form BcsvEditorForm
+     */
+    public LayerForm()
+    {
+        initComponents();
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        txtInput = new javax.swing.JTextField();
+        lblInput = new javax.swing.JLabel();
+        lblOutput = new javax.swing.JLabel();
+        jLabel1 = new javax.swing.JLabel();
+        txtOutput = new javax.swing.JTextField();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setResizable(false);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            public void windowClosing(java.awt.event.WindowEvent evt) {
+                formWindowClosing(evt);
+            }
+            public void windowOpened(java.awt.event.WindowEvent evt) {
+                formWindowOpened(evt);
+            }
+        });
+
+        txtInput.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyReleased(java.awt.event.KeyEvent evt) {
+                txtInputKeyReleased(evt);
+            }
+        });
+
+        lblInput.setText("Input");
+
+        lblOutput.setText("Output");
+
+        jLabel1.setText("Common +");
+
+        txtOutput.setEditable(false);
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(txtOutput)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(0, 11, Short.MAX_VALUE)
+                        .addComponent(jLabel1)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(txtInput, javax.swing.GroupLayout.PREFERRED_SIZE, 209, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(lblInput)
+                            .addComponent(lblOutput))
+                        .addGap(0, 0, Short.MAX_VALUE)))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(lblInput)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(txtInput, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1))
+                .addGap(18, 18, 18)
+                .addComponent(lblOutput)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(txtOutput, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void formWindowClosing(java.awt.event.WindowEvent evt)//GEN-FIRST:event_formWindowClosing
+    {//GEN-HEADEREND:event_formWindowClosing
+
+    }//GEN-LAST:event_formWindowClosing
+
+    private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
+        this.setTitle("Layer Generator");
+        this.setIconImage(Toolkit.getDefaultToolkit().createImage(Whitehole.class.getResource("/Resources/icon.png")));
+    }//GEN-LAST:event_formWindowOpened
+
+    private void txtInputKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtInputKeyReleased
+        getLayerNo(txtInput.getText());
+    }//GEN-LAST:event_txtInputKeyReleased
+
+    private void getLayerNo(String field) {
+    }
+    
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel lblInput;
+    private javax.swing.JLabel lblOutput;
+    private javax.swing.JTextField txtInput;
+    private javax.swing.JTextField txtOutput;
+    // End of variables declaration//GEN-END:variables
+}
\ No newline at end of file
diff --git a/src/whitehole/MainFrame.form b/src/whitehole/MainFrame.form
index 5c1ae59..47573ce 100644
--- a/src/whitehole/MainFrame.form
+++ b/src/whitehole/MainFrame.form
@@ -47,7 +47,7 @@
           <Group type="102" alignment="0" attributes="0">
               <Component id="jToolBar1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jScrollPane1" pref="404" max="32767" attributes="0"/>
+              <Component id="jScrollPane1" pref="449" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="lbStatusBar" min="-2" pref="21" max="-2" attributes="0"/>
           </Group>
@@ -120,6 +120,19 @@
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator5">
         </Component>
+        <Component class="javax.swing.JButton" name="btnLayerGen">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Layer generator"/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnLayerGenActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JToolBar$Separator" name="jSeparator6">
+        </Component>
         <Component class="javax.swing.JButton" name="btnSettings">
           <Properties>
             <Property name="text" type="java.lang.String" value="Settings"/>
@@ -146,6 +159,12 @@
         </Component>
       </SubComponents>
     </Container>
+    <Component class="javax.swing.JLabel" name="lbStatusBar">
+      <Properties>
+        <Property name="toolTipText" type="java.lang.String" value=""/>
+        <Property name="verticalTextPosition" type="int" value="3"/>
+      </Properties>
+    </Component>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">
       <AuxValues>
         <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
@@ -166,11 +185,5 @@
         </Component>
       </SubComponents>
     </Container>
-    <Component class="javax.swing.JLabel" name="lbStatusBar">
-      <Properties>
-        <Property name="toolTipText" type="java.lang.String" value=""/>
-        <Property name="verticalTextPosition" type="int" value="3"/>
-      </Properties>
-    </Component>
   </SubComponents>
 </Form>
diff --git a/src/whitehole/MainFrame.java b/src/whitehole/MainFrame.java
index f458646..915dc94 100644
--- a/src/whitehole/MainFrame.java
+++ b/src/whitehole/MainFrame.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -25,6 +22,9 @@
 import java.io.*;
 import java.util.HashMap;
 import whitehole.fileio.*;
+import whitehole.rendering.RendererCache;
+import whitehole.rendering.ShaderCache;
+import whitehole.rendering.TextureCache;
 
 public class MainFrame extends javax.swing.JFrame {
 
@@ -34,6 +34,8 @@ public class MainFrame extends javax.swing.JFrame {
     public MainFrame() 
     {
         initComponents();
+        btnLayerGen.setVisible(false);
+        jSeparator6.setVisible(false);
         galaxyEditors = new HashMap<>();
     }
     
@@ -56,12 +58,14 @@ private void initComponents() {
         jSeparator3 = new javax.swing.JToolBar.Separator();
         btnHashGen = new javax.swing.JButton();
         jSeparator5 = new javax.swing.JToolBar.Separator();
+        btnLayerGen = new javax.swing.JButton();
+        jSeparator6 = new javax.swing.JToolBar.Separator();
         btnSettings = new javax.swing.JButton();
         jSeparator4 = new javax.swing.JToolBar.Separator();
         btnAbout = new javax.swing.JButton();
+        lbStatusBar = new javax.swing.JLabel();
         jScrollPane1 = new javax.swing.JScrollPane();
         GalaxyList = new javax.swing.JList();
-        lbStatusBar = new javax.swing.JLabel();
 
         jMenu1.setText("jMenu1");
 
@@ -126,6 +130,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         jToolBar1.add(btnHashGen);
         jToolBar1.add(jSeparator5);
 
+        btnLayerGen.setText("Layer generator");
+        btnLayerGen.setFocusable(false);
+        btnLayerGen.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnLayerGen.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        btnLayerGen.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnLayerGenActionPerformed(evt);
+            }
+        });
+        jToolBar1.add(btnLayerGen);
+        jToolBar1.add(jSeparator6);
+
         btnSettings.setText("Settings");
         btnSettings.setFocusable(false);
         btnSettings.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -149,6 +165,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         jToolBar1.add(btnAbout);
 
+        lbStatusBar.setToolTipText("");
+        lbStatusBar.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+
         GalaxyList.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 GalaxyListMouseClicked(evt);
@@ -161,9 +180,6 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
         });
         jScrollPane1.setViewportView(GalaxyList);
 
-        lbStatusBar.setToolTipText("");
-        lbStatusBar.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -177,7 +193,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
             .addGroup(layout.createSequentialGroup()
                 .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 449, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(lbStatusBar, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
@@ -229,17 +245,15 @@ private void btnOpenGameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
         GalaxyList.setModel(galaxylist);
         java.util.List<String> galaxies = Whitehole.game.getGalaxies();
         
-        if (Whitehole.getGameType == 0) {
-            for (String galaxy : galaxies)
-            {
+        if (Whitehole.gameType == 0) {
+            for (String galaxy : galaxies) {
                 galaxylist.removeElement(galaxy);
             }
             btnBcsvEditor.setEnabled(false);
             lbStatusBar.setText("Failed to open the directory");
         }
         else {
-            for (String galaxy : galaxies)
-            {
+            for (String galaxy : galaxies) {
                 galaxylist.addElement(galaxy);
             }
             btnBcsvEditor.setEnabled(true);
@@ -284,8 +298,16 @@ private void GalaxyListValueChanged(javax.swing.event.ListSelectionEvent evt)//G
         btnOpenGalaxy.setEnabled(hasSelection);
     }//GEN-LAST:event_GalaxyListValueChanged
 
+    private void btnLayerGenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLayerGenActionPerformed
+        new LayerForm().setVisible(true);
+    }//GEN-LAST:event_btnLayerGenActionPerformed
+
     private void openGalaxy()
     {
+        TextureCache.initialize();
+        ShaderCache.initialize();
+        RendererCache.initialize();
+        
         String gal = (String)GalaxyList.getSelectedValue();
         if (galaxyEditors.containsKey(gal))
         {
@@ -302,7 +324,6 @@ private void openGalaxy()
         form.setVisible(true);
         galaxyEditors.put(gal, form);
     }
-
     private HashMap<String, GalaxyEditorForm> galaxyEditors;
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -310,6 +331,7 @@ private void openGalaxy()
     private javax.swing.JButton btnAbout;
     private javax.swing.JButton btnBcsvEditor;
     private javax.swing.JButton btnHashGen;
+    private javax.swing.JButton btnLayerGen;
     private javax.swing.JButton btnOpenGalaxy;
     private javax.swing.JButton btnOpenGame;
     private javax.swing.JButton btnSettings;
@@ -320,6 +342,7 @@ private void openGalaxy()
     private javax.swing.JToolBar.Separator jSeparator3;
     private javax.swing.JToolBar.Separator jSeparator4;
     private javax.swing.JToolBar.Separator jSeparator5;
+    private javax.swing.JToolBar.Separator jSeparator6;
     private javax.swing.JToolBar jToolBar1;
     private javax.swing.JLabel lbStatusBar;
     // End of variables declaration//GEN-END:variables
diff --git a/src/whitehole/ObjListTreeNode.java b/src/whitehole/ObjListTreeNode.java
index 108144d..6986de4 100644
--- a/src/whitehole/ObjListTreeNode.java
+++ b/src/whitehole/ObjListTreeNode.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/ObjTreeNode.java b/src/whitehole/ObjTreeNode.java
index 75dffba..26eba6e 100644
--- a/src/whitehole/ObjTreeNode.java
+++ b/src/whitehole/ObjTreeNode.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/ObjectDB.java b/src/whitehole/ObjectDB.java
index c26f2b6..cdfd95b 100644
--- a/src/whitehole/ObjectDB.java
+++ b/src/whitehole/ObjectDB.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -52,35 +49,57 @@ public static void initialize()
             {
                 Object entry = new Object();
                 entry.ID = objelem.getAttributeValue("id");
-                
                 entry.name = objelem.getChildText("name");
+                entry.category = objelem.getChild("category").getAttribute("id").getIntValue();
+                entry.type = objelem.getChild("preferredfile").getAttributeValue("name");
+                entry.notes = objelem.getChildText("notes");
                 
                 Element flags = objelem.getChild("flags");
                 entry.games = flags.getAttribute("games").getIntValue();
+                entry.known = flags.getAttribute("known").getIntValue();
+                entry.complete = flags.getAttribute("complete").getIntValue();
                 
-                entry.category = objelem.getChild("category").getAttribute("id").getIntValue();
-                
-                entry.preferredFile = objelem.getChild("preferredfile").getAttributeValue("name");
-                entry.notes = objelem.getChildText("notes");
+                // placeholder string
+                if (entry.notes.isEmpty() || entry.notes.equals(""))
+                    entry.notes = "(No description found for this objects.)";
+                if (entry.type.isEmpty() || entry.notes.equals(""))
+                    entry.type = "Unknown";
                 
-                entry.dataFiles = new ArrayList<>();
-                String datafiles = objelem.getChildText("files");
-                for (String datafile : datafiles.split("\n"))
-                    entry.dataFiles.add(datafile);
+                // get data files string
+                String dataFiles = objelem.getChildText("files");
+                if (dataFiles.isEmpty() || dataFiles.equals("")) {
+                    entry.dataFiles = "(None)";
+                }
+                else {
+                    for (String dataFile : dataFiles.split("\n")) {
+                        entry.dataFiles += dataFile + "<br>";
+                    }
+                }
                 
+                // get Obj_arg string
                 List<Element> fields = objelem.getChildren("field");
                 entry.fields = new HashMap<>(fields.size());
-                for (Element field : fields)
-                {
-                    Object.Field fielddata = new Object.Field();
-                    
-                    fielddata.ID = field.getAttribute("id").getIntValue();
-                    fielddata.type = field.getAttributeValue("type");
-                    fielddata.name = field.getAttributeValue("name");
-                    fielddata.values = field.getAttributeValue("values");
-                    fielddata.notes = field.getAttributeValue("notes");
-                    
-                    entry.fields.put(fielddata.ID, fielddata);
+                if (!fields.isEmpty()) {
+                    for (Element field : fields) {
+                        Object.Field fielddata = new Object.Field();
+                        
+                        fielddata.ID = field.getAttribute("id").getIntValue();
+                        fielddata.type = field.getAttributeValue("type");
+                        fielddata.name = field.getAttributeValue("name");
+                        fielddata.values = field.getAttributeValue("values");
+                        fielddata.notes = field.getAttributeValue("notes");
+                        
+                        if (!fielddata.values.isEmpty() || !fielddata.values.equals(""))
+                            fielddata.values = ", " + fielddata.values;
+                        if (!fielddata.notes.isEmpty() || !fielddata.notes.equals(""))
+                            fielddata.notes = ", " + fielddata.notes;
+                        
+                        entry.dataFields += "Obj_arg" + fielddata.ID + " (" + fielddata.type + "): " + fielddata.name + fielddata.values + fielddata.notes + "<br>";
+                        entry.fields.put(fielddata.ID, fielddata);
+                    }
+                }
+                else {
+                    entry.dataFields = "(None)<br>";
                 }
                 
                 objects.put(entry.ID, entry);
@@ -112,19 +131,19 @@ public static class Field
         public String ID;
         public String name;
         
-        // bit0=SMG1, bit1=SMG2
-        public int games;
-        
         public int category;
+        public int games;
+        public int known;
+        public int complete;
         
-        public String preferredFile;
-        public String notes;
-        public List<String> dataFiles;
+        public String dataFields = "";
+        public String dataFiles = "";
+        public String type = "";
+        public String notes = "";
         
         public HashMap<Integer, Field> fields;
     }
     
-    
     public static boolean fallback;
     public static long timestamp;
     public static LinkedHashMap<Integer, String> categories;
diff --git a/src/whitehole/ObjectDBUpdater.java b/src/whitehole/ObjectDBUpdater.java
index 46a37b5..d570886 100644
--- a/src/whitehole/ObjectDBUpdater.java
+++ b/src/whitehole/ObjectDBUpdater.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -39,9 +36,7 @@ public void run()
         try
         {
             String ts = String.format("&ts=%1$d", ObjectDB.timestamp);
-            URL url = new URL ("http://kuribo64.net/whitehole/objectdb.php?whitehole&gzip" + ts);
-            if (Settings.dbEggStarGalaxy)
-                url = new URL ("http://neomariogalaxy.bplaced.net/board/whitehole/objectdb.php?whitehole&gzip" + ts);
+            URL url = new URL ("http://neomariogalaxy.bplaced.net/board/objectdb/smg_download.php?whitehole&gzip" + ts);
             URLConnection conn = url.openConnection();
             DataInputStream dis = new DataInputStream(conn.getInputStream());
             
diff --git a/src/whitehole/ObjectSelectForm.form b/src/whitehole/ObjectSelectForm.form
index 34351a4..ee88ce7 100644
--- a/src/whitehole/ObjectSelectForm.form
+++ b/src/whitehole/ObjectSelectForm.form
@@ -27,175 +27,187 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jSplitPane1" alignment="0" pref="400" max="32767" attributes="0"/>
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jScrollPane1" max="32767" attributes="0"/>
+                  <Component id="jScrollPane3" alignment="1" max="32767" attributes="0"/>
+                  <Component id="jToolBar1" alignment="0" max="32767" attributes="0"/>
+                  <Group type="102" attributes="0">
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="txtSearch" min="-2" pref="225" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="261" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="txtObject" max="32767" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jSplitPane1" alignment="0" pref="537" max="32767" attributes="0"/>
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="txtSearch" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jScrollPane1" min="-2" pref="342" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="txtObject" alignment="3" min="-2" pref="23" max="-2" attributes="0"/>
+                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jToolBar1" min="-2" pref="25" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jScrollPane3" pref="301" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Container class="javax.swing.JSplitPane" name="jSplitPane1">
+    <Component class="javax.swing.JTextField" name="txtSearch">
+      <Events>
+        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtSearchKeyReleased"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
-        <Property name="dividerLocation" type="int" value="320"/>
-        <Property name="orientation" type="int" value="0"/>
-        <Property name="resizeWeight" type="double" value="1.0"/>
-        <Property name="focusable" type="boolean" value="false"/>
-        <Property name="lastDividerLocation" type="int" value="320"/>
+        <Property name="text" type="java.lang.String" value="Search: "/>
+        <Property name="toolTipText" type="java.lang.String" value=""/>
       </Properties>
+    </Component>
+    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+      <AuxValues>
+        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+      </AuxValues>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
-        <Container class="javax.swing.JPanel" name="jPanel1">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="top"/>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JToolBar" name="jToolBar1">
-              <Properties>
-                <Property name="floatable" type="boolean" value="false"/>
-                <Property name="rollover" type="boolean" value="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="First"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JLabel" name="jLabel1">
-                  <Properties>
-                    <Property name="text" type="java.lang.String" value="Search: "/>
-                    <Property name="toolTipText" type="java.lang.String" value=""/>
-                  </Properties>
-                </Component>
-                <Component class="javax.swing.JTextField" name="txtSearch">
-                  <Events>
-                    <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtSearchKeyReleased"/>
-                  </Events>
-                </Component>
-              </SubComponents>
-            </Container>
-            <Container class="javax.swing.JScrollPane" name="jScrollPane1">
-              <AuxValues>
-                <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-              </AuxValues>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Center"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JTree" name="tvObjectList">
-                  <Properties>
-                    <Property name="model" type="javax.swing.tree.TreeModel" editor="org.netbeans.modules.form.editors2.TreeModelEditor">
-                      <TreeModel code=""/>
-                    </Property>
-                    <Property name="showsRootHandles" type="boolean" value="true"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tvObjectListMouseClicked"/>
-                    <EventHandler event="valueChanged" listener="javax.swing.event.TreeSelectionListener" parameters="javax.swing.event.TreeSelectionEvent" handler="tvObjectListValueChanged"/>
-                  </Events>
-                </Component>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
-        <Container class="javax.swing.JPanel" name="jPanel2">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JScrollPane" name="jScrollPane3">
-              <AuxValues>
-                <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-              </AuxValues>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Center"/>
-                </Constraint>
-              </Constraints>
+        <Component class="javax.swing.JTree" name="tvObjectList">
+          <Properties>
+            <Property name="model" type="javax.swing.tree.TreeModel" editor="org.netbeans.modules.form.editors2.TreeModelEditor">
+              <TreeModel code=""/>
+            </Property>
+            <Property name="showsRootHandles" type="boolean" value="true"/>
+          </Properties>
+          <Events>
+            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="tvObjectListMouseClicked"/>
+            <EventHandler event="valueChanged" listener="javax.swing.event.TreeSelectionListener" parameters="javax.swing.event.TreeSelectionEvent" handler="tvObjectListValueChanged"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Container class="javax.swing.JScrollPane" name="jScrollPane3">
+      <AuxValues>
+        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+      </AuxValues>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JEditorPane" name="epObjDescription">
-                  <Properties>
-                    <Property name="editable" type="boolean" value="false"/>
-                    <Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/>
-                  </Properties>
-                </Component>
-              </SubComponents>
-            </Container>
-            <Container class="javax.swing.JToolBar" name="jToolBar2">
-              <Properties>
-                <Property name="floatable" type="boolean" value="false"/>
-                <Property name="rollover" type="boolean" value="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Last"/>
-                </Constraint>
-              </Constraints>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JEditorPane" name="epObjDescription">
+          <Properties>
+            <Property name="editable" type="boolean" value="false"/>
+            <Property name="contentType" type="java.lang.String" value="text/html" noResource="true"/>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Container class="javax.swing.JToolBar" name="jToolBar1">
+      <Properties>
+        <Property name="floatable" type="boolean" value="false"/>
+        <Property name="rollover" type="boolean" value="true"/>
+      </Properties>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JLabel" name="lblZone">
-                  <Properties>
-                    <Property name="text" type="java.lang.String" value="Add to zone: "/>
-                  </Properties>
-                </Component>
-                <Component class="javax.swing.JComboBox" name="cbxZone">
-                  <Properties>
-                    <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                      <StringArray count="0"/>
-                    </Property>
-                  </Properties>
-                </Component>
-                <Component class="javax.swing.JLabel" name="lblLayer">
-                  <Properties>
-                    <Property name="text" type="java.lang.String" value=" Layer: "/>
-                  </Properties>
-                </Component>
-                <Component class="javax.swing.JComboBox" name="cbxLayer">
-                  <Properties>
-                    <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                      <StringArray count="0"/>
-                    </Property>
-                  </Properties>
-                </Component>
-                <Component class="javax.swing.JToolBar$Separator" name="sepSelect">
-                </Component>
-                <Component class="javax.swing.JButton" name="btnSelect">
-                  <Properties>
-                    <Property name="text" type="java.lang.String" value="Select"/>
-                    <Property name="enabled" type="boolean" value="false"/>
-                    <Property name="focusable" type="boolean" value="false"/>
-                    <Property name="horizontalTextPosition" type="int" value="0"/>
-                    <Property name="verticalTextPosition" type="int" value="3"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSelectActionPerformed"/>
-                  </Events>
-                </Component>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="lblZone">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Zone: "/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="cbxZone">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="0"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.Box$Filler" name="filler1">
+          <Properties>
+            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[10, 32767]"/>
+            </Property>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[10, 0]"/>
+            </Property>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[10, 0]"/>
+            </Property>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.HorizontalStrut"/>
+          </AuxValues>
+        </Component>
+        <Component class="javax.swing.JLabel" name="lblLayer">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Layer: "/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="cbxLayer">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="0"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.Box$Filler" name="filler2">
+          <Properties>
+            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[8, 32767]"/>
+            </Property>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[8, 0]"/>
+            </Property>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[8, 0]"/>
+            </Property>
+          </Properties>
+          <AuxValues>
+            <AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.HorizontalStrut"/>
+          </AuxValues>
+        </Component>
+        <Component class="javax.swing.JButton" name="btnSelect">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Select"/>
+            <Property name="enabled" type="boolean" value="false"/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSelectActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
+    <Component class="javax.swing.JLabel" name="jLabel2">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Object: "/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="txtObject">
+      <Events>
+        <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="txtObjectKeyReleased"/>
+      </Events>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/src/whitehole/ObjectSelectForm.java b/src/whitehole/ObjectSelectForm.java
index 6d53490..7d0349c 100644
--- a/src/whitehole/ObjectSelectForm.java
+++ b/src/whitehole/ObjectSelectForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -46,7 +43,8 @@ public ObjectSelectForm(java.awt.Frame parent, int game, String selobj)
             cbxZone.setVisible(false);
             lblLayer.setVisible(false);
             cbxLayer.setVisible(false);
-            sepSelect.setVisible(false);
+            filler1.setVisible(false);
+            filler2.setVisible(false);
             
             selectedZone = "#lolz#";
             selectedLayer = "#lolz#";
@@ -58,7 +56,7 @@ public ObjectSelectForm(java.awt.Frame parent, int game, String selobj)
             {
                 lblZone.setVisible(false);
                 cbxZone.setVisible(false);
-                lblLayer.setText("Add to layer: ");
+                filler1.setVisible(false);
                 
                 selectedZone = "#lolz#";
             }
@@ -88,23 +86,22 @@ public ObjectSelectForm(java.awt.Frame parent, int game, String selobj)
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        jSplitPane1 = new javax.swing.JSplitPane();
-        jPanel1 = new javax.swing.JPanel();
-        jToolBar1 = new javax.swing.JToolBar();
-        jLabel1 = new javax.swing.JLabel();
         txtSearch = new javax.swing.JTextField();
+        jLabel1 = new javax.swing.JLabel();
         jScrollPane1 = new javax.swing.JScrollPane();
         tvObjectList = new javax.swing.JTree();
-        jPanel2 = new javax.swing.JPanel();
         jScrollPane3 = new javax.swing.JScrollPane();
         epObjDescription = new javax.swing.JEditorPane();
-        jToolBar2 = new javax.swing.JToolBar();
+        jToolBar1 = new javax.swing.JToolBar();
         lblZone = new javax.swing.JLabel();
         cbxZone = new javax.swing.JComboBox();
+        filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(10, 0), new java.awt.Dimension(10, 0), new java.awt.Dimension(10, 32767));
         lblLayer = new javax.swing.JLabel();
         cbxLayer = new javax.swing.JComboBox();
-        sepSelect = new javax.swing.JToolBar.Separator();
+        filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(8, 0), new java.awt.Dimension(8, 0), new java.awt.Dimension(8, 32767));
         btnSelect = new javax.swing.JButton();
+        jLabel2 = new javax.swing.JLabel();
+        txtObject = new javax.swing.JTextField();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setTitle("Select object");
@@ -114,29 +111,14 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
             }
         });
 
-        jSplitPane1.setDividerLocation(320);
-        jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
-        jSplitPane1.setResizeWeight(1.0);
-        jSplitPane1.setFocusable(false);
-        jSplitPane1.setLastDividerLocation(320);
-
-        jPanel1.setLayout(new java.awt.BorderLayout());
-
-        jToolBar1.setFloatable(false);
-        jToolBar1.setRollover(true);
-
-        jLabel1.setText("Search: ");
-        jLabel1.setToolTipText("");
-        jToolBar1.add(jLabel1);
-
         txtSearch.addKeyListener(new java.awt.event.KeyAdapter() {
             public void keyReleased(java.awt.event.KeyEvent evt) {
                 txtSearchKeyReleased(evt);
             }
         });
-        jToolBar1.add(txtSearch);
 
-        jPanel1.add(jToolBar1, java.awt.BorderLayout.PAGE_START);
+        jLabel1.setText("Search: ");
+        jLabel1.setToolTipText("");
 
         javax.swing.tree.DefaultMutableTreeNode treeNode1 = new javax.swing.tree.DefaultMutableTreeNode("root");
         tvObjectList.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1));
@@ -153,31 +135,24 @@ public void valueChanged(javax.swing.event.TreeSelectionEvent evt) {
         });
         jScrollPane1.setViewportView(tvObjectList);
 
-        jPanel1.add(jScrollPane1, java.awt.BorderLayout.CENTER);
-
-        jSplitPane1.setTopComponent(jPanel1);
-
-        jPanel2.setLayout(new java.awt.BorderLayout());
-
         epObjDescription.setEditable(false);
         epObjDescription.setContentType("text/html"); // NOI18N
         jScrollPane3.setViewportView(epObjDescription);
 
-        jPanel2.add(jScrollPane3, java.awt.BorderLayout.CENTER);
-
-        jToolBar2.setFloatable(false);
-        jToolBar2.setRollover(true);
+        jToolBar1.setFloatable(false);
+        jToolBar1.setRollover(true);
 
-        lblZone.setText("Add to zone: ");
-        jToolBar2.add(lblZone);
+        lblZone.setText("Zone: ");
+        jToolBar1.add(lblZone);
 
-        jToolBar2.add(cbxZone);
+        jToolBar1.add(cbxZone);
+        jToolBar1.add(filler1);
 
-        lblLayer.setText(" Layer: ");
-        jToolBar2.add(lblLayer);
+        lblLayer.setText("Layer: ");
+        jToolBar1.add(lblLayer);
 
-        jToolBar2.add(cbxLayer);
-        jToolBar2.add(sepSelect);
+        jToolBar1.add(cbxLayer);
+        jToolBar1.add(filler2);
 
         btnSelect.setText("Select");
         btnSelect.setEnabled(false);
@@ -189,21 +164,55 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnSelectActionPerformed(evt);
             }
         });
-        jToolBar2.add(btnSelect);
+        jToolBar1.add(btnSelect);
 
-        jPanel2.add(jToolBar2, java.awt.BorderLayout.PAGE_END);
+        jLabel2.setText("Object: ");
 
-        jSplitPane1.setRightComponent(jPanel2);
+        txtObject.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyReleased(java.awt.event.KeyEvent evt) {
+                txtObjectKeyReleased(evt);
+            }
+        });
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane1)
+                    .addComponent(jScrollPane3, javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel1)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(txtSearch, javax.swing.GroupLayout.PREFERRED_SIZE, 225, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(0, 261, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel2)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(txtObject)))
+                .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 537, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(txtSearch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 342, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(txtObject, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel2))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 301, Short.MAX_VALUE)
+                .addContainerGap())
         );
 
         pack();
@@ -258,41 +267,58 @@ private void formWindowOpened(java.awt.event.WindowEvent evt)//GEN-FIRST:event_f
 
     private void tvObjectListValueChanged(javax.swing.event.TreeSelectionEvent evt)//GEN-FIRST:event_tvObjectListValueChanged
     {//GEN-HEADEREND:event_tvObjectListValueChanged
-        if (tvObjectList.getSelectionPath() == null)
-        {
-            epObjDescription.setText("");
-            btnSelect.setEnabled(false);
-            return;
-        }
-        
         MutableTreeNode tn = (MutableTreeNode)tvObjectList.getSelectionPath().getLastPathComponent();
-        if (tn.getClass() != MyObjTreeNode.class)
+        if (tn.getClass() != MyObjTreeNode.class || tvObjectList.getSelectionPath() == null)
         {
             epObjDescription.setText("");
             btnSelect.setEnabled(false);
             return;
         }
-        
         ObjectDB.Object dbinfo = ObjectDB.objects.get(((MyObjTreeNode)tn).objectID);
         
-        epObjDescription.setText(String.format(
-                "<b>%1$s</b> (%2$s)<br><br>%3$s", 
-                dbinfo.name, dbinfo.ID, dbinfo.notes));
+        switch (dbinfo.games) {
+            default: objGame = "<i>Unknown</i>"; break;
+            case 1: objGame = "SMG1"; break;
+            case 2: objGame = "SMG2"; break;
+            case 3: objGame = "SMG1 & SMG2"; break;
+        }
+        
+        if (dbinfo.known == 0 && dbinfo.complete == 0) {
+            objStatus = "<i>(This object's purpose is not known yet!)</i>";
+        }
+        else if ((dbinfo.known == 1 && dbinfo.complete == 0) || (dbinfo.known == 0 && dbinfo.complete == 1)) {
+            objStatus = "<i>(This object is not fully known!)</i>";
+        }
+        else if (dbinfo.known == 1 && dbinfo.complete == 1) {
+            objStatus = "<i>(This object has been fully documented!)</i>";
+        }
+        else {
+            objStatus = "<i>(Unknown)</i>";
+        }
         
+        txtObject.setText(((MyObjTreeNode)tn).objectID);
+        epObjDescription.setText(
+                "<b>" + dbinfo.name + "</b> (" + dbinfo.ID + ")<br>" +
+                objStatus + "<br>" + 
+                "<b>Games:</b> " + objGame + "<br>" + 
+                "<b>Type:</b> " + dbinfo.type + "<br>" + 
+                "<br>" + 
+                dbinfo.notes + "<br>" +
+                "<br>" + 
+                "<b>Obj_args:</b><br>" + dbinfo.dataFields + "<br>" + 
+                "<b>Files:</b><br>" + dbinfo.dataFiles + "<br>"
+        );
+        epObjDescription.setCaretPosition(0);
         btnSelect.setEnabled(true);
     }//GEN-LAST:event_tvObjectListValueChanged
 
     private void btnSelectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnSelectActionPerformed
     {//GEN-HEADEREND:event_btnSelectActionPerformed
-        MutableTreeNode tn = (MutableTreeNode)tvObjectList.getSelectionPath().getLastPathComponent();
-        if (tn.getClass() != MyObjTreeNode.class)
-        {
-            throw new NullPointerException("oops");
-        }
-        
-        selectedObject = ((MyObjTreeNode)tn).objectID;
-        if (!selectedZone.equals("#lolz#")) selectedZone = (String)cbxZone.getSelectedItem();
-        if (!selectedLayer.equals("#lolz#")) selectedLayer = (String)cbxLayer.getSelectedItem();
+        selectedObject = txtObject.getText();
+        if (!selectedZone.equals("#lolz#"))
+            selectedZone = (String)cbxZone.getSelectedItem();
+        if (!selectedLayer.equals("#lolz#"))
+            selectedLayer = (String)cbxLayer.getSelectedItem();
         dispose();
     }//GEN-LAST:event_btnSelectActionPerformed
 
@@ -338,11 +364,20 @@ private void tvObjectListMouseClicked(java.awt.event.MouseEvent evt)//GEN-FIRST:
         dispose();
     }//GEN-LAST:event_tvObjectListMouseClicked
 
+    private void txtObjectKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtObjectKeyReleased
+        selectedObject = txtObject.getText();
+        if (selectedObject.isEmpty()) {
+            btnSelect.setEnabled(false);
+        }
+        else {
+            btnSelect.setEnabled(true);
+        }
+    }//GEN-LAST:event_txtObjectKeyReleased
+
     
     public class MyObjTreeNode implements MutableTreeNode
     {
-        public MyObjTreeNode(String objid)
-        {
+        public MyObjTreeNode(String objid) {
             this.parent = null;
             this.objectID = objid;
         }
@@ -428,6 +463,7 @@ public String toString()
     
     
     private int game;
+    private String objGame, objStatus;
     public String selectedObject, selectedZone, selectedLayer;
     private DefaultMutableTreeNode objList, searchList;
 
@@ -436,18 +472,17 @@ public String toString()
     private javax.swing.JComboBox cbxLayer;
     private javax.swing.JComboBox cbxZone;
     private javax.swing.JEditorPane epObjDescription;
+    private javax.swing.Box.Filler filler1;
+    private javax.swing.Box.Filler filler2;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JPanel jPanel1;
-    private javax.swing.JPanel jPanel2;
+    private javax.swing.JLabel jLabel2;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JScrollPane jScrollPane3;
-    private javax.swing.JSplitPane jSplitPane1;
     private javax.swing.JToolBar jToolBar1;
-    private javax.swing.JToolBar jToolBar2;
     private javax.swing.JLabel lblLayer;
     private javax.swing.JLabel lblZone;
-    private javax.swing.JToolBar.Separator sepSelect;
     private javax.swing.JTree tvObjectList;
+    private javax.swing.JTextField txtObject;
     private javax.swing.JTextField txtSearch;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/src/whitehole/PropertyGrid.java b/src/whitehole/PropertyGrid.java
index 37b903e..a39c7d8 100644
--- a/src/whitehole/PropertyGrid.java
+++ b/src/whitehole/PropertyGrid.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -702,4 +699,4 @@ public interface EventListener
     
     private LabelCellRenderer labelRenderer;
     private LabelCellEditor labelEditor;
-}
+}
\ No newline at end of file
diff --git a/src/whitehole/Settings.java b/src/whitehole/Settings.java
index b8a5473..77165c0 100644
--- a/src/whitehole/Settings.java
+++ b/src/whitehole/Settings.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -26,32 +23,38 @@ public static void initialize()
     {
         Preferences prefs = Preferences.userRoot();
         objectDBUpdate = prefs.getBoolean("ObjectDBUpdate", true);
-        dbKuribo64 = prefs.getBoolean("DbKuribo64", true);
-        dbEggStarGalaxy = prefs.getBoolean("DbEggStarGalaxy", false);
+        yaz0enc = prefs.getBoolean("Yaz0Enc", true);
         
         useShaders = prefs.getBoolean("UseShaders", true);
         fastDrag = prefs.getBoolean("FastDrag", false);
         reverseRot = prefs.getBoolean("ReverseRot", false);
+        
+        themeMetal = prefs.getBoolean("ThemeMetal", false);
+        themeSystem = prefs.getBoolean("ThemeSystem", true);
     }
     
     public static void save()
     {
         Preferences prefs = Preferences.userRoot();
         prefs.putBoolean("ObjectDBUpdate", objectDBUpdate);
-        prefs.putBoolean("DbKuribo64", dbKuribo64);
-        prefs.putBoolean("DbEggStarGalaxy", dbEggStarGalaxy);
+        prefs.putBoolean("Yaz0enc", yaz0enc);
         
         prefs.putBoolean("UseShaders", useShaders);
         prefs.putBoolean("FastDrag", fastDrag);
         prefs.putBoolean("ReverseRot", reverseRot);
+        
+        prefs.putBoolean("ThemeMetal", themeMetal);
+        prefs.putBoolean("ThemeSystem", themeSystem);
     }
     
     
     public static boolean objectDBUpdate;
-    public static boolean dbKuribo64;
-    public static boolean dbEggStarGalaxy;
+    public static boolean yaz0enc;
     
     public static boolean useShaders;
     public static boolean fastDrag;
     public static boolean reverseRot;
+    
+    public static boolean themeMetal;
+    public static boolean themeSystem;
 }
diff --git a/src/whitehole/SettingsForm.form b/src/whitehole/SettingsForm.form
index 6eff1a5..112b50b 100644
--- a/src/whitehole/SettingsForm.form
+++ b/src/whitehole/SettingsForm.form
@@ -34,13 +34,7 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" attributes="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      <Component id="btnOk" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="btnCancel" min="-2" max="-2" attributes="0"/>
-                  </Group>
+              <Group type="103" groupAlignment="1" attributes="0">
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" alignment="0" attributes="0">
@@ -57,17 +51,25 @@
                       </Group>
                       <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
+                  <Group type="102" alignment="1" attributes="0">
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="btnOk" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="btnCancel" min="-2" max="-2" attributes="0"/>
+                  </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
-          <Group type="102" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="radKuribo64" min="-2" max="-2" attributes="0"/>
+                  <Component id="chkYaz0" min="-2" max="-2" attributes="0"/>
+                  <Component id="radThemeJava" min="-2" max="-2" attributes="0"/>
+                  <Component id="radThemeSys" min="-2" max="-2" attributes="0"/>
                   <Component id="chkObjectDBUpdate" alignment="0" min="-2" max="-2" attributes="0"/>
                   <Component id="lblRendering" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="lblObjectDatabase1" alignment="0" min="-2" max="-2" attributes="0"/>
                   <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="radNeoMarioGalaxy" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="0" pref="8" max="32767" attributes="0"/>
           </Group>
@@ -82,16 +84,20 @@
               <Component id="chkUseShaders" min="-2" pref="20" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="chkFastDrag" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
               <Component id="lblObjectDatabase" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
               <Component id="chkObjectDBUpdate" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="radKuribo64" min="-2" max="-2" attributes="0"/>
+              <Component id="chkYaz0" min="-2" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Component id="lblObjectDatabase1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="radThemeSys" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="radNeoMarioGalaxy" min="-2" max="-2" attributes="0"/>
+              <Component id="radThemeJava" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="btnCancel" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -117,9 +123,6 @@
       <Properties>
         <Property name="text" type="java.lang.String" value="Use shaders for 3D rendering"/>
       </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkUseShadersActionPerformed"/>
-      </Events>
     </Component>
     <Component class="javax.swing.JCheckBox" name="chkFastDrag">
       <Properties>
@@ -158,25 +161,41 @@
         <Property name="text" type="java.lang.String" value="Rendering"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JRadioButton" name="radKuribo64">
+    <Component class="javax.swing.JLabel" name="lblObjectDatabase1">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Tahoma" size="11" style="1"/>
+        </Property>
+        <Property name="text" type="java.lang.String" value="Theme"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="radThemeSys">
       <Properties>
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="buttonGroup1"/>
+          <ComponentRef name="buttonGroup2"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="Kuribo64"/>
+        <Property name="text" type="java.lang.String" value="System"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JRadioButton" name="radNeoMarioGalaxy">
+    <Component class="javax.swing.JRadioButton" name="radThemeJava">
       <Properties>
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="buttonGroup1"/>
+          <ComponentRef name="buttonGroup2"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="Neo Mario Galaxy"/>
+        <Property name="text" type="java.lang.String" value="Java L&amp;F"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Select a server to download the database from:"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Tahoma" size="11" style="1"/>
+        </Property>
+        <Property name="text" type="java.lang.String" value="Saving"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="chkYaz0">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Yaz0 encode when saving"/>
       </Properties>
     </Component>
   </SubComponents>
diff --git a/src/whitehole/SettingsForm.java b/src/whitehole/SettingsForm.java
index 41f017b..65601fe 100644
--- a/src/whitehole/SettingsForm.java
+++ b/src/whitehole/SettingsForm.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -44,9 +41,11 @@ private void initComponents() {
         btnOk = new javax.swing.JButton();
         lblObjectDatabase = new javax.swing.JLabel();
         lblRendering = new javax.swing.JLabel();
-        radKuribo64 = new javax.swing.JRadioButton();
-        radNeoMarioGalaxy = new javax.swing.JRadioButton();
+        lblObjectDatabase1 = new javax.swing.JLabel();
+        radThemeSys = new javax.swing.JRadioButton();
+        radThemeJava = new javax.swing.JRadioButton();
         jLabel1 = new javax.swing.JLabel();
+        chkYaz0 = new javax.swing.JCheckBox();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setTitle("Settings");
@@ -60,11 +59,6 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
         chkObjectDBUpdate.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
 
         chkUseShaders.setText("Use shaders for 3D rendering");
-        chkUseShaders.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                chkUseShadersActionPerformed(evt);
-            }
-        });
 
         chkFastDrag.setText("Render objects in low-res when dragging");
 
@@ -88,25 +82,26 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         lblRendering.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
         lblRendering.setText("Rendering");
 
-        buttonGroup1.add(radKuribo64);
-        radKuribo64.setText("Kuribo64");
+        lblObjectDatabase1.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
+        lblObjectDatabase1.setText("Theme");
+
+        buttonGroup2.add(radThemeSys);
+        radThemeSys.setText("System");
 
-        buttonGroup1.add(radNeoMarioGalaxy);
-        radNeoMarioGalaxy.setText("Neo Mario Galaxy");
+        buttonGroup2.add(radThemeJava);
+        radThemeJava.setText("Java L&F");
 
-        jLabel1.setText("Select a server to download the database from:");
+        jLabel1.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
+        jLabel1.setText("Saving");
+
+        chkYaz0.setText("Yaz0 encode when saving");
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addGap(0, 0, Short.MAX_VALUE)
-                        .addComponent(btnOk)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(btnCancel))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
@@ -117,16 +112,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addComponent(chkUseShaders)
                                     .addComponent(chkFastDrag))))
-                        .addGap(0, 0, Short.MAX_VALUE)))
+                        .addGap(0, 0, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addComponent(btnOk)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(btnCancel)))
                 .addContainerGap())
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(radKuribo64)
+                    .addComponent(chkYaz0)
+                    .addComponent(radThemeJava)
+                    .addComponent(radThemeSys)
                     .addComponent(chkObjectDBUpdate)
                     .addComponent(lblRendering)
-                    .addComponent(jLabel1)
-                    .addComponent(radNeoMarioGalaxy))
+                    .addComponent(lblObjectDatabase1)
+                    .addComponent(jLabel1))
                 .addGap(0, 8, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -138,16 +140,20 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addComponent(chkUseShaders, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(chkFastDrag)
-                .addGap(23, 23, 23)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(lblObjectDatabase)
                 .addGap(1, 1, 1)
                 .addComponent(chkObjectDBUpdate)
-                .addGap(1, 1, 1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jLabel1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(radKuribo64)
+                .addComponent(chkYaz0)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(lblObjectDatabase1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(radThemeSys)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(radNeoMarioGalaxy)
+                .addComponent(radThemeJava)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(btnCancel)
@@ -163,8 +169,9 @@ private void formWindowOpened(java.awt.event.WindowEvent evt)//GEN-FIRST:event_f
         chkObjectDBUpdate.setSelected(Settings.objectDBUpdate);
         chkUseShaders.setSelected(Settings.useShaders);
         chkFastDrag.setSelected(Settings.fastDrag);
-        radKuribo64.setSelected(Settings.dbKuribo64);
-        radNeoMarioGalaxy.setSelected(Settings.dbEggStarGalaxy);
+        chkYaz0.setSelected(Settings.yaz0enc);
+        radThemeSys.setSelected(Settings.themeSystem);
+        radThemeJava.setSelected(Settings.themeMetal);
     }//GEN-LAST:event_formWindowOpened
 
     private void btnCancelActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnCancelActionPerformed
@@ -177,16 +184,13 @@ private void btnOkActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:eve
         Settings.objectDBUpdate = chkObjectDBUpdate.isSelected();
         Settings.useShaders = chkUseShaders.isSelected();
         Settings.fastDrag = chkFastDrag.isSelected();
-        Settings.dbKuribo64 = radKuribo64.isSelected();
-        Settings.dbEggStarGalaxy = radNeoMarioGalaxy.isSelected();
+        Settings.yaz0enc = chkYaz0.isSelected();
+        Settings.themeSystem = radThemeSys.isSelected();
+        Settings.themeMetal = radThemeJava.isSelected();
         Settings.save();
         dispose();
     }//GEN-LAST:event_btnOkActionPerformed
 
-    private void chkUseShadersActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkUseShadersActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_chkUseShadersActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btnCancel;
     private javax.swing.JButton btnOk;
@@ -195,10 +199,12 @@ private void chkUseShadersActionPerformed(java.awt.event.ActionEvent evt) {//GEN
     private javax.swing.JCheckBox chkFastDrag;
     private javax.swing.JCheckBox chkObjectDBUpdate;
     private javax.swing.JCheckBox chkUseShaders;
+    private javax.swing.JCheckBox chkYaz0;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel lblObjectDatabase;
+    private javax.swing.JLabel lblObjectDatabase1;
     private javax.swing.JLabel lblRendering;
-    private javax.swing.JRadioButton radKuribo64;
-    private javax.swing.JRadioButton radNeoMarioGalaxy;
+    private javax.swing.JRadioButton radThemeJava;
+    private javax.swing.JRadioButton radThemeSys;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/src/whitehole/StrictThreadGroup.java b/src/whitehole/StrictThreadGroup.java
index a0356c0..ff97c08 100644
--- a/src/whitehole/StrictThreadGroup.java
+++ b/src/whitehole/StrictThreadGroup.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/SuperFastHash.java b/src/whitehole/SuperFastHash.java
index 4ca49e2..17d1845 100644
--- a/src/whitehole/SuperFastHash.java
+++ b/src/whitehole/SuperFastHash.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/ToolbarFlowLayout.java b/src/whitehole/ToolbarFlowLayout.java
index eb46715..862f5e4 100644
--- a/src/whitehole/ToolbarFlowLayout.java
+++ b/src/whitehole/ToolbarFlowLayout.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/Whitehole.java b/src/whitehole/Whitehole.java
index f25e548..97a66de 100644
--- a/src/whitehole/Whitehole.java
+++ b/src/whitehole/Whitehole.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -34,13 +31,14 @@ public class Whitehole
 {
     
     public static final String name = "Whitehole";
-    public static final String version = "v1.4.2";
-    public static String fullName = name + " " + version;
-    public static final String websiteURL = "http://eggstargalaxy.bplaced.net/";
-    public static final String crashReportURL = "http://eggstargalaxy.bplaced.net/?page=thread&id=148";
+    public static final String version = "v1.4.2.2";
+    public static final String status = "";
+    public static String fullName = name + " " + version + status;
+    public static final String websiteURL = "http://neomariogalaxy.bplaced.net/";
+    public static final String crashReportURL = "http://neomariogalaxy.bplaced.net/?page=thread&id=148";
     
     public static GameArchive game;
-    public static int getGameType;
+    public static int gameType;
     
     
     public class UncaughtExceptionHandler
@@ -50,7 +48,7 @@ public void handle(Throwable throwable)
             System.out.println(throwable.getMessage());
         }
     }
-    
+
     public static void doRun()
     {
         if (!Charset.isSupported("SJIS"))
@@ -72,7 +70,12 @@ public static void doRun()
 
         try
         {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            if (Settings.themeMetal) {
+                UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+            }
+            else {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            }
         }
         catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex)
         {
diff --git a/src/whitehole/fileio/ExternalFile.java b/src/whitehole/fileio/ExternalFile.java
index dbf4abb..09cc1bb 100644
--- a/src/whitehole/fileio/ExternalFile.java
+++ b/src/whitehole/fileio/ExternalFile.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/ExternalFilesystem.java b/src/whitehole/fileio/ExternalFilesystem.java
index e5aee2c..2e06a3e 100644
--- a/src/whitehole/fileio/ExternalFilesystem.java
+++ b/src/whitehole/fileio/ExternalFilesystem.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/FileBase.java b/src/whitehole/fileio/FileBase.java
index a191921..00dc7a7 100644
--- a/src/whitehole/fileio/FileBase.java
+++ b/src/whitehole/fileio/FileBase.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/FilesystemBase.java b/src/whitehole/fileio/FilesystemBase.java
index 3e424f2..40e496d 100644
--- a/src/whitehole/fileio/FilesystemBase.java
+++ b/src/whitehole/fileio/FilesystemBase.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/MemoryFile.java b/src/whitehole/fileio/MemoryFile.java
index 448ae01..bc43762 100644
--- a/src/whitehole/fileio/MemoryFile.java
+++ b/src/whitehole/fileio/MemoryFile.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/RarcFile.java b/src/whitehole/fileio/RarcFile.java
index ee60376..6c022d6 100644
--- a/src/whitehole/fileio/RarcFile.java
+++ b/src/whitehole/fileio/RarcFile.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/RarcFilesystem.java b/src/whitehole/fileio/RarcFilesystem.java
index 82db5a1..ef056fe 100644
--- a/src/whitehole/fileio/RarcFilesystem.java
+++ b/src/whitehole/fileio/RarcFilesystem.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/Yaz0.java b/src/whitehole/fileio/Yaz0.java
index 3b5c33e..f4dbec1 100644
--- a/src/whitehole/fileio/Yaz0.java
+++ b/src/whitehole/fileio/Yaz0.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/fileio/Yaz0File.java b/src/whitehole/fileio/Yaz0File.java
index 4b969a6..c84a289 100644
--- a/src/whitehole/fileio/Yaz0File.java
+++ b/src/whitehole/fileio/Yaz0File.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -19,6 +16,7 @@
 package whitehole.fileio;
 
 import java.io.IOException;
+import whitehole.Settings;
 
 public class Yaz0File extends MemoryFile
 {
@@ -35,7 +33,13 @@ public Yaz0File(FileBase backendfile) throws IOException
     @Override
     public void save() throws IOException
     {
-        byte[] compbuffer = buffer;//Yaz0.compress(buffer);
+        byte[] compbuffer;
+        if (Settings.yaz0enc) {
+            compbuffer = Yaz0.compress(buffer);
+        }
+        else {
+            compbuffer = buffer;
+        }
         
         if (backend != null)
         {
diff --git a/src/whitehole/rendering/AreaCubeRenderer.java b/src/whitehole/rendering/AreaCubeRenderer.java
index b82ba74..2fb6827 100644
--- a/src/whitehole/rendering/AreaCubeRenderer.java
+++ b/src/whitehole/rendering/AreaCubeRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/BmdRenderer.java b/src/whitehole/rendering/BmdRenderer.java
index d9ee3e0..72be9ae 100644
--- a/src/whitehole/rendering/BmdRenderer.java
+++ b/src/whitehole/rendering/BmdRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/BtiRenderer.java b/src/whitehole/rendering/BtiRenderer.java
index 0c57b30..d8159e3 100644
--- a/src/whitehole/rendering/BtiRenderer.java
+++ b/src/whitehole/rendering/BtiRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -24,7 +21,6 @@
 import javax.media.opengl.GLException;
 import whitehole.Whitehole;
 import whitehole.fileio.RarcFilesystem;
-import whitehole.smg.Bmd;
 import whitehole.smg.Bti;
 import whitehole.vectors.Vector3;
 
diff --git a/src/whitehole/rendering/ColorCubeRenderer.java b/src/whitehole/rendering/ColorCubeRenderer.java
index 789351a..56a846a 100644
--- a/src/whitehole/rendering/ColorCubeRenderer.java
+++ b/src/whitehole/rendering/ColorCubeRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/DoubleBmdRenderer.java b/src/whitehole/rendering/DoubleBmdRenderer.java
index a8e070a..cb90aa9 100644
--- a/src/whitehole/rendering/DoubleBmdRenderer.java
+++ b/src/whitehole/rendering/DoubleBmdRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/GLRenderer.java b/src/whitehole/rendering/GLRenderer.java
index dd4bc04..c59e6d9 100644
--- a/src/whitehole/rendering/GLRenderer.java
+++ b/src/whitehole/rendering/GLRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/Helper.java b/src/whitehole/rendering/Helper.java
index e125d35..c4bc93e 100644
--- a/src/whitehole/rendering/Helper.java
+++ b/src/whitehole/rendering/Helper.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/ObjectModelSubstitutor.java b/src/whitehole/rendering/ObjectModelSubstitutor.java
index 2debac1..3564538 100644
--- a/src/whitehole/rendering/ObjectModelSubstitutor.java
+++ b/src/whitehole/rendering/ObjectModelSubstitutor.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -18,17 +15,16 @@
 
 package whitehole.rendering;
 
-import whitehole.rendering.objRenderer.UFOKinoko;
-import whitehole.rendering.objRenderer.Kinopio;
 import whitehole.rendering.objRenderer.AstroPart;
-import whitehole.rendering.objRenderer.PowerStar;
 import whitehole.rendering.objRenderer.AstroSky;
 import whitehole.rendering.objRenderer.Pole;
-import whitehole.rendering.objRenderer.PoleSquare;
-import java.io.IOException;
+import whitehole.rendering.objRenderer.PowerStar;
+import whitehole.rendering.objRenderer.Kinopio;
+import whitehole.rendering.objRenderer.SuperSpinDriver;
+import whitehole.rendering.objRenderer.UFOKinoko;
+import whitehole.smg.LevelObject;
 import whitehole.smg.object.PlanetObj;
 import whitehole.smg.object.AreaObj;
-import whitehole.smg.LevelObject;
 import whitehole.smg.object.CameraCubeObj;
 import whitehole.smg.object.ChangeObj;
 import whitehole.smg.object.ChildObj;
@@ -36,8 +32,10 @@
 import whitehole.smg.object.DebugObj;
 import whitehole.smg.object.SoundObj;
 import whitehole.smg.object.GeneralPosObj;
+import whitehole.smg.object.StageObj;
 import whitehole.vectors.Color4;
 import whitehole.vectors.Vector3;
+import java.io.IOException;
 
 public class ObjectModelSubstitutor 
 {
@@ -56,14 +54,16 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "BigObstructBubbleGenerator": return "AirBubbleGenerator";
             case "Bomb": return "BombHei";
             case "BombLauncher": return "BombHeiLauncher";
+            case "BossKameck2": return "BossKameck";
+            case "BreakableCageRotate": return "BreakableCage";
             case "ButlerExplain":
             case "ButlerMap": return "Butler";
             case "CoinReplica": return "Coin";
             case "Creeper": return "CreeperFlower";
             case "CutBushGroup": return "CutBush";
             case "DemoKoopaJrShip": return "KoopaJrShip";
-            case "DinoPackunVs1": return "DinoPackun";
-            case "DinoPackunVs2": return "DinoPackun2";
+            case "DharmaSambo": return "DharmaSamboParts";
+            case "EarthenPipeInWater": return "EarthenPipe";
             case "FireBallBeamKameck": return "Kameck";
             case "FirePressureRadiate": return "FirePressure";
             case "FishGroupA": return "FishA";
@@ -79,15 +79,13 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "GoldenTurtle": return "KouraShine";
             case "Hanachan": return "HanachanHead";
             case "HanachanBig": return "HanachanHeadBig";
-            case "Horino": return "DrillBullet";
+            case "DrillBullet": return "Horino";
             case "InstantInferno": return "InfernoMario";
             case "ItemBlockSwitch": return "CoinBlock";
             case "JetTurtle": return "Koura";
             case "KameckKuriboMini":
             case "KameckMeramera": return "Kameck";
             case "Karikari": return "Karipon";
-            case "KinopioBank":
-            case "KinopioPostman": return "Kinopio";
             case "KirairaRail": return "Kiraira";
             case "KoopaBattleMapCoinPlate": return "KoopaPlateCoin";
             case "KoopaBattleMapPlate": return "KoopaPlate";
@@ -96,21 +94,25 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "KoopaStatueVomit": return "KoopaStatue";
             case "KoopaLv2":
             case "KoopaLv3":
-            case "KoopaLv4":
-            case "KoopaVs1":
-            case "KoopaVs2":
-            case "KoopaVs3": return "Koopa";
+            case "KoopaLv4": return "Koopa";
             case "LavaProminenceWithoutShadow": return "LavaProminence";
-            case "LuigiIntrusively": return "Luigi";
+            case "SpinLeverSwitchForceAnim": return "SpinLeverSwitch";
+            case "LuigiTalkNpc":
+            case "LuigiIntrusively": return "LuigiNpc";
             case "MagicBell": return "Bell";
-            case "MameMuimuiAttackMan":
-            case "MameMuimuiScorer":
-            case "MameMuimuiScorerLv2": return "ScoreAttackMan";
+            case "MameMuimuiAttackMan": return "ScoreAttackMan";
             case "MeteorCannon":
             case "MeteorStrikeEnvironment": return "MeteorStrike";
             case "MiniKoopaBattleVs1Galaxy":
             case "MiniKoopaBattleVs2Galaxy":
             case "MiniKoopaBattleVs3Galaxy": return "MiniKoopaGalaxy";
+            case "MorphItemCollectionBee": return "PowerUpBee";
+            case "MorphItemCollectionCloud": return "PowerUpCloud";
+            case "MorphItemCollectionDrill": return "ItemDrill";
+            case "MorphItemCollectionFire": return "PowerUpFire";
+            case "MorphItemCollectionHopper": return "PowerUpHopper";
+            case "MorphItemCollectionTeresa": return "PowerUpTeresa";
+            case "MorphItemCollectionRock": return "PowerUpRock";
             case "MorphItemNeoBee": return "PowerUpBee";
             case "MorphItemNeoFire": return "PowerUpFire";
             case "MorphItemNeoFoo": return "PowerUpFoo";
@@ -120,8 +122,6 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "MorphItemRock": return "PowerUpRock";
             case "NoteFairy": return "Note";
             case "OnimasuPivot": return "Onimasu";
-            case "PenguinRacer":
-            case "PenguinRacerLeader":
             case "PenguinSkater":
             case "PenguinStudent": return "Penguin";
             case "PlayAttackMan": return "ScoreAttackMan";
@@ -144,6 +144,7 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "SpinCloudMarioItem": return "PowerUpCloud";
             case "SplashCoinBlock":
             case "SplashPieceBlock": return "CoinBlock";
+            case "SuperDreamer": return "HelperWitch";
             case "SuperSpinDriverGreen":
             case "SuperSpinDriverPink": return "SuperSpinDriver";
             case "SurpBeltConveyerExGalaxy":
@@ -159,8 +160,8 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "SurpTransformationExGalaxy": return "MiniSurprisedGalaxy";
             case "TalkSyati": return "Syati";
             case "TamakoroWithTutorial": return "Tamakoro";
-            case "TeresaChief":
-            case "TeresaWater": return "Teresa";
+            case "Teresa":
+            case "TeresaChief": return "TeresaWater";
             case "TicoAstro":
             case "TicoDomeLecture": return "Tico";
             case "TicoFatCoin":
@@ -191,6 +192,7 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "TrickRabbitFreeRun":
             case "TrickRabbitFreeRunCollect":
             case "TrickRabbitGhost": return "TrickRabbit";
+            case "TripodBossCoin": return "Coin";
             case "TripodBossBottomKillerCannon":
             case "TripodBossKillerGenerator": return "TripodBossKillerCannon";
             case "TripodBossKinokoOneUp": return "KinokoOneUp";
@@ -200,7 +202,7 @@ public static String substituteModelName(LevelObject obj, String modelname)
             case "TubeSliderEnemy": return "Togezo";
             case "TubeSliderHana": return "HanachanHeadBig";
             case "TurtleBeamKameck": return "Kameck";
-            case "WaterSphere": return "VolumeSphere";
+            case "TwoLegsBullet": return "Horino";
             case "WingBlockCoin":
             case "WingBlockStarPiece": return "WingBlock";
             case "YoshiCapture": return "YCaptureTarget";
@@ -213,7 +215,8 @@ public static String substituteObjectKey(LevelObject obj, String objectkey)
         switch (obj.name)
         {
             case "Pole":
-            case "PoleSquare": objectkey += String.format("_%1$3f", obj.scale.y / obj.scale.x); break;
+            case "PoleSquare":
+            case "Pole2Way": objectkey += String.format("_%1$3f", obj.scale.y / obj.scale.x); break;
             case "Kinopio": 
             case "KinopioAstro": objectkey = String.format("object_Kinopio_%1$d", obj.data.get("Obj_arg1")); break; 
             case "UFOKinoko": objectkey = String.format("object_UFOKinoko_%1$d", obj.data.get("Obj_arg0")); break;
@@ -229,91 +232,87 @@ public static GLRenderer substituteRenderer(LevelObject obj, GLRenderer.RenderIn
     {
         try
         {
-            if (obj.getClass() == AreaObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 0.5f, 0.5f, 1f), new Color4(0.3f, 1f, 1f, 1f), true);
-            
-            if (obj.getClass() == CameraCubeObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(0.3f, 0f, 1f, 1f), new Color4(0.8f, 0f, 0f, 1f), true);
-            
-            if (obj.getClass() == ChildObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 1f, 1f, 1f), new Color4(1f, 0.5f, 0.5f, 0f), true);                         
-            
-            if (obj.getClass() == PlanetObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 0.5f, 0.5f, 1f), new Color4(0.8f, 0f, 0f, 1f), true);
-            
-            if (obj.getClass() == DemoObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 0.5f, 0.5f, 1f), new Color4(1.0f, 1.0f, 0.3f, 1f), true);
-            
-            if (obj.getClass() == GeneralPosObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 1f, 1f, 1f), new Color4(1f,0.5f,0f,1f), true);
-            
-            if (obj.getClass() == SoundObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 1f, 1f, 1f), new Color4(1f, 0.5f, 1f,1f), true);   
-            
-            if (obj.getClass() == ChangeObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 1f, 1f, 1f), new Color4(0f,0.8f,0f,1f), true); 
-            
-            if (obj.getClass() == DebugObj.class)
-                return new ColorCubeRenderer
-                (100f, new Color4(1f, 1f, 1f, 1f), new Color4(0.8f, 0.5f, 0.1f, 1f), true);       
+            if (obj.getClass() == AreaObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 0.5f, 0.5f), new Color4(0.3f, 1f, 1f), true);
+            if (obj.getClass() == CameraCubeObj.class) return new ColorCubeRenderer (100f, new Color4(0.3f, 0f, 1f), new Color4(0.8f, 0f, 0f), true);
+            if (obj.getClass() == ChildObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 1f, 1f), new Color4(1f, 0.5f, 0.5f), true);                         
+            if (obj.getClass() == PlanetObj.class) return new ColorCubeRenderer(100f, new Color4(1f, 0.5f, 0.5f), new Color4(0.8f, 0f, 0f), true);
+            if (obj.getClass() == DemoObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 0.5f, 0.5f), new Color4(1.0f, 1.0f, 0.3f), true);
+            if (obj.getClass() == GeneralPosObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 1f, 1f), new Color4(1f,0.5f,0f), true);
+            if (obj.getClass() == SoundObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 1f, 1f), new Color4(1f, 0.5f, 1f), true);   
+            if (obj.getClass() == ChangeObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 1f, 1f), new Color4(0f,0.8f,0f), true); 
+            if (obj.getClass() == DebugObj.class) return new ColorCubeRenderer (100f, new Color4(1f, 1f, 1f), new Color4(0.8f, 0.5f, 0.1f), true);
+            if (obj.getClass() == StageObj.class) return new ColorCubeRenderer (100f, new Color4(0.3f, 0f, 1f), new Color4(1f, 0.5f, 0f), true);
             
             switch (obj.name)
             {
-                case "Patakuri": return new DoubleBmdRenderer(info, "Kuribo", new Vector3(), "PatakuriWing", new Vector3(0f,15f,-25f));               
-
+                case "PowerStar": return new PowerStar(info, 0);
+                case "GreenStar": return new PowerStar(info, 1);
+                case "SuperSpinDriverPink": return new SuperSpinDriver(info,0);
+                case "SuperSpinDriverGreen": return new SuperSpinDriver(info,1);
+                case "MameMuimuiScorer": return new TripleBmdRenderer(info, "MameMuimuiGreen", new Vector3(0f,50f,100f), "MameMuimuiSpike", new Vector3(100f,-50f,-200), "MameMuimuiYellow", new Vector3(-200,0f,0));
+                case "MameMuimuiScorerLv2": return new TripleBmdRenderer(info, "MameMuimuiGreen", new Vector3(0f,50f,100f), "MameMuimuiYellow", new Vector3(100f,-50f,-200), "MameMuimuiSpike", new Vector3(-200,0f,0));
+                
                 case "Kinopio": 
                 case "KinopioAstro": return new Kinopio(info, (int)obj.data.get("Obj_arg1"));
+                case "KinopioBank": return new Kinopio(info, 1);
+                case "KinopioPostman": return new Kinopio(info, 2);
                 case "UFOKinoko": return new UFOKinoko(info, (int)obj.data.get("Obj_arg0"));
-                case "PowerStar": return new PowerStar(info, null);
-                case "GreenStar": return new PowerStar(info, "GreenStar");
-                                      
-                case "Pole": return new Pole(info, obj.scale);
-                case "PoleSquare": return new PoleSquare(info, obj.scale);
-
+                case "PenguinRacer": return new DoubleBmdRenderer(info, "Penguin", new Vector3(), "PenguinGoodsSwimCap", new Vector3(0f,100f,0f));
+                case "PenguinRacerLeader": return new TripleBmdRenderer(info, "Penguin", new Vector3(), "PenguinGoodsSwimCap", new Vector3(0f,100f,0f), "PenguinGoodsLeader", new Vector3());
+                
+                case "Pole": return new Pole(info, obj.scale, "Pole");
+                case "PoleSquare": return new Pole(info, obj.scale, "PoleSquare");
+                case "Pole2Way": return new Pole(info, obj.scale, "PoleSquare");
+                case "RedBlueTurnBlock": return new DoubleBmdRenderer(info, "RedBlueTurnBlock", new Vector3(), "RedBlueTurnBlockBase", new Vector3());
+                case "KoopaJrCastleWindUp": return new DoubleBmdRenderer(info, "Fan", new Vector3(), "FanWind", new Vector3());
+                
                 case "Flag": return new BtiRenderer(info, "Flag", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
-                case "FlagTamakoro": return new BtiRenderer(info, "FlagTamakoro", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
-                case "FlagSurfing": return new BtiRenderer(info, "FlagSurfing", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
                 case "FlagRaceA": return new BtiRenderer(info, "FlagRaceA", new Vector3(0f,75f,0f), new Vector3(0f,-75f,300f), true);
-                case "FlagKoopaCastle": return new BtiRenderer(info, "FlagKoopaCastle", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
+                case "FlagSurfing": return new BtiRenderer(info, "FlagSurfing", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
+                case "FlagTamakoro": return new BtiRenderer(info, "FlagTamakoro", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
+                case "FlagPeachCastleA": return new BtiRenderer(info, "FlagPeachCastleA", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);
+                case "FlagPeachCastleB": return new BtiRenderer(info, "FlagPeachCastleB", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);
+                case "FlagPeachCastleC": return new BtiRenderer(info, "FlagPeachCastleC", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);
                 case "FlagKoopaA": return new BtiRenderer(info, "FlagKoopaA", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
                 case "FlagKoopaB": return new BtiRenderer(info, "FlagKoopaB", new Vector3(0f,75f,0f), new Vector3(0f,-75f,600f), true);
-                case "FlagPeachCastleA": return new BtiRenderer(info, "FlagPeachCastleA", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);     
-                case "FlagPeachCastleB": return new BtiRenderer(info, "FlagPeachCastleB", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);
-                case "FlagPeachCastleC": return new BtiRenderer(info, "FlagPeachCastleC", new Vector3(0f,150f,0f), new  Vector3(0f,-150f,600f), true);                    
-                    
-                case "AstroDome":
-                case "AstroDomeEntrance":
+                case "FlagKoopaCastle": return new BtiRenderer(info, "FlagKoopaCastle", new Vector3(0f,150f,0f), new Vector3(0f,-150f,600f), true);
+
                 case "AstroStarPlate":
-                    return new AstroPart(info, obj.name, (int)obj.data.get("Obj_arg0"));
-                case "AstroDomeSky":
-                    return new AstroSky(info, obj.name, (int)obj.data.get("Obj_arg0"));
-                    
-                case "KillerShooter": return new DoubleBmdRenderer(info, "MogucchiSpike", new Vector3(), "GliderBazooka", new Vector3());
-                case "GliderShooter": return new DoubleBmdRenderer(info, "MogucchiSpike", new Vector3(), "GliderBazooka", new Vector3());    
-                case "GliderBazooka": return new DoubleBmdRenderer(info, "MogucchiSpike", new Vector3(), "GliderBazooka", new Vector3());    
-                case "TombSpider": return new DoubleBmdRenderer(info, "TombSpider", new Vector3(), "TombSpiderPlanet", new Vector3());
-                case "SkeletalFishBoss": return new DoubleBmdRenderer(info, "SkeletalFishBoss", new Vector3(), "SkeletalFishBossHeadA", new Vector3());
-                case "RedBlueTurnBlock": return new DoubleBmdRenderer(info, "RedBlueTurnBlock", new Vector3(), "RedBlueTurnBlockBase", new Vector3());
+                case "AstroDome":
+                case "AstroDomeEntrance": return new AstroPart(info, obj.name, (int)obj.data.get("Obj_arg0"));
+                case "AstroDomeSky": return new AstroSky(info, obj.name, (int)obj.data.get("Obj_arg0"));
+                
+                case "Patakuri": return new DoubleBmdRenderer(info, "Kuribo", new Vector3(), "PatakuriWing", new Vector3(0f,15f,-25f));               
                 case "HammerHeadPackun": return new DoubleBmdRenderer(info, "PackunFlower", new Vector3(), "PackunLeaf", new Vector3());
                 case "HammerHeadPackunSpike": return new DoubleBmdRenderer(info, "PackunFlowerSpike", new Vector3(), "PackunLeafSpike", new Vector3());
-                case "BegomanSpike": return new DoubleBmdRenderer(info, "BegomanSpikeHead", new Vector3(), "BegomanSpike", new Vector3());
+                case "CocoSambo": return new DoubleBmdRenderer(info, "CocoSamboBody", new Vector3(), "CocoSamboHead", new Vector3(0f,325f,0f));
+                case "Kiraira": return new TripleBmdRenderer(info, "Kiraira", new Vector3(0f,50f,0f), "KirairaChain", new Vector3(0f, -160f, 0f), "KirairaFixPointBottom", new Vector3(0f,-15f,0f));
+                case "Torpedo": return new DoubleBmdRenderer(info, "Torpedo", new Vector3(), "TorpedoPropeller", new Vector3());
+                case "BegomanSpike": return new DoubleBmdRenderer(info, "BegomanSpike", new Vector3(), "BegomanSpikeHead", new Vector3());
                 case "BegomanSpring":
-                case "BegomanSpringHide": return new DoubleBmdRenderer(info, "BegomanSpringHead", new Vector3(), "BegomanSpring", new Vector3());           
+                case "BegomanSpringHide": return new DoubleBmdRenderer(info, "BegomanSpring", new Vector3(), "BegomanSpringHead", new Vector3());
+                case "JumpBeamer": return new DoubleBmdRenderer(info, "JumpBeamerBody", new Vector3(), "JumpBeamerHead", new Vector3(0f,-25f,0f));
+                case "JumpGuarder": return new DoubleBmdRenderer(info, "JumpGuarder", new Vector3(), "JumpGuarderHead", new Vector3());
+                case "GliderBazooka":
+                case "GliderShooter": return new DoubleBmdRenderer(info, "MogucchiSpike", new Vector3(), "GliderBazooka", new Vector3());
+                case "KillerShooter": return new DoubleBmdRenderer(info, "MogucchiSpike", new Vector3(), "GliderBazooka", new Vector3());
+                case "WaterBazooka": return new TripleBmdRenderer(info, "WaterBazooka", new Vector3(), "WaterBazookaCapsule", new Vector3(0f, 475f, 0f), "MogucchiShooter", new Vector3(0f,-160f,0f));
+                case "ElectricBazooka": return new TripleBmdRenderer(info, "ElectricBazooka", new Vector3(), "WaterBazookaCapsule", new Vector3(0f, 475f, 0f), "MogucchiShooter", new Vector3(0f,-160f,0f));
+                case "DinoPackun":
+                case "DinoPackunVs1": return new DoubleBmdRenderer(info, "DinoPackun", new Vector3(), "DinoPackunTailBall", new Vector3(0f,150f,-750f));
+                case "DinoPackunVs2": return new DoubleBmdRenderer(info, "DinoPackun2", new Vector3(), "DinoPackunTailBall", new Vector3(0f,150f,-750f));
+                case "BossBegoman": return new DoubleBmdRenderer(info, "BossBegoman", new Vector3(), "BossBegomanHead", new Vector3());
+                case "BossJugem": return new DoubleBmdRenderer(info, "BossJugem", new Vector3(), "BossJugemCloud", new Vector3());
+                case "KoopaJrRobot": return new DoubleBmdRenderer(info, "KoopaJrRobot", new Vector3(), "KoopaJrRobotPod", new Vector3(0f,1000f,0f));
+                case "KoopaJrCastle": return new TripleBmdRenderer(info, "KoopaJrCastleBody", new Vector3(), "KoopaJrCastleHead", new Vector3(0f,2750f,0f), "KoopaJrCastleCapsule", new Vector3(0f,700f,0f));
+                case "OtaRockTank": return new DoubleBmdRenderer(info, "OtaRockTank", new Vector3(), "OtaRockChief", new Vector3(0f, 500f, 0f));
+                case "TombSpider": return new TripleBmdRenderer(info, "TombSpider", new Vector3(), "TombSpiderPlanet", new Vector3(), "TombSpiderCocoon", new Vector3());
+                case "SkeletalFishBoss": return new DoubleBmdRenderer(info, "SkeletalFishBoss", new Vector3(), "SkeletalFishBossHeadA", new Vector3());
             }
         }
         catch (IOException ex) {}
         
         return null;
         
-        
-        
     }
 }
diff --git a/src/whitehole/rendering/PlanetRenderer.java b/src/whitehole/rendering/PlanetRenderer.java
index 817b64e..c3f29e2 100644
--- a/src/whitehole/rendering/PlanetRenderer.java
+++ b/src/whitehole/rendering/PlanetRenderer.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -27,7 +24,9 @@ public PlanetRenderer(RenderInfo info, String planet) throws GLException
         rendMain = new BmdRenderer(info, planet);
         
         try { rendWater = new BmdRenderer(info, planet + "Water"); }
-        catch (GLException ex) { rendWater = null; }
+        catch (GLException ex) {
+            rendWater = null;
+        }
     }
     
     @Override
diff --git a/src/whitehole/rendering/RendererCache.java b/src/whitehole/rendering/RendererCache.java
index 474b53a..ca2ee4a 100644
--- a/src/whitehole/rendering/RendererCache.java
+++ b/src/whitehole/rendering/RendererCache.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/ShaderCache.java b/src/whitehole/rendering/ShaderCache.java
index a779995..734d688 100644
--- a/src/whitehole/rendering/ShaderCache.java
+++ b/src/whitehole/rendering/ShaderCache.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/TextureCache.java b/src/whitehole/rendering/TextureCache.java
index 48bc285..8547466 100644
--- a/src/whitehole/rendering/TextureCache.java
+++ b/src/whitehole/rendering/TextureCache.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/TripleBmdRenderer.java b/src/whitehole/rendering/TripleBmdRenderer.java
new file mode 100644
index 0000000..3a28419
--- /dev/null
+++ b/src/whitehole/rendering/TripleBmdRenderer.java
@@ -0,0 +1,75 @@
+/*
+    © 2012 - 2016 - Whitehole Team
+
+    Whitehole is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
+    WARRANTY; See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along 
+    with Whitehole. If not, see http://www.gnu.org/licenses/.
+*/
+
+package whitehole.rendering;
+
+import java.io.IOException;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLException;
+import whitehole.vectors.Vector3;
+
+public class TripleBmdRenderer extends GLRenderer
+{
+    public TripleBmdRenderer(RenderInfo info, String model1, Vector3 pos1, String model2, Vector3 pos2, String model3, Vector3 pos3) throws IOException
+    {
+        rend1 = new BmdRenderer(info, model1);
+        position1 = pos1;
+        rend2 = new BmdRenderer(info, model2);
+        position2 = pos2;
+        rend3 = new BmdRenderer(info, model3);
+        position3 = pos3;
+    }
+    
+    @Override
+    public void close(RenderInfo info) throws GLException
+    {
+        rend1.close(info);
+        rend2.close(info);
+        rend3.close(info);
+    }
+    
+    
+    @Override
+    public boolean gottaRender(RenderInfo info) throws GLException
+    {
+        return rend1.gottaRender(info) || rend2.gottaRender(info) || rend3.gottaRender(info);
+    }
+    
+    @Override
+    public void render(RenderInfo info) throws GLException
+    {
+        GL2 gl = info.drawable.getGL().getGL2();
+        
+        if (rend1.gottaRender(info))
+        {
+            gl.glTranslatef(position1.x, position1.y, position1.z);
+            rend1.render(info);
+        }
+        if (rend2.gottaRender(info))
+        {
+            gl.glTranslatef(position2.x, position2.y, position2.z);
+            rend2.render(info);
+        }
+        if (rend3.gottaRender(info))
+        {
+            gl.glTranslatef(position3.x, position3.y, position3.z);
+            rend3.render(info);
+        }
+    }
+    
+    
+    private BmdRenderer rend1, rend2, rend3;
+    private Vector3 position1, position2, position3;
+}
diff --git a/src/whitehole/rendering/objRenderer/AstroPart.java b/src/whitehole/rendering/objRenderer/AstroPart.java
index 8725d90..4ec2229 100644
--- a/src/whitehole/rendering/objRenderer/AstroPart.java
+++ b/src/whitehole/rendering/objRenderer/AstroPart.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/objRenderer/AstroSky.java b/src/whitehole/rendering/objRenderer/AstroSky.java
index 8d9a372..e9283bb 100644
--- a/src/whitehole/rendering/objRenderer/AstroSky.java
+++ b/src/whitehole/rendering/objRenderer/AstroSky.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/objRenderer/Kinopio.java b/src/whitehole/rendering/objRenderer/Kinopio.java
index d756d77..9efb958 100644
--- a/src/whitehole/rendering/objRenderer/Kinopio.java
+++ b/src/whitehole/rendering/objRenderer/Kinopio.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/rendering/objRenderer/Pole.java b/src/whitehole/rendering/objRenderer/Pole.java
index 034bc08..0c24903 100644
--- a/src/whitehole/rendering/objRenderer/Pole.java
+++ b/src/whitehole/rendering/objRenderer/Pole.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -25,14 +22,11 @@
 
 public class Pole extends BmdRenderer
 {
-    public Pole(RenderInfo info, Vector3 scale) throws IOException
+    public Pole(RenderInfo info, Vector3 scale, String type) throws IOException
     {
-        super(info, "Pole");
+        super(info, type);
         myscale = scale;
         
-        // really ugly hack
-        // the game's renderer must be making use of the weighted vertices and all
-        // but for now this does the trick
         model.joints[1].finalMatrix.m[13] = 100f * scale.y / scale.x;
     }
     
diff --git a/src/whitehole/rendering/objRenderer/PoleSquare.java b/src/whitehole/rendering/objRenderer/PoleSquare.java
deleted file mode 100644
index 413c2e2..0000000
--- a/src/whitehole/rendering/objRenderer/PoleSquare.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
-
-    Whitehole is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
-
-    Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along 
-    with Whitehole. If not, see http://www.gnu.org/licenses/.
-*/
-
-package whitehole.rendering.objRenderer;
-
-import java.io.IOException;
-import javax.media.opengl.*;
-import whitehole.rendering.BmdRenderer;
-import whitehole.rendering.GLRenderer;
-import whitehole.vectors.Vector3;
-
-public class PoleSquare extends BmdRenderer
-{
-    public PoleSquare(GLRenderer.RenderInfo info, Vector3 scale) throws IOException
-    {
-        super(info, "PoleSquare");
-        myscale = scale;
-        
-        // really ugly hack
-        // the game's renderer must be making use of the weighted vertices and all
-        // but for now this does the trick
-        model.joints[1].finalMatrix.m[13] = 100f * scale.y / scale.x;
-    }
-    
-    @Override
-    public boolean isScaled()
-    {
-        return false;
-    }
-    
-    @Override
-    public boolean hasSpecialScaling()
-    {
-        return true;
-    }
-    
-    @Override
-    public void render(GLRenderer.RenderInfo info) throws GLException
-    {
-        GL2 gl = info.drawable.getGL().getGL2();
-        gl.glScalef(myscale.x, myscale.x, myscale.x);
-        super.render(info);
-    }
-    
-    
-    private Vector3 myscale;
-}
diff --git a/src/whitehole/rendering/objRenderer/PowerStar.java b/src/whitehole/rendering/objRenderer/PowerStar.java
index 0b61a08..fac878b 100644
--- a/src/whitehole/rendering/objRenderer/PowerStar.java
+++ b/src/whitehole/rendering/objRenderer/PowerStar.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -22,21 +19,22 @@
 
 public class PowerStar extends BmdRenderer
 {
-    public PowerStar(RenderInfo info, String starobj)
+    public PowerStar(RenderInfo info, int type)
     {
         ctor_loadModel(info, "PowerStar");
         
-        // green
-        if (starobj == "GreenStar") { 
-            model.materials[0].colorS10[0].r = -113;
-            model.materials[0].colorS10[0].g = 211;
-            model.materials[0].colorS10[0].b = -113;
-        }
-        // yellow
-        else {
-            model.materials[0].colorS10[0].r = 211;
-            model.materials[0].colorS10[0].g = 211;
-            model.materials[0].colorS10[0].b = -103;
+        switch (type)
+        {
+            case 0: // yellow
+                model.materials[0].colorS10[0].r = 211;
+                model.materials[0].colorS10[0].g = 211;
+                model.materials[0].colorS10[0].b = -103;
+                break;
+            case 1: // green
+                model.materials[0].colorS10[0].r = -113;
+                model.materials[0].colorS10[0].g = 211;
+                model.materials[0].colorS10[0].b = -113;
+                break;
         }
         ctor_uploadData(info);
     }
diff --git a/src/whitehole/rendering/objRenderer/SuperSpinDriver.java b/src/whitehole/rendering/objRenderer/SuperSpinDriver.java
new file mode 100644
index 0000000..d2a65fd
--- /dev/null
+++ b/src/whitehole/rendering/objRenderer/SuperSpinDriver.java
@@ -0,0 +1,56 @@
+/*
+    © 2012 - 2016 - Whitehole Team
+
+    Whitehole is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
+    WARRANTY; See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along 
+    with Whitehole. If not, see http://www.gnu.org/licenses/.
+*/
+
+package whitehole.rendering.objRenderer;
+
+import whitehole.rendering.BmdRenderer;
+
+public class SuperSpinDriver extends BmdRenderer
+{
+    public SuperSpinDriver(RenderInfo info, int type)
+    {
+        ctor_loadModel(info, "SuperSpinDriver");
+        
+        switch (type)
+        {
+            case 0: // blue
+                model.materials[0].colorS10[0].r = 211;
+                model.materials[0].colorS10[0].g = -103;
+                model.materials[0].colorS10[0].b = 211;
+                model.materials[1].colorS10[0].r = 211;
+                model.materials[1].colorS10[0].g = -103;
+                model.materials[1].colorS10[0].b = 211;
+                break;
+                
+            case 1: // green
+                model.materials[0].colorS10[0].r = -103;
+                model.materials[0].colorS10[0].g = 211;
+                model.materials[0].colorS10[0].b = -103;
+                model.materials[1].colorS10[0].r = -103;
+                model.materials[1].colorS10[0].g = 211;
+                model.materials[1].colorS10[0].b = -103;
+                break;
+        }
+        
+        ctor_uploadData(info);
+    }
+    
+    @Override
+    public boolean boundToObjArg(int arg)
+    {
+        if (arg == 1) return true;
+        return false;
+    }
+}
diff --git a/src/whitehole/rendering/objRenderer/UFOKinoko.java b/src/whitehole/rendering/objRenderer/UFOKinoko.java
index fbfbd5a..e563e02 100644
--- a/src/whitehole/rendering/objRenderer/UFOKinoko.java
+++ b/src/whitehole/rendering/objRenderer/UFOKinoko.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/Bcsv.java b/src/whitehole/smg/Bcsv.java
index 1547025..8487de2 100644
--- a/src/whitehole/smg/Bcsv.java
+++ b/src/whitehole/smg/Bcsv.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -357,33 +354,39 @@ public static void addHash(String field)
             hashTable.put(hash, field);
     }
 
+    public static void createCustomHashFile() {
+        try {
+            File hashCustom = new File("AdditionalFieldNames.txt");
+            hashCustom.createNewFile();
+            FileWriter writeFile = new FileWriter(hashCustom.getAbsoluteFile());
+            BufferedWriter writeLine = new BufferedWriter(writeFile);
+            writeLine.write("# Add new lines to create new field names\r\n");
+            writeLine.write("# Lines that start with '#' are ignored.\r\n");
+            writeLine.close();
+        }
+        catch (Exception ex) {
+        }
+    }
+    
     public static void populateHashTable()
     {
         hashTable = new HashMap<>();
 
-        try
-        {
-            // get hash file
+        try {
             InputStream hash = Whitehole.class.getResourceAsStream("/Resources/Hash.txt");
             InputStream hashZone = Whitehole.class.getResourceAsStream("/Resources/ZoneHash.txt");
-            // get custom hash file
+            
             File hashCustom = new File("AdditionalFieldNames.txt");
-            // create custom hash file
-            if (!hashCustom.exists()) {
-                hashCustom.createNewFile();
-                FileWriter writeFile = new FileWriter(hashCustom.getAbsoluteFile());
-                BufferedWriter writeLine = new BufferedWriter(writeFile);
-                writeLine.write("# Add new lines to create new field names\n");
-                writeLine.close();
-            }
-            // read hash files
+            
+            if (!hashCustom.exists())
+                createCustomHashFile();
+                        
             BufferedReader reader = new BufferedReader(new InputStreamReader(hash));
             BufferedReader reader2 = new BufferedReader(new InputStreamReader(hashZone));
             BufferedReader reader3 = new BufferedReader(new FileReader(hashCustom));
 
             String line;
-            while ((line = reader.readLine()) != null)
-            {
+            while ((line = reader.readLine()) != null) {
                 line = line.trim();
 
                 if (line.length() == 0) continue;
@@ -392,8 +395,7 @@ public static void populateHashTable()
                 addHash(line);
             }
             
-            while ((line = reader2.readLine()) != null)
-            {
+            while ((line = reader2.readLine()) != null) {
                 line = line.trim();
 
                 if (line.length() == 0) continue;
@@ -402,8 +404,7 @@ public static void populateHashTable()
                 addHash(line);
             }
             
-            while ((line = reader3.readLine()) != null)
-            {
+            while ((line = reader3.readLine()) != null) {
                 line = line.trim();
 
                 if (line.length() == 0) continue;
diff --git a/src/whitehole/smg/Bmd.java b/src/whitehole/smg/Bmd.java
index f7e3f1e..7e2e29a 100644
--- a/src/whitehole/smg/Bmd.java
+++ b/src/whitehole/smg/Bmd.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/Bti.java b/src/whitehole/smg/Bti.java
index 629f20f..331f388 100644
--- a/src/whitehole/smg/Bti.java
+++ b/src/whitehole/smg/Bti.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/Bva.java b/src/whitehole/smg/Bva.java
index 8382a7e..87c241c 100644
--- a/src/whitehole/smg/Bva.java
+++ b/src/whitehole/smg/Bva.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/DataHelper.java b/src/whitehole/smg/DataHelper.java
index 2f13d9d..b2387d3 100644
--- a/src/whitehole/smg/DataHelper.java
+++ b/src/whitehole/smg/DataHelper.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/GalaxyArchive.java b/src/whitehole/smg/GalaxyArchive.java
index 98faa81..b6d492d 100644
--- a/src/whitehole/smg/GalaxyArchive.java
+++ b/src/whitehole/smg/GalaxyArchive.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/GameArchive.java b/src/whitehole/smg/GameArchive.java
index 0963829..c7afc44 100644
--- a/src/whitehole/smg/GameArchive.java
+++ b/src/whitehole/smg/GameArchive.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -25,37 +22,32 @@
 
 public class GameArchive 
 {
-    public GameArchive(FilesystemBase fs)
-    {
+    public GameArchive(FilesystemBase fs) {
         filesystem = fs;
     }
     
-    public void getGameType(String name)
-    {
+    public void getGameType(String name) {
         if (filesystem.fileExists(String.format("/StageData/%1$s.arc", name))) {
-            Whitehole.getGameType = 1;   // SMG1
+            Whitehole.gameType = 1;   // SMG1
         }
         else if (filesystem.fileExists(String.format("/StageData/%1$s/%1$sMap.arc", name))) {
-            Whitehole.getGameType = 2;   // SMG2
+            Whitehole.gameType = 2;   // SMG2
         }
         else {
-            Whitehole.getGameType = 0;   // no game
+            Whitehole.gameType = 0;   // no game
         }
     }
     
-    public boolean galaxyExists(String name)
-    {
+    public boolean galaxyExists(String name) {
         return filesystem.fileExists(String.format("/StageData/%1$s/%1$sScenario.arc", name));
     }
     
-    public GalaxyArchive openGalaxy(String name) throws IOException
-    {
+    public GalaxyArchive openGalaxy(String name) throws IOException {
         if (!galaxyExists(name)) return null;
         return new GalaxyArchive(this, name);
     }
     
-    public void close()
-    {
+    public void close() {
         try { 
             filesystem.close();
         }
@@ -63,8 +55,7 @@ public void close()
         }
     }
     
-    public List<String> getGalaxies()
-    {
+    public List<String> getGalaxies() {
         List<String> ret = new ArrayList<>();
         List<String> stages = filesystem.getDirectories("/StageData");
         for (String stage : stages)
diff --git a/src/whitehole/smg/LevelObject.java b/src/whitehole/smg/LevelObject.java
index 3515afb..259ce2e 100644
--- a/src/whitehole/smg/LevelObject.java
+++ b/src/whitehole/smg/LevelObject.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/ZoneArchive.java b/src/whitehole/smg/ZoneArchive.java
index 96bbb58..361f5ce 100644
--- a/src/whitehole/smg/ZoneArchive.java
+++ b/src/whitehole/smg/ZoneArchive.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -32,7 +29,11 @@
 import whitehole.smg.object.StartObj;
 import java.io.*;
 import java.util.*;
+import javax.swing.JOptionPane;
+import whitehole.Whitehole;
 import whitehole.fileio.*;
+import whitehole.smg.object.ChildObj;
+import whitehole.smg.object.StageObj;
 
 public class ZoneArchive 
 {
@@ -65,10 +66,15 @@ public void save() throws IOException
         saveObjects("Placement", "DemoObjInfo");
         saveObjects("GeneralPos", "GeneralPosInfo");
         saveObjects("Debug", "DebugMoveInfo");
-        if (gameMask == 2)
-            saveObjects("Placement", "ChangeObjInfo");
-        if (gameMask == 1)
-            saveObjects("Placement", "SoundInfo");
+        switch (gameMask) {
+            case 1:
+                saveObjects("Placement", "SoundInfo");
+                saveObjects("ChildObj", "ChildObjInfo");
+                break;
+            case 2:
+                saveObjects("Placement", "ChangeObjInfo");
+                break;
+        }
         savePaths();
         archive.save();
     }
@@ -80,12 +86,12 @@ public void close()
     }
     
     
-    private void loadZone() throws IOException
-    {
-        objects = new HashMap<>();
-        subZones = new HashMap<>();
-        archive = new RarcFilesystem(filesystem.openFile(zonefile));
-        
+    private void loadZone()
+    {   
+        try {
+            objects = new HashMap<>();
+            subZones = new HashMap<>();
+            archive = new RarcFilesystem(filesystem.openFile(zonefile));
         loadObjects("MapParts", "MapPartsInfo");
         loadObjects("Placement", "ObjInfo");
         loadObjects("Start", "StartInfo");
@@ -95,12 +101,24 @@ private void loadZone() throws IOException
         loadObjects("Placement", "DemoObjInfo");
         loadObjects("GeneralPos", "GeneralPosInfo");
         loadObjects("Debug", "DebugMoveInfo");
-        if (gameMask == 2)
-            loadObjects("Placement", "ChangeObjInfo");
-        if (gameMask == 1)
-            loadObjects("Placement", "soundinfo");
+        switch (gameMask) {
+            case 1:
+                loadObjects("Placement", "SoundInfo");
+                loadObjects("ChildObj", "ChildObjInfo");
+                break;
+            case 2:
+                loadObjects("Placement", "ChangeObjInfo");
+                break;
+        }
         loadPaths();
         loadSubZones();
+        }
+        catch (NullPointerException ex) {
+            JOptionPane.showMessageDialog(null, "Can't open galaxy, because of missing zone files.\n\nIf you are modding SMG1, try to remove the unused zones from the galaxy's zone list.\nYou can use the BCSV editor to do this.", Whitehole.fullName, 0);
+        }
+        catch (Exception ex) {
+            
+        }
     }
 
     
@@ -134,141 +152,79 @@ private void addObjectsToList(String filepath)
         {
             Bcsv bcsv = new Bcsv(archive.openFile("/Stage/Jmp/" + filepath));
             
-            if (gameMask == 2) {
             switch (file)
             {
+                case "stageobjinfo":
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new StageObj(this, filepath, entry));
+                    }
+                    break;
                 case "mappartsinfo":
                     for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new MapPartObj(this, filepath, entry));
-            }
+                        objects.get(layer).add(new MapPartObj(this, filepath, entry));
+                    }
+                    break;
+                case "childobjinfo":
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new ChildObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "objinfo":
                     for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new GeneralObject(this, filepath, entry));
-            }
+                        objects.get(layer).add(new GeneralObject(this, filepath, entry));
+                    }
                     break;
-                
-                    
                 case "startinfo":
                     for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new StartObj(this, filepath, entry));
-            }
+                        objects.get(layer).add(new StartObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "planetobjinfo":
                     for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new PlanetObj(this, filepath, entry));
-            }
+                        objects.get(layer).add(new PlanetObj(this, filepath, entry));
+                    }
+                    break;
+                case "soundinfo":
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new SoundObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "areaobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new AreaObj(this, filepath, entry));
-            }
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new AreaObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "cameracubeinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new CameraCubeObj(this, filepath, entry));
-            }
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new CameraCubeObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "demoobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new DemoObj(this, filepath, entry));
-            }
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new DemoObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "generalposinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new GeneralPosObj(this, filepath, entry));
-            }
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new GeneralPosObj(this, filepath, entry));
+                    }
                     break;
-                    
                 case "debugmoveinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new DebugObj(this, filepath, entry));
-            }
+                    for (Bcsv.Entry entry : bcsv.entries) {
+                        objects.get(layer).add(new DebugObj(this, filepath, entry));
+                    }
                     break; 
-                   
                 case "changeobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries)
-                objects.get(layer).add(new ChangeObj(this, filepath, entry));
-                    break;                    
-            }
-            }
-            else {
-            switch (file)
-            {
-                case "mappartsinfo":
-                    for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new MapPartObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "objinfo":
-                    for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new GeneralObject(this, filepath, entry));
-            }
-                    break;
-                
-                    
-                case "startinfo":
                     for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new StartObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "planetobjinfo":
-                    for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new PlanetObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "areaobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new AreaObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "cameracubeinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new CameraCubeObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "soundinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new SoundObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "demoobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new DemoObj(this, filepath, entry));
-            }
-                    break;
-                    
-                case "generalposinfo":
-                   for (Bcsv.Entry entry : bcsv.entries) {
-                objects.get(layer).add(new GeneralPosObj(this, filepath, entry));
-            }
-                    break;
-                   
-                case "debugobjinfo":
-                   for (Bcsv.Entry entry : bcsv.entries)
-                objects.get(layer).add(new DebugObj(this, filepath, entry));
+                        objects.get(layer).add(new ChangeObj(this, filepath, entry));
+                    }
                     break;                    
             }
-            }
-            
             bcsv.close();
             
         }
         catch (IOException ex)
         {
-            // TODO better error handling, really
             System.out.println(ex.getMessage());
             ex.printStackTrace();
         }
diff --git a/src/whitehole/smg/object/AreaObj.java b/src/whitehole/smg/object/AreaObj.java
index ccbd831..2d29df1 100644
--- a/src/whitehole/smg/object/AreaObj.java
+++ b/src/whitehole/smg/object/AreaObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -87,26 +84,25 @@ public AreaObj(ZoneArchive zone, String filepath, int game, String objname, Vect
         data.put("SW_APPEAR", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("SW_AWAKE", -1);
-        else
-            data.put("SW_SLEEP", -1);
-        
         data.put("l_id", 0);
-        if (ZoneArchive.gameMask == 2)
-            data.put("AreaShapeNo", (short)0);
-        else
-            data.put("ChildObjId", (short)0);
-        
+        data.put("FollowId", -1);        
         data.put("CommonPath_ID", (short)-1);
         data.put("ClippingGroupId", (short)-1);
-        data.put("FollowId", -1);        
         data.put("GroupId", (short)-1);
         data.put("DemoGroupId", (short)-1);
-        
         data.put("MapParts_ID", (short)-1);
         data.put("Obj_ID", (short)-1);
-
+        switch (ZoneArchive.gameMask) {
+            case 1:
+                data.put("SW_SLEEP", -1);
+                data.put("ChildObjId", (short)0);
+                break;
+            case 2:
+                data.put("SW_AWAKE", -1);
+                data.put("Priority", -1);
+                data.put("AreaShapeNo", (short)0);
+                break;
+        }
     }
     
     @Override
@@ -118,7 +114,6 @@ public void save()
         data.put("scale_x", scale.x); data.put("scale_y", scale.y); data.put("scale_z", scale.z);
     }
 
-    
     @Override
     public void getProperties(PropertyGrid panel)
     {
@@ -147,36 +142,26 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_APPEAR", "SW_APPEAR", "int", null, data.get("SW_APPEAR"), "Default");
         panel.addField("SW_A", "SW_A", "int", null, data.get("SW_A"), "Default");
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
-        
+        if (ZoneArchive.gameMask == 1)
+            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
         if (ZoneArchive.gameMask == 2)
             panel.addField("SW_AWAKE", "SW_AWAKE", "int", null, data.get("SW_AWAKE"), "Default");
-        else
-            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
 
         panel.addCategory("obj_objinfo", "Other");
         panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");   
-        
-        if (ZoneArchive.gameMask == 2) {
+        if (ZoneArchive.gameMask == 2)
             panel.addField("Priority", "Priority", "int", null, data.get("Priority"), "Default");
-            panel.addField("FollowId", "FollowId", "int", null, data.get("FollowId"), "Default");        
+        panel.addField("FollowId", "FollowId", "int", null, data.get("FollowId"), "Default");   
+        if (ZoneArchive.gameMask == 2)
             panel.addField("AreaShapeNo", "AreaShapeNo", "int", null, data.get("AreaShapeNo"), "Default");
-            panel.addField("CommonPath_ID", "CommonPath_ID", "int", null, data.get("CommonPath_ID"), "Default");
-            panel.addField("ClippingGroupId", "ClippingGroupId", "int", null, data.get("ClippingGroupId"), "Default");
-            panel.addField("GroupId", "GroupId", "int", null, data.get("GroupId"), "Default");
-            panel.addField("DemoGroupId", "DemoGroupId", "int", null, data.get("DemoGroupId"), "Default");
-            panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
-            panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
-        }
-        else {
-            panel.addField("FollowId", "FollowId", "int", null, data.get("FollowId"), "Default");        
-            panel.addField("CommonPath_ID", "CommonPath_ID", "int", null, data.get("CommonPath_ID"), "Default");
-            panel.addField("ClippingGroupId", "ClippingGroupId", "int", null, data.get("ClippingGroupId"), "Default");
-            panel.addField("GroupId", "GroupId", "int", null, data.get("GroupId"), "Default");
-            panel.addField("DemoGroupId", "DemoGroupId", "int", null, data.get("DemoGroupId"), "Default");
-            panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
-            panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
+        panel.addField("CommonPath_ID", "CommonPath_ID", "int", null, data.get("CommonPath_ID"), "Default");
+        panel.addField("ClippingGroupId", "ClippingGroupId", "int", null, data.get("ClippingGroupId"), "Default");
+        panel.addField("GroupId", "GroupId", "int", null, data.get("GroupId"), "Default");
+        panel.addField("DemoGroupId", "DemoGroupId", "int", null, data.get("DemoGroupId"), "Default");
+        panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
+        panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
+        if (ZoneArchive.gameMask == 1)
             panel.addField("ChildObjId", "ChildObjId", "int", null, data.get("ChildObjId"), "Default");
-        }
     }
     
     @Override
diff --git a/src/whitehole/smg/object/CameraCubeObj.java b/src/whitehole/smg/object/CameraCubeObj.java
index f416ee5..2a685f3 100644
--- a/src/whitehole/smg/object/CameraCubeObj.java
+++ b/src/whitehole/smg/object/CameraCubeObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -80,27 +77,24 @@ public CameraCubeObj(ZoneArchive zone, String filepath, int game, String objname
         data.put("SW_APPEAR", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("SW_AWAKE", -1);
-        else
-            data.put("SW_SLEEP", -1);
         
         data.put(0x50F5D5E6, -1);
         data.put(0xCDC4FEAD, -1);
         data.put("Validity", "Valid");
         data.put("l_id", 0);
-        if (ZoneArchive.gameMask == 2) {
-            data.put("AreaShapeNo", (short) 0);
-            data.put("FollowId", -1);          
-            data.put("MapParts_ID", (short) -1);
-            data.put("Obj_ID", (short) -1);
-        }
+        data.put("FollowId", -1);          
+        data.put("MapParts_ID", (short) -1);
+        data.put("Obj_ID", (short) -1);
         
-        else {
-            data.put("FollowId", -1);          
-            data.put("MapParts_ID", (short)-1);
-            data.put("Obj_ID", (short)-1);
-            data.put("ChildObjId", (short)-1);
+        switch (ZoneArchive.gameMask) {
+            case 1:
+                data.put("SW_SLEEP", -1);
+                data.put("ChildObjId", (short)-1);
+                break;
+            case 2:
+                data.put("SW_AWAKE", -1);
+                data.put("AreaShapeNo", (short) 0);
+                break;
         }
     }
     
@@ -142,26 +136,21 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_APPEAR", "SW_APPEAR", "int", null, data.get("SW_APPEAR"), "Default");
         panel.addField("SW_A", "SW_A", "int", null, data.get("SW_A"), "Default");
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
+        if (ZoneArchive.gameMask == 1)
+            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
         if (ZoneArchive.gameMask == 2)
             panel.addField("SW_AWAKE", "SW_AWAKE", "int", null, data.get("SW_AWAKE"), "Default");
-        else
-            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
-
+        
         panel.addCategory("obj_objinfo", "Other");
         panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");  
         panel.addField("Validity", "Validity", "text", null, data.get("Validity"), "Default");
-        if (ZoneArchive.gameMask == 2) {
+        panel.addField("FollowId", "FollowId", "int", null, data.get("FollowId"), "Default");
+        if (ZoneArchive.gameMask == 2)
             panel.addField("AreaShapeNo", "AreaShapeNo", "int", null, data.get("AreaShapeNo"), "Default");
-            panel.addField("FollowId", "FollowId", "int", null, data.get("FollowId"), "Default");        
-            panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
-            panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
-        }
-        else {
-            panel.addField("FollowId", "Follow ID", "int", null, data.get("FollowId"), "Default");
-            panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
-            panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
+        panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
+        panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
+        if (ZoneArchive.gameMask == 1)
             panel.addField("ChildObjId", "ChildObjId", "int", null, data.get("ChildObjId"), "Default");
-        }
     }
     
     @Override
diff --git a/src/whitehole/smg/object/ChangeObj.java b/src/whitehole/smg/object/ChangeObj.java
index bc3dc1c..0c984e8 100644
--- a/src/whitehole/smg/object/ChangeObj.java
+++ b/src/whitehole/smg/object/ChangeObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -113,9 +110,9 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
         
         panel.addCategory("obj_objinfo", "Other");
+        panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");
         panel.addField("0x55CFC442", "Unknown (55CFC442)", "int", null, data.get(0x55CFC442), "Default");        
         panel.addField("0xC4F73392", "Unknown (C4F73392)", "int", null, data.get(0xC4F73392), "Default");
-        panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");
     }
     
     @Override
diff --git a/src/whitehole/smg/object/ChildObj.java b/src/whitehole/smg/object/ChildObj.java
index ba86f4b..378be7b 100644
--- a/src/whitehole/smg/object/ChildObj.java
+++ b/src/whitehole/smg/object/ChildObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -81,19 +78,18 @@ public ChildObj(ZoneArchive zone, String filepath, int game, String objname, Vec
         data.put("Obj_arg6", -1);
         data.put("Obj_arg7", -1);
         
-        data.put("l_id", 0);
-        data.put("CameraSetId", -1);
         data.put("SW_APPEAR", -1);
         data.put("SW_DEAD", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
         data.put("SW_SLEEP", -1);
         
+        data.put("l_id", 0);
+        data.put("CameraSetId", -1);
         data.put("CastId", -1);
         data.put("ViewGroupId", -1);
-        data.put(0x77E19CDA, (short)-1);
-        data.put(0x49E5F365, (short)-1);
         data.put("MessageId", -1);
+        data.put("ParentID", (short)-1);
         data.put("ShapeModelNo", (short)-1);
         data.put("CommonPath_ID", (short)-1);
         data.put("ClippingGroupId", (short)-1);
@@ -148,9 +144,8 @@ public void getProperties(PropertyGrid panel)
         panel.addField("CameraSetId", "CameraSetId", "int", null, data.get("CameraSetId"), "Default");
         panel.addField("CastId", "CastId", "int", null, data.get("CastId"), "Default");
         panel.addField("ViewGroupId", "ViewGroupId", "int", null, data.get("ViewGroupId"), "Default");
-        panel.addField("0x77E19CDA", "Unknown (77E19CDA)", "int", null, data.get(0x77E19CDA), "Default");
-        panel.addField("0x49E5F365", "Unknown (49E5F365)", "int", null, data.get(0x49E5F365), "Default");
         panel.addField("MessageId", "MessageId", "int", null, data.get("MessageId"), "Default");
+        panel.addField("ParentID", "ParentID", "int", null, data.get("ParentID"), "Default");
         panel.addField("ShapeModelNo", "ShapeModelNo", "int", null, data.get("ShapeModelNo"), "Default");
         panel.addField("CommonPath_ID", "CommonPath_ID", "int", null, data.get("CommonPath_ID"), "Default");
         panel.addField("ClippingGroupId", "ClippingGroupId", "int", null, data.get("ClippingGroupId"), "Default");
diff --git a/src/whitehole/smg/object/DebugObj.java b/src/whitehole/smg/object/DebugObj.java
index 793e438..2c50af5 100644
--- a/src/whitehole/smg/object/DebugObj.java
+++ b/src/whitehole/smg/object/DebugObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/object/DemoObj.java b/src/whitehole/smg/object/DemoObj.java
index 362bc7f..282d526 100644
--- a/src/whitehole/smg/object/DemoObj.java
+++ b/src/whitehole/smg/object/DemoObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -81,7 +78,7 @@ public DemoObj(ZoneArchive zone, String filepath, int game, String objname, Vect
         data.put("DemoName", "null");
         data.put("TimeSheetName", "null");  
         if (ZoneArchive.gameMask == 2)
-            data.put("DemoSkip", -1); 
+            data.put("DemoSkip", (short)-1); 
         
     }
     
diff --git a/src/whitehole/smg/object/GeneralObject.java b/src/whitehole/smg/object/GeneralObject.java
index 98ac98c..541cc8d 100644
--- a/src/whitehole/smg/object/GeneralObject.java
+++ b/src/whitehole/smg/object/GeneralObject.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,13 +7,11 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
 */
-
 package whitehole.smg.object;
 
 import whitehole.PropertyGrid;
@@ -80,22 +76,13 @@ public GeneralObject(ZoneArchive zone, String filepath, int game, String objname
         data.put("Obj_arg5", -1);
         data.put("Obj_arg6", -1);
         data.put("Obj_arg7", -1);
-        
-        data.put("l_id", 0);
-        data.put("CameraSetId", -1);
         data.put("SW_APPEAR", -1);
         data.put("SW_DEAD", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
-        if (ZoneArchive.gameMask == 2)
-        {
-            data.put("SW_AWAKE", -1);
-            data.put("SW_PARAM", -1);
-            data.put("ParamScale", 1f);
-        }
-        else
-            data.put("SW_SLEEP", -1);
         
+        data.put("l_id", 0);
+        data.put("CameraSetId", -1);
         data.put("CastId", -1);
         data.put("ViewGroupId", -1);
         data.put("ShapeModelNo", (short)-1);
@@ -104,12 +91,20 @@ public GeneralObject(ZoneArchive zone, String filepath, int game, String objname
         data.put("GroupId", (short)-1);
         data.put("DemoGroupId", (short)-1);
         data.put("MapParts_ID", (short)-1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("Obj_ID", (short)-1);
-        
         data.put("MessageId", -1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("GeneratorID", (short)-1);
+        
+        switch (ZoneArchive.gameMask) {
+            case 1:
+                data.put("SW_SLEEP", -1);
+                break;
+            case 2:
+                data.put("SW_AWAKE", -1);
+                data.put("SW_PARAM", -1);
+                data.put("ParamScale", 1f);
+                data.put("Obj_ID", (short)-1);
+                data.put("GeneratorID", (short)-1);
+                break;
+        }
     }
     
     @Override
@@ -153,18 +148,18 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_DEAD", "SW_DEAD", "int", null, data.get("SW_DEAD"), "Default");
         panel.addField("SW_A", "SW_A", "int", null, data.get("SW_A"), "Default");
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
-        if (ZoneArchive.gameMask == 2)
-        {
+        if (ZoneArchive.gameMask == 1) {
+            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
+        }
+        if (ZoneArchive.gameMask == 2) {
             panel.addField("SW_AWAKE", "SW_AWAKE", "int", null, data.get("SW_AWAKE"), "Default");
             panel.addField("SW_PARAM", "SW_PARAM", "int", null, data.get("SW_PARAM"), "Default");
         }
-        else
-            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
 
         panel.addCategory("obj_objinfo", "Other");
         panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");
-        panel.addField("CameraSetId", "CameraSetId", "int", null, data.get("CameraSetId"), "Default");
         panel.addField("MessageId", "MessageId", "int", null, data.get("MessageId"), "Default");
+        panel.addField("CameraSetId", "CameraSetId", "int", null, data.get("CameraSetId"), "Default");
         panel.addField("CastId", "CastId", "int", null, data.get("CastId"), "Default");
         panel.addField("ViewGroupId", "ViewGroupId", "int", null, data.get("ViewGroupId"), "Default");
         panel.addField("ShapeModelNo", "ShapeModelNo", "int", null, data.get("ShapeModelNo"), "Default");
diff --git a/src/whitehole/smg/object/GeneralPosObj.java b/src/whitehole/smg/object/GeneralPosObj.java
index f20273a..ee58f1d 100644
--- a/src/whitehole/smg/object/GeneralPosObj.java
+++ b/src/whitehole/smg/object/GeneralPosObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -37,7 +34,6 @@ public GeneralPosObj(ZoneArchive zone, String filepath, Bcsv.Entry entry)
         data = entry;
         
         name = (String)data.get("name");
-        if (!name.equals("GeneralPos")) System.out.println("Wrong object! ("+name+")");
         loadDBInfo();
         renderer = null;
         
@@ -45,6 +41,7 @@ public GeneralPosObj(ZoneArchive zone, String filepath, Bcsv.Entry entry)
         
         position = new Vector3((float)data.get("pos_x"), (float)data.get("pos_y"), (float)data.get("pos_z"));
         rotation = new Vector3((float)data.get("dir_x"), (float)data.get("dir_y"), (float)data.get("dir_z"));
+        scale = new Vector3(1,1,1);
     }
     
     public GeneralPosObj(ZoneArchive zone, String filepath, int game, Vector3 pos)
diff --git a/src/whitehole/smg/object/MapPartObj.java b/src/whitehole/smg/object/MapPartObj.java
index 97709ab..198c914 100644
--- a/src/whitehole/smg/object/MapPartObj.java
+++ b/src/whitehole/smg/object/MapPartObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -76,22 +73,13 @@ public MapPartObj(ZoneArchive zone, String filepath, int game, String objname, V
         data.put("Obj_arg1", -1);
         data.put("Obj_arg2", -1);
         data.put("Obj_arg3", -1);
-        
-        data.put("l_id", 0);
-        data.put("CameraSetId", -1);
         data.put("SW_APPEAR", -1);
         data.put("SW_DEAD", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
-        if (ZoneArchive.gameMask == 2)
-        {
-            data.put("SW_AWAKE", -1);
-            data.put("SW_PARAM", -1);
-            data.put("ParamScale", 1f);
-        }
-        else
-            data.put("SW_SLEEP", -1);
         
+        data.put("l_id", 0);
+        data.put("CameraSetId", -1);
         data.put("CastId", -1);
         data.put("ViewGroupId", -1);
         data.put("ShapeModelNo", (short)-1);
@@ -99,11 +87,6 @@ public MapPartObj(ZoneArchive zone, String filepath, int game, String objname, V
         data.put("ClippingGroupId", (short)-1);
         data.put("GroupId", (short)-1);
         data.put("DemoGroupId", (short)-1);
-        if (ZoneArchive.gameMask == 2)
-        {
-            data.put("MapParts_ID", (short)-1);
-            data.put("Obj_ID", (short)-1);
-        }
 
         data.put("MoveConditionType", 0);
         data.put("RotateSpeed", 0);
@@ -116,8 +99,20 @@ public MapPartObj(ZoneArchive zone, String filepath, int game, String objname, V
         data.put("SignMotionType", 0);
         data.put("PressType", -1);
         data.put("FarClip", -1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("ParentId", (short)-1);
+        
+        switch (ZoneArchive.gameMask) {
+            case 1:
+                data.put("SW_SLEEP", -1);
+                break;
+            case 2:
+                data.put("SW_AWAKE", -1);
+                data.put("SW_PARAM", -1);
+                data.put("ParamScale", 1f);
+                data.put("ParentId", (short)-1);
+                data.put("MapParts_ID", (short)-1);
+                data.put("Obj_ID", (short)-1);
+                break;
+        }
     }
     
     @Override
@@ -129,7 +124,6 @@ public void save()
         data.put("scale_x", scale.x); data.put("scale_y", scale.y); data.put("scale_z", scale.z);
     }
 
-    
     @Override
     public void getProperties(PropertyGrid panel)
     {
@@ -157,13 +151,12 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_DEAD", "SW_DEAD", "int", null, data.get("SW_DEAD"), "Default");
         panel.addField("SW_A", "SW_A", "int", null, data.get("SW_A"), "Default");
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
-        if (ZoneArchive.gameMask == 2)
-        {
+        if (ZoneArchive.gameMask == 1) 
+            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
+        if (ZoneArchive.gameMask == 2) {
             panel.addField("SW_AWAKE", "SW_AWAKE", "int", null, data.get("SW_AWAKE"), "Default");
             panel.addField("SW_PARAM", "SW_PARAM", "int", null, data.get("SW_PARAM"), "Default");
         }
-        else
-            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
         
         panel.addCategory("obj_mappartsinfo", "MapPart settings");
         panel.addField("MoveConditionType", "MoveConditionType", "int", null, data.get("MoveConditionType"), "Default");
@@ -178,9 +171,8 @@ public void getProperties(PropertyGrid panel)
         panel.addField("PressType", "PressType", "int", null, data.get("PressType"), "Default");
         panel.addField("FarClip", "FarClip", "int", null, data.get("FarClip"), "Default");
         
-                panel.addCategory("obj_objinfo", "Other");
+        panel.addCategory("obj_objinfo", "Other");
         panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");
-        
         panel.addField("CameraSetId", "CameraSetId", "int", null, data.get("CameraSetId"), "Default");
         panel.addField("CastId", "CastId", "int", null, data.get("CastId"), "Default");
         panel.addField("ViewGroupId", "ViewGroupId", "int", null, data.get("ViewGroupId"), "Default");
@@ -189,8 +181,7 @@ public void getProperties(PropertyGrid panel)
         panel.addField("ClippingGroupId", "ClippingGroupId", "int", null, data.get("ClippingGroupId"), "Default");
         panel.addField("GroupId", "GroupId", "int", null, data.get("GroupId"), "Default");
         panel.addField("DemoGroupId", "DemoGroupId", "int", null, data.get("DemoGroupId"), "Default");
-        if (ZoneArchive.gameMask == 2)
-        {
+        if (ZoneArchive.gameMask == 2) {
             panel.addField("MapParts_ID", "MapParts_ID", "int", null, data.get("MapParts_ID"), "Default");
             panel.addField("Obj_ID", "Obj_ID", "int", null, data.get("Obj_ID"), "Default");
             panel.addField("ParentId", "ParentId", "int", null, data.get("ParentId"), "Default");
diff --git a/src/whitehole/smg/object/PathObject.java b/src/whitehole/smg/object/PathObject.java
index 4c285ee..8d50abf 100644
--- a/src/whitehole/smg/object/PathObject.java
+++ b/src/whitehole/smg/object/PathObject.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -193,9 +190,6 @@ public void prerender(GLRenderer.RenderInfo info)
     }
     
     gl.glEndList();
-    
-
-
     gl.glNewList(this.displayLists[1], 4864);
     info.renderMode = GLRenderer.RenderMode.OPAQUE;
     
@@ -280,10 +274,6 @@ public void prerender(GLRenderer.RenderInfo info)
         }
       }
     }
-    
-
-
-
     gl.glEnd();
     gl.glEndList();
   }
diff --git a/src/whitehole/smg/object/PathPointObject.java b/src/whitehole/smg/object/PathPointObject.java
index f80b068..d1d1a62 100644
--- a/src/whitehole/smg/object/PathPointObject.java
+++ b/src/whitehole/smg/object/PathPointObject.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/smg/object/PlanetObj.java b/src/whitehole/smg/object/PlanetObj.java
index 2f3da31..65fbf9a 100644
--- a/src/whitehole/smg/object/PlanetObj.java
+++ b/src/whitehole/smg/object/PlanetObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -88,11 +85,6 @@ public PlanetObj(ZoneArchive zone, String filepath, int game, String objname, Ve
         data.put("SW_DEAD", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);
-        if (ZoneArchive.gameMask == 2)
-            data.put("SW_AWAKE", -1);
-        else
-            data.put("SW_SLEEP", -1);
-        
         data.put("l_id", 0);
         data.put("FollowId", -1);
         data.put("ShapeModelNo", (short)-1);
@@ -100,11 +92,18 @@ public PlanetObj(ZoneArchive zone, String filepath, int game, String objname, Ve
         data.put("ClippingGroupId", (short)-1);
         data.put("GroupId", (short)-1);
         data.put("DemoGroupId", (short)-1);
-        
         data.put("MapParts_ID", (short)-1);
         data.put("Obj_ID", (short)-1);
-        if (ZoneArchive.gameMask == 1) 
-            data.put("ChildObjId", (short)-1);
+        
+        switch (ZoneArchive.gameMask) {
+            case 1:
+                data.put("SW_SLEEP", -1);
+                data.put("ChildObjId", (short)-1);
+                break;
+            case 2:
+                data.put("SW_AWAKE", -1);
+                break;
+        }
     }
     
     @Override
@@ -116,7 +115,6 @@ public void save()
         data.put("scale_x", scale.x); data.put("scale_y", scale.y); data.put("scale_z", scale.z);
     }
 
-    
     @Override
     public void getProperties(PropertyGrid panel)
     {
@@ -150,10 +148,10 @@ public void getProperties(PropertyGrid panel)
         panel.addField("SW_DEAD", "SW_DEAD", "int", null, data.get("SW_DEAD"), "Default");
         panel.addField("SW_A", "SW_A", "int", null, data.get("SW_A"), "Default");
         panel.addField("SW_B", "SW_B", "int", null, data.get("SW_B"), "Default");
+        if (ZoneArchive.gameMask == 1)
+            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
         if (ZoneArchive.gameMask == 2)
             panel.addField("SW_AWAKE", "SW_AWAKE", "int", null, data.get("SW_AWAKE"), "Default");
-        else
-            panel.addField("SW_SLEEP", "SW_SLEEP", "int", null, data.get("SW_SLEEP"), "Default");
 
         panel.addCategory("obj_objinfo", "Other");
         panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default");
diff --git a/src/whitehole/smg/object/SoundObj.java b/src/whitehole/smg/object/SoundObj.java
index 1c27b44..7f4595d 100644
--- a/src/whitehole/smg/object/SoundObj.java
+++ b/src/whitehole/smg/object/SoundObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -95,7 +92,6 @@ public void save()
         data.put("scale_x", scale.x); data.put("scale_y", scale.y); data.put("scale_z", scale.z);
     }
 
-    
     @Override
     public void getProperties(PropertyGrid panel)
     {
diff --git a/src/whitehole/smg/object/StageObj.java b/src/whitehole/smg/object/StageObj.java
new file mode 100644
index 0000000..f0a719b
--- /dev/null
+++ b/src/whitehole/smg/object/StageObj.java
@@ -0,0 +1,102 @@
+/*
+    © 2012 - 2016 - Whitehole Team
+
+    Whitehole is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
+    WARRANTY; See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along 
+    with Whitehole. If not, see http://www.gnu.org/licenses/.
+*/
+
+package whitehole.smg.object;
+
+import whitehole.PropertyGrid;
+import whitehole.smg.Bcsv;
+import whitehole.smg.LevelObject;
+import whitehole.smg.ZoneArchive;
+import whitehole.vectors.Vector3;
+
+public class StageObj extends LevelObject
+{
+    public StageObj(ZoneArchive zone, String filepath, Bcsv.Entry entry)
+    {
+        this.zone = zone;
+        String[] stuff = filepath.split("/");
+        directory = stuff[0];
+        layer = stuff[1].toLowerCase();
+        file = stuff[2];
+        
+        data = entry;
+        
+        name = (String)data.get("name");
+        loadDBInfo();
+        renderer = null;
+        
+        uniqueID = -1;
+        
+        position = new Vector3((float)data.get("pos_x"), (float)data.get("pos_y"), (float)data.get("pos_z"));
+        rotation = new Vector3((float)data.get("dir_x"), (float)data.get("dir_y"), (float)data.get("dir_z"));
+        scale = new Vector3(1,1,1);
+    }
+    
+    public StageObj(ZoneArchive zone, String filepath, int game, Vector3 pos)
+    {
+        this.zone = zone;
+        String[] stuff = filepath.split("/");
+        directory = stuff[0];
+        layer = stuff[1].toLowerCase();
+        file = stuff[2];
+        
+        data = new Bcsv.Entry();
+        
+        name = "";
+        loadDBInfo();
+        renderer = null;
+        
+        uniqueID = -1;
+        
+        position = pos;
+        rotation = new Vector3(0f, 0f, 0f);
+        scale = new Vector3(1f, 1f, 1f);
+        
+        data.put("name", name);
+        data.put("l_id", 0);
+        data.put("pos_x", position.x); data.put("pos_y", position.y); data.put("pos_z", position.z);
+        data.put("dir_x", rotation.x); data.put("dir_y", rotation.y); data.put("dir_z", rotation.z);
+    }
+    
+    @Override
+    public void save()
+    {
+        data.put("name", name);
+        data.put("pos_x", position.x); data.put("pos_y", position.y); data.put("pos_z", position.z);
+        data.put("dir_x", rotation.x); data.put("dir_y", rotation.y); data.put("dir_z", rotation.z);
+    }
+
+    @Override
+    public void getProperties(PropertyGrid panel)
+    {
+        panel.addCategory("obj_position", "Position");
+        panel.addField("pos_x", "X position", "float", null, position.x, "Default");
+        panel.addField("pos_y", "Y position", "float", null, position.y, "Default");
+        panel.addField("pos_z", "Z position", "float", null, position.z, "Default");
+        panel.addField("dir_x", "X rotation", "float", null, rotation.x, "Default");
+        panel.addField("dir_y", "Y rotation", "float", null, rotation.y, "Default");
+        panel.addField("dir_z", "Z rotation", "float", null, rotation.z, "Default");
+        
+        panel.addCategory("obj_objinfo", "Other");
+        panel.addField("l_id", "l_id", "int", null, data.get("l_id"), "Default"); 
+    }
+    
+    @Override
+    public String toString()
+    {
+        String l = layer.equals("common") ? "Common" : "Layer"+layer.substring(5).toUpperCase();
+        return name + " [" + l + "]";
+    }
+}
diff --git a/src/whitehole/smg/object/StartObj.java b/src/whitehole/smg/object/StartObj.java
index df33fca..e63cfdf 100644
--- a/src/whitehole/smg/object/StartObj.java
+++ b/src/whitehole/smg/object/StartObj.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
@@ -87,7 +84,6 @@ public void save()
         data.put("scale_x", scale.x); data.put("scale_y", scale.y); data.put("scale_z", scale.z);
     }
 
-    
     @Override
     public void getProperties(PropertyGrid panel)
     {
diff --git a/src/whitehole/vectors/Color4.java b/src/whitehole/vectors/Color4.java
index d6a9ad2..17c5fd7 100644
--- a/src/whitehole/vectors/Color4.java
+++ b/src/whitehole/vectors/Color4.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/vectors/Matrix4.java b/src/whitehole/vectors/Matrix4.java
index 1bd1d5c..24de9b1 100644
--- a/src/whitehole/vectors/Matrix4.java
+++ b/src/whitehole/vectors/Matrix4.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/vectors/Vector2.java b/src/whitehole/vectors/Vector2.java
index eae5c72..af0e47a 100644
--- a/src/whitehole/vectors/Vector2.java
+++ b/src/whitehole/vectors/Vector2.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.
diff --git a/src/whitehole/vectors/Vector3.java b/src/whitehole/vectors/Vector3.java
index 4abff64..20a336f 100644
--- a/src/whitehole/vectors/Vector3.java
+++ b/src/whitehole/vectors/Vector3.java
@@ -1,7 +1,5 @@
 /*
-    Copyright 2012 The Whitehole team
-
-    This file is part of Whitehole.
+    © 2012 - 2016 - Whitehole Team
 
     Whitehole is free software: you can redistribute it and/or modify it under
     the terms of the GNU General Public License as published by the Free
@@ -9,8 +7,7 @@
     any later version.
 
     Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY 
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+    WARRANTY; See the GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along 
     with Whitehole. If not, see http://www.gnu.org/licenses/.