--- a/chitem.clw
+++ b/chitem.clw
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CProjGemRB
+LastClass=CChitemDlg
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "chitem.h"
@@ -232,140 +232,140 @@
 Resource123=IDD_GAMEGENERAL
 Class98=IcewindCre
 Resource124=IDR_SHORTCUT
-Resource125=IDD_MAPEDIT (English (U.S.))
-Resource126=IDD_ITEMEFFECT (English (U.S.))
-Resource127=IDD_AREAINT (English (U.S.))
-Resource128=IDR_EFFECT (English (U.S.))
-Resource129=IDD_CREATURERES (English (U.S.))
-Resource130=IDD_CHECK (English (U.S.))
-Resource131=IDD_ITEMGENERAL (English (U.S.))
-Resource132=IDR_TILE (English (U.S.))
-Resource133=IDD_AREACONTAINER (English (U.S.))
-Resource134=IDD_WEDPOLY (English (U.S.))
-Resource135=IDD_AREADOOR (English (U.S.))
-Resource136=IDD_AREATRIGGERSTRINGS (English (U.S.))
-Resource137=IDD_VARIABLES (English (U.S.))
-Resource138=IDD_CHUIEDIT (English (U.S.))
-Resource139=IDD_SPELLEFFECT (English (U.S.))
-Resource140=IDR_ITEM (English (U.S.))
-Resource141=IDD_SPELLDESC (English (U.S.))
-Resource142=IDD_CREATURELEVELS (English (U.S.))
-Resource143=IDD_PROJEDIT (English (U.S.))
-Resource144=IDD_STOREEXTRA (English (U.S.))
-Resource145=IDD_SEARCHNODE (English (U.S.))
-Resource146=IDR_SCRIPT (English (U.S.))
-Resource147=IDD_STOREEDIT (English (U.S.))
-Resource148=IDD_ITEMPICKER (English (U.S.))
-Resource149=IDR_CREATURE (English (U.S.))
-Resource150=IDD_CREATUREGENERAL (English (U.S.))
-Resource151=IDD_SPELLEDIT (English (U.S.))
-Resource152=IDD_AREASPAWN (English (U.S.))
-Resource153=IDR_TREEMENU (English (U.S.))
-Resource154=IDR_MENUBAR (English (U.S.))
-Resource155=IDD_ITEMDESC (English (U.S.))
-Resource156=IDD_ADDLINK (English (U.S.))
-Resource157=IDD_SPELLEQUIP (English (U.S.))
-Resource158=IDD_SCHEDULE (English (U.S.))
-Resource159=IDR_CHUI (English (U.S.))
-Resource160=IDD_ITEMEXTRA (English (U.S.))
-Resource161=IDD_WEDTILE (English (U.S.))
-Resource162=IDD_CREATUREEDIT (English (U.S.))
-Resource163=IDD_MUSEDIT (English (U.S.))
-Resource164=IDD_PALETTE (English (U.S.))
-Resource165=IDD_SCRIPTEDIT (English (U.S.))
-Resource166=IDR_BAMMENU (English (U.S.))
-Resource167=IDD_VVCEDIT (English (U.S.))
-Resource168=IDD_AREAVARIABLE (English (U.S.))
-Resource169=IDD_CREATUREIWD (English (U.S.))
-Resource170=IDD_CREATUREEFF (English (U.S.))
-Resource171=IDD_ITEMEDIT (English (U.S.))
-Resource172=IDD_EXTRACT2 (English (U.S.))
-Resource173=IDD_STOREDRINKS (English (U.S.))
-Resource174=IDR_GAME (English (U.S.))
-Resource175=IDD_SPELLGENERAL (English (U.S.))
-Resource176=IDD_AREAENTRANCE (English (U.S.))
-Resource177=IDD_ITEMEQUIP (English (U.S.))
-Resource178=IDD_SRCEDIT (English (U.S.))
-Resource179=IDR_SPELL (English (U.S.))
-Resource180=IDR_VVC (English (U.S.))
-Resource181=IDD_STOREGENERAL (English (U.S.))
-Resource182=IDD_AREAACTOR (English (U.S.))
-Resource183=IDD_SAVHANDLE (English (U.S.))
-Resource184=IDD_PANICBUTTON (English (U.S.))
-Resource185=IDD_GAMEEDIT (English (U.S.))
-Resource186=IDD_BAMEDIT (English (U.S.))
-Resource187=IDD_WEDEDIT (English (U.S.))
-Resource188=IDR_TLKMENU (English (U.S.))
-Resource189=IDD_SPELLTOOL (English (U.S.))
-Resource190=IDD_ABOUTBOX (English (U.S.))
-Resource191=IDD_AREAGENERAL (English (U.S.))
-Resource192=IDD_CFB (English (U.S.))
-Resource193=IDD_GAMEPCINFO (English (U.S.))
-Resource194=IDD_ANIMDIALOG
-Resource195=IDR_2DA (English (U.S.))
-Resource196=IDD_CREATURESKILLS (English (U.S.))
-Resource197=IDD_AREAMAP (English (U.S.))
-Resource198=IDD_EDIT (English (U.S.))
-Resource199=IDD_CREATUREUNKNOWN (English (U.S.))
-Resource200=IDD_PROJGEMRB (English (U.S.))
-Resource201=IDD_AREATRIGGER (English (U.S.))
-Resource202=IDD_STOREITEMS (English (U.S.))
-Resource203=IDD_WEIDU (English (U.S.))
-Resource204=IDD_SPELLEXTRA (English (U.S.))
-Resource205=IDD_STORERENTAL (English (U.S.))
-Resource206=IDD_CREATUREITEMS (English (U.S.))
-Resource207=IDD_EXTRACT (English (U.S.))
-Resource208=IDR_WEDMENU (English (U.S.))
-Resource209=IDD_IDSEDIT (English (U.S.))
-Resource210=IDD_TEXTVIEW (English (U.S.))
-Resource211=IDD_KEYEDIT (English (U.S.))
-Resource212=IDD_STRREFDLG (English (U.S.))
-Resource213=IDR_SRC (English (U.S.))
-Resource214=IDD_CREATUREIWD2 (English (U.S.))
-Resource215=IDD_AREAPROJ (English (U.S.))
-Resource216=IDD_2DAEDIT (English (U.S.))
-Resource217=IDD_CHITEM_DIALOG (English (U.S.))
-Resource218=IDD_COMPAT (English (U.S.))
-Resource219=IDD_PROGRESS (English (U.S.))
-Resource220=IDD_GAMESTATS (English (U.S.))
-Resource221=IDD_IAPDIALOG (English (U.S.))
-Resource222=IDD_COLORPICKER (English (U.S.))
-Resource223=IDD_CREATUREPST (English (U.S.))
-Resource224=IDR_MUSIC (English (U.S.))
-Resource225=IDD_CREATUREOVR (English (U.S.))
-Resource226=IDD_SHOWLOG (English (U.S.))
-Resource227=IDD_ITEMICONS (English (U.S.))
-Resource228=IDD_EFFEDIT (English (U.S.))
-Resource229=IDR_WORLDMAP (English (U.S.))
-Resource230=IDD_FINDITEM (English (U.S.))
-Resource231=IDD_MAPLINK (English (U.S.))
-Resource232=IDD_AREAEDIT (English (U.S.))
-Resource233=IDR_STORE (English (U.S.))
-Resource234=IDR_PROJECT (English (U.S.))
-Resource235=IDD_AREAAMBIENT (English (U.S.))
-Resource236=IDD_MOSEDIT (English (U.S.))
-Resource237=IDR_AREA (English (U.S.))
-Resource238=IDD_CREATURESTRINGS (English (U.S.))
-Resource239=IDD_IMAGEVIEW (English (U.S.))
-Resource240=IDD_POLYGON (English (U.S.))
-Resource241=IDD_DIALOGEDIT (English (U.S.))
-Resource242=IDR_IDS (English (U.S.))
-Resource243=IDD_GAMEGENERAL (English (U.S.))
-Resource244=IDD_MASSCLEAR (English (U.S.))
-Resource245=IDD_PROJEXT (English (U.S.))
+Resource125=IDD_ANIMDIALOG
+Resource126=IDD_SAVHANDLE (English (U.S.))
+Resource127=IDR_PROJECT (English (U.S.))
+Resource128=IDD_CREATUREICONS (English (U.S.))
+Resource129=IDR_SCRIPT (English (U.S.))
+Resource130=IDD_EDIT (English (U.S.))
+Resource131=IDD_SCRIPTEDIT (English (U.S.))
+Resource132=IDD_SEARCHNODE (English (U.S.))
+Resource133=IDR_2DA (English (U.S.))
+Resource134=IDD_STOREGENERAL (English (U.S.))
+Resource135=IDR_IDS (English (U.S.))
+Resource136=IDD_SPELLEDIT (English (U.S.))
+Resource137=IDD_WEDTILE (English (U.S.))
+Resource138=IDD_ITEMEXTRA (English (U.S.))
+Resource139=IDD_AREATRIGGERSTRINGS (English (U.S.))
+Resource140=IDD_AREASPAWN (English (U.S.))
+Resource141=IDD_CREATUREIWD (English (U.S.))
+Resource142=IDD_AREAEDIT (English (U.S.))
+Resource143=IDR_BAMMENU (English (U.S.))
+Resource144=IDD_AREAMAP (English (U.S.))
+Resource145=IDR_CHITIN (English (U.S.))
+Resource146=IDD_AREAAMBIENT (English (U.S.))
+Resource147=IDD_WEDPOLY (English (U.S.))
+Resource148=IDD_PANICBUTTON (English (U.S.))
+Resource149=IDD_CREATURERES (English (U.S.))
+Resource150=IDR_EFFECT (English (U.S.))
+Resource151=IDD_CREATUREIWD2 (English (U.S.))
+Resource152=IDR_SPELL (English (U.S.))
+Resource153=IDD_AREATRIGGER (English (U.S.))
+Resource154=IDD_PROJEDIT (English (U.S.))
+Resource155=IDD_CREATUREPST (English (U.S.))
+Resource156=IDR_SRC (English (U.S.))
+Resource157=IDD_GAMEGENERAL (English (U.S.))
+Resource158=IDR_MENUBAR (English (U.S.))
+Resource159=IDD_ADDLINK (English (U.S.))
+Resource160=IDD_SRCEDIT (English (U.S.))
+Resource161=IDD_STORERENTAL (English (U.S.))
+Resource162=IDR_STORE (English (U.S.))
+Resource163=IDD_VVCEDIT (English (U.S.))
+Resource164=IDD_POLYGON (English (U.S.))
+Resource165=IDD_ITEMICONS (English (U.S.))
+Resource166=IDD_AREAENTRANCE (English (U.S.))
+Resource167=IDD_CREATUREEFF (English (U.S.))
+Resource168=IDR_MUSIC (English (U.S.))
+Resource169=IDD_SPELLEFFECT (English (U.S.))
+Resource170=IDD_CFB (English (U.S.))
+Resource171=IDD_AREAANIM (English (U.S.))
+Resource172=IDD_CREATUREOVR (English (U.S.))
+Resource173=IDD_PALETTE (English (U.S.))
+Resource174=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource175=IDD_TEXTVIEW (English (U.S.))
+Resource176=IDR_TREEMENU (English (U.S.))
+Resource177=IDD_STRREFDLG (English (U.S.))
+Resource178=IDD_STOREEXTRA (English (U.S.))
+Resource179=IDD_CREATUREEDIT (English (U.S.))
+Resource180=IDD_AREAINT (English (U.S.))
+Resource181=IDD_MASSCLEAR (English (U.S.))
+Resource182=IDD_PROJGEMRB (English (U.S.))
+Resource183=IDD_ITEMPICKER (English (U.S.))
+Resource184=IDD_EXTRACT (English (U.S.))
+Resource185=IDR_CHUI (English (U.S.))
+Resource186=IDD_STOREDRINKS (English (U.S.))
+Resource187=IDD_STOREEDIT (English (U.S.))
+Resource188=IDD_AREASONGS (English (U.S.))
+Resource189=IDD_COMPAT (English (U.S.))
+Resource190=IDD_2DAEDIT (English (U.S.))
+Resource191=IDD_CREATURELEVELS (English (U.S.))
+Resource192=IDD_WEDEDIT (English (U.S.))
+Resource193=IDD_SPELLDESC (English (U.S.))
+Resource194=IDR_WEDMENU (English (U.S.))
+Resource195=IDD_AREADOOR (English (U.S.))
+Resource196=IDR_CREATURE (English (U.S.))
+Resource197=IDD_BAMEDIT (English (U.S.))
+Resource198=IDD_PROGRESS (English (U.S.))
+Resource199=IDR_TLKMENU (English (U.S.))
+Resource200=IDD_SCHEDULE (English (U.S.))
+Resource201=IDR_ITEM (English (U.S.))
+Resource202=IDD_TISDIALOG (English (U.S.))
+Resource203=IDD_CREATUREITEMS (English (U.S.))
+Resource204=IDD_GAMEPCINFO (English (U.S.))
+Resource205=IDD_SPELLTOOL (English (U.S.))
+Resource206=IDD_IMAGEVIEW (English (U.S.))
+Resource207=IDD_MUSEDIT (English (U.S.))
+Resource208=IDD_GAMEEDIT (English (U.S.))
+Resource209=IDD_CHECK (English (U.S.))
+Resource210=IDD_ITEMDESC (English (U.S.))
+Resource211=IDD_VARIABLES (English (U.S.))
+Resource212=IDD_ITEMEFFECT (English (U.S.))
+Resource213=IDD_PROJEXT (English (U.S.))
+Resource214=IDD_EXTRACT2 (English (U.S.))
+Resource215=IDD_AREAACTOR (English (U.S.))
+Resource216=IDD_CHITEM_DIALOG (English (U.S.))
+Resource217=IDD_IDSEDIT (English (U.S.))
+Resource218=IDD_CHUIEDIT (English (U.S.))
+Resource219=IDD_IAPDIALOG (English (U.S.))
+Resource220=IDD_SPELLEQUIP (English (U.S.))
+Resource221=IDD_FINDITEM (English (U.S.))
+Resource222=IDD_ITEMEDIT (English (U.S.))
+Resource223=IDD_ITEMUSE (English (U.S.))
+Resource224=IDD_DIALOGEDIT (English (U.S.))
+Resource225=IDD_AREAGENERAL (English (U.S.))
+Resource226=IDD_ITEMEQUIP (English (U.S.))
+Resource227=IDD_SHOWLOG (English (U.S.))
+Resource228=IDD_KEYEDIT (English (U.S.))
+Resource229=IDD_CREATURESTRINGS (English (U.S.))
+Resource230=IDD_COLORPICKER (English (U.S.))
+Resource231=IDD_WEIDU (English (U.S.))
+Resource232=IDD_AREAPROJ (English (U.S.))
+Resource233=IDD_CREATUREGENERAL (English (U.S.))
+Resource234=IDD_AREACONTAINER (English (U.S.))
+Resource235=IDR_VVC (English (U.S.))
+Resource236=IDD_ABOUTBOX (English (U.S.))
+Resource237=IDD_CREATURESKILLS (English (U.S.))
+Resource238=IDR_AREA (English (U.S.))
+Resource239=IDD_MOSEDIT (English (U.S.))
+Resource240=IDD_SPELLGENERAL (English (U.S.))
+Resource241=IDR_TILE (English (U.S.))
+Resource242=IDD_AREAVARIABLE (English (U.S.))
+Resource243=IDD_SPELLEXTRA (English (U.S.))
+Resource244=IDD_STOREITEMS (English (U.S.))
+Resource245=IDD_MAPLINK (English (U.S.))
 Class99=CAreaTriggerString
 Class100=CPCInfo
-Resource246=IDD_ITEMUSE (English (U.S.))
+Resource246=IDD_GAMESTATS (English (U.S.))
 Class101=CCreatureOverlay
-Resource247=IDD_AREAANIM (English (U.S.))
+Resource247=IDD_ITEMGENERAL (English (U.S.))
 Class102=IWD2Creature
-Resource248=IDR_CHITIN (English (U.S.))
+Resource248=IDD_MAPEDIT (English (U.S.))
 Class103=CAnimDialog
-Resource249=IDD_AREASONGS (English (U.S.))
+Resource249=IDR_WORLDMAP (English (U.S.))
 Class104=CCreatureLevels
-Resource250=IDD_TISDIALOG (English (U.S.))
+Resource250=IDD_EFFEDIT (English (U.S.))
 Class105=CAreaProj
-Resource251=IDD_CREATUREICONS (English (U.S.))
+Resource251=IDR_GAME (English (U.S.))
 Class106=CProjGemRB
 Resource252=IDR_SHORTCUT (English (U.S.))
 
@@ -383,7 +383,7 @@
 Filter=D
 BaseClass=CDialog
 VirtualFilter=dWC
-LastObject=ID_SEARCH_PROJECTILE
+LastObject=ID_CHECK_SPAWNINI
 
 [CLS:CAboutDlg]
 Type=0
@@ -9595,50 +9595,51 @@
 Command51=ID_CHECK_ITEM
 Command52=ID_CHECK_PROJECTILE
 Command53=ID_CHECK_SCRIPT
-Command54=ID_CHECK_SPELL
-Command55=ID_CHECK_STORE
-Command56=ID_CHECK_2DA
-Command57=ID_CHECK_UI
-Command58=ID_CHECK_VVC
-Command59=ID_CHECK_WORLDMAP
-Command60=ID_CHECK_AVATAR2DA
-Command61=ID_FILE_EXTRACT
-Command62=ID_FILE_SEARCH
-Command63=ID_UNCOMPRESSBIF
-Command64=ID_UNCOMPRESSSAV
-Command65=ID_UNCOMPRESSCBF
-Command66=ID_SKIMSAV
-Command67=ID_EXTRACTION_RECOMPRESSSAV
-Command68=ID_FILE_BUILDBIF
-Command69=ID_REORDERBIF
-Command70=ID_COMPRESSBIF
-Command71=ID_COMPRESSCBF
-Command72=ID_WAVCTOWAV
-Command73=ID_WAVCTOWAV2
-Command74=ID_WAVTOWAVC
-Command75=ID_ACMTOWAV
-Command76=ID_ACMTOWAV2
-Command77=ID_WAVTOACM
-Command78=ID_ADDCFBTOSPELLS
-Command79=ID_CLEARCFBFROMSPELLS
-Command80=ID_TOOLS_DECOMPILE
-Command81=ID_TOOLS_LOOKUPSTRREF
-Command82=ID_AVATARS
-Command83=ID_SCANVARIABLES
-Command84=ID_TOOLS_SCANJOURNALENTRIES
-Command85=ID_TISPACK
-Command86=ID_LOGGING_NONE
-Command87=ID_LOGGING_SCREEN
-Command88=ID_LOGGING_FILE
-Command89=ID_PROGRESS
-Command90=ID_READONLY
-Command91=ID_USEDIALOGF
-Command92=ID_COMPAT
-Command93=ID_SAVESETTINGS
-Command94=IDM_ABOUTBOX
-Command95=ID_TOOLTIPS
-Command96=ID_HELP_README
-CommandCount=96
+Command54=ID_CHECK_SPAWNINI
+Command55=ID_CHECK_SPELL
+Command56=ID_CHECK_STORE
+Command57=ID_CHECK_2DA
+Command58=ID_CHECK_UI
+Command59=ID_CHECK_VVC
+Command60=ID_CHECK_WORLDMAP
+Command61=ID_CHECK_AVATAR2DA
+Command62=ID_FILE_EXTRACT
+Command63=ID_FILE_SEARCH
+Command64=ID_UNCOMPRESSBIF
+Command65=ID_UNCOMPRESSSAV
+Command66=ID_UNCOMPRESSCBF
+Command67=ID_SKIMSAV
+Command68=ID_EXTRACTION_RECOMPRESSSAV
+Command69=ID_FILE_BUILDBIF
+Command70=ID_REORDERBIF
+Command71=ID_COMPRESSBIF
+Command72=ID_COMPRESSCBF
+Command73=ID_WAVCTOWAV
+Command74=ID_WAVCTOWAV2
+Command75=ID_WAVTOWAVC
+Command76=ID_ACMTOWAV
+Command77=ID_ACMTOWAV2
+Command78=ID_WAVTOACM
+Command79=ID_ADDCFBTOSPELLS
+Command80=ID_CLEARCFBFROMSPELLS
+Command81=ID_TOOLS_DECOMPILE
+Command82=ID_TOOLS_LOOKUPSTRREF
+Command83=ID_AVATARS
+Command84=ID_SCANVARIABLES
+Command85=ID_TOOLS_SCANJOURNALENTRIES
+Command86=ID_TISPACK
+Command87=ID_LOGGING_NONE
+Command88=ID_LOGGING_SCREEN
+Command89=ID_LOGGING_FILE
+Command90=ID_PROGRESS
+Command91=ID_READONLY
+Command92=ID_USEDIALOGF
+Command93=ID_COMPAT
+Command94=ID_SAVESETTINGS
+Command95=IDM_ABOUTBOX
+Command96=ID_TOOLTIPS
+Command97=ID_HELP_README
+CommandCount=97
 
 [MNU:IDR_BAMMENU (English (U.S.))]
 Type=1