diff --git a/Win32/Blades of Exile Char Editor/BLADPCED.RC b/Win32/Blades of Exile Char Editor/BLADPCED.RC
index f71f82dc..84ba4ee7 100644
--- a/Win32/Blades of Exile Char Editor/BLADPCED.RC	
+++ b/Win32/Blades of Exile Char Editor/BLADPCED.RC	
@@ -117,17 +117,17 @@ ACCELERATORS_1 ACCELERATORS
  "^Q", 4, ASCII
 }
 
-120 CURSOR "resources/sword.cur"
+120 CURSOR "Resources/sword.cur"
 
 
-10 ICON "resources/bladexil.ico"
+10 ICON "Resources/BLADEXIL.ICO"
 
 
-1 WAVE "resources/snd0.wav"
-2 WAVE "resources/snd1.wav"
-4 WAVE "resources/snd3.wav"
-35 WAVE "resources/snd34.wav"
-38 WAVE "resources/snd37.wav"
+1 WAVE "Resources/snd0.wav"
+2 WAVE "Resources/snd1.wav"
+4 WAVE "Resources/snd3.wav"
+35 WAVE "Resources/snd34.wav"
+38 WAVE "Resources/snd37.wav"
 
 STRINGTABLE
 {
diff --git a/Win32/Blades of Exile Char Editor/Blades_of_Exile_Character_Editor_private.rc b/Win32/Blades of Exile Char Editor/Blades_of_Exile_Character_Editor_private.rc
new file mode 100644
index 00000000..351b789b
--- /dev/null
+++ b/Win32/Blades of Exile Char Editor/Blades_of_Exile_Character_Editor_private.rc	
@@ -0,0 +1,5 @@
+/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
+/* DO NOT EDIT! */
+
+#include "BLADPCED.RC"
+
diff --git a/Win32/Blades of Exile Char Editor/Makefile-Nightly-amd64 b/Win32/Blades of Exile Char Editor/Makefile-Nightly-amd64
new file mode 100644
index 00000000..17724e16
--- /dev/null
+++ b/Win32/Blades of Exile Char Editor/Makefile-Nightly-amd64	
@@ -0,0 +1,57 @@
+# Project: Blades of Exile Character Editor
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = amd64-mingw32msvc-g++
+CC   = amd64-mingw32msvc-gcc
+WINDRES = amd64-mingw32msvc-windres
+RES  = Blades_of_Exile_Character_Editor_private.res
+OBJ  = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
+LINKOBJ  = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
+LIBS =  -lwinmm -mwindows -lwinmm  
+INCS =  -I"include" 
+CXXINCS =  
+BIN  = "Blades of Exile Character Editor.exe"
+CXXFLAGS = $(CXXINCS) -Wall    -O2 
+CFLAGS = $(INCS)   -O2
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile Character Editor.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile Character Editor.exe" $(LIBS)
+
+graphutl.o: graphutl.cpp
+	$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
+
+bladpced.o: bladpced.cpp
+	$(CPP) -c bladpced.cpp -o bladpced.o $(CXXFLAGS)
+
+dlogtool.o: dlogtool.cpp
+	$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
+
+edaction.o: edaction.cpp
+	$(CPP) -c edaction.cpp -o edaction.o $(CXXFLAGS)
+
+edfileio.o: edfileio.cpp
+	$(CPP) -c edfileio.cpp -o edfileio.o $(CXXFLAGS)
+
+editors.o: editors.cpp
+	$(CPP) -c editors.cpp -o editors.o $(CXXFLAGS)
+
+edsound.o: edsound.cpp
+	$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+graphics.o: graphics.cpp
+	$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
+
+Blades_of_Exile_Character_Editor_private.res: Blades_of_Exile_Character_Editor_private.rc BLADPCED.RC 
+	$(WINDRES) -i Blades_of_Exile_Character_Editor_private.rc --input-format=rc -o Blades_of_Exile_Character_Editor_private.res -O coff 
diff --git a/Win32/Blades of Exile Char Editor/Makefile-Nightly-i586 b/Win32/Blades of Exile Char Editor/Makefile-Nightly-i586
new file mode 100644
index 00000000..d2343d4b
--- /dev/null
+++ b/Win32/Blades of Exile Char Editor/Makefile-Nightly-i586	
@@ -0,0 +1,57 @@
+# Project: Blades of Exile Character Editor
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = i586-mingw32msvc-g++
+CC   = i586-mingw32msvc-gcc
+WINDRES = i586-mingw32msvc-windres
+RES  = Blades_of_Exile_Character_Editor_private.res
+OBJ  = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
+LINKOBJ  = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
+LIBS =  -lwinmm -mwindows -lwinmm  
+INCS =  -I"include" 
+CXXINCS =  
+BIN  = "Blades of Exile Character Editor.exe"
+CXXFLAGS = $(CXXINCS) -Wall    -O2 
+CFLAGS = $(INCS)   -O2
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile Character Editor.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile Character Editor.exe" $(LIBS)
+
+graphutl.o: graphutl.cpp
+	$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
+
+bladpced.o: bladpced.cpp
+	$(CPP) -c bladpced.cpp -o bladpced.o $(CXXFLAGS)
+
+dlogtool.o: dlogtool.cpp
+	$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
+
+edaction.o: edaction.cpp
+	$(CPP) -c edaction.cpp -o edaction.o $(CXXFLAGS)
+
+edfileio.o: edfileio.cpp
+	$(CPP) -c edfileio.cpp -o edfileio.o $(CXXFLAGS)
+
+editors.o: editors.cpp
+	$(CPP) -c editors.cpp -o editors.o $(CXXFLAGS)
+
+edsound.o: edsound.cpp
+	$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+graphics.o: graphics.cpp
+	$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
+
+Blades_of_Exile_Character_Editor_private.res: Blades_of_Exile_Character_Editor_private.rc BLADPCED.RC 
+	$(WINDRES) -i Blades_of_Exile_Character_Editor_private.rc --input-format=rc -o Blades_of_Exile_Character_Editor_private.res -O coff 
diff --git a/Win32/Blades of Exile/BLADES.RC b/Win32/Blades of Exile/BLADES.RC
index 69cd5e18..7de6ff8c 100644
--- a/Win32/Blades of Exile/BLADES.RC	
+++ b/Win32/Blades of Exile/BLADES.RC	
@@ -113,27 +113,27 @@ ACCELERATORS_1 ACCELERATORS
  "^N", 4, ASCII
 }
 
-89 CURSOR "resources/ul.cur"
-90 CURSOR "resources/u.cur"
-110 CURSOR "resources/d.cur"
-91 CURSOR "resources/ur.cur"
-99 CURSOR "resources/l.cur"
-100 CURSOR "resources/c.cur"
-101 CURSOR "resources/r.cur"
-109 CURSOR "resources/dl.cur"
-111 CURSOR "resources/dr.cur"
+89 CURSOR "Resources/ul.cur"
+90 CURSOR "Resources/u.cur"
+110 CURSOR "Resources/d.cur"
+91 CURSOR "Resources/ur.cur"
+99 CURSOR "Resources/l.cur"
+100 CURSOR "Resources/c.cur"
+101 CURSOR "Resources/r.cur"
+109 CURSOR "Resources/dl.cur"
+111 CURSOR "Resources/dr.cur"
 
-120 CURSOR "resources/sword.cur"
+120 CURSOR "Resources/sword.cur"
 
 
-126 CURSOR "resources/talk.cur"
+126 CURSOR "Resources/talk.cur"
 
 
-124 CURSOR "resources/target.cur"
+124 CURSOR "Resources/target.cur"
 
 
-122 CURSOR "resources/key.cur"
+122 CURSOR "Resources/key.cur"
 
-129 CURSOR "resources/look.cur"
+129 CURSOR "Resources/look.cur"
 
-10 ICON "resources/bladexil.ico"
+10 ICON "Resources/BLADEXIL.ICO"
diff --git a/Win32/Blades of Exile/Blades_of_Exile_private.rc b/Win32/Blades of Exile/Blades_of_Exile_private.rc
new file mode 100644
index 00000000..4d9eb803
--- /dev/null
+++ b/Win32/Blades of Exile/Blades_of_Exile_private.rc	
@@ -0,0 +1,7 @@
+/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
+/* DO NOT EDIT! */
+
+#include "BLADES.RC"
+#include "GAMEDLOG.RC"
+#include "GAMESTR.RC"
+
diff --git a/Win32/Blades of Exile/Makefile-Nightly-amd64 b/Win32/Blades of Exile/Makefile-Nightly-amd64
new file mode 100644
index 00000000..14314d45
--- /dev/null
+++ b/Win32/Blades of Exile/Makefile-Nightly-amd64	
@@ -0,0 +1,111 @@
+# Project: Blades of Exile Win32
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = amd64-mingw32msvc-g++
+CC   = amd64-mingw32msvc-gcc
+WINDRES = amd64-mingw32msvc-windres
+RES  = Blades_of_Exile_private.res
+OBJ  = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
+LINKOBJ  = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
+LIBS = -mwindows -lwinmm  
+INCS =  -I"include" 
+CXXINCS = 
+BIN  = "Blades of Exile.exe"
+CXXFLAGS = $(CXXINCS) -Wall    -O2
+CFLAGS = $(INCS)   -O2
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile.exe" $(LIBS)
+
+boe.actions.o: boe.actions.cpp
+	$(CPP) -c boe.actions.cpp -o boe.actions.o $(CXXFLAGS)
+
+boe.main.o: boe.main.cpp
+	$(CPP) -c boe.main.cpp -o boe.main.o $(CXXFLAGS)
+
+boe.combat.o: boe.combat.cpp
+	$(CPP) -c boe.combat.cpp -o boe.combat.o $(CXXFLAGS)
+
+boe.dlgutil.o: boe.dlgutil.cpp
+	$(CPP) -c boe.dlgutil.cpp -o boe.dlgutil.o $(CXXFLAGS)
+
+boe.fields.o: boe.fields.cpp
+	$(CPP) -c boe.fields.cpp -o boe.fields.o $(CXXFLAGS)
+
+boe.fileio.o: boe.fileio.cpp
+	$(CPP) -c boe.fileio.cpp -o boe.fileio.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+boe.graphics.o: boe.graphics.cpp
+	$(CPP) -c boe.graphics.cpp -o boe.graphics.o $(CXXFLAGS)
+
+boe.graphutil.o: boe.graphutil.cpp
+	$(CPP) -c boe.graphutil.cpp -o boe.graphutil.o $(CXXFLAGS)
+
+boe.infodlg.o: boe.infodlg.cpp
+	$(CPP) -c boe.infodlg.cpp -o boe.infodlg.o $(CXXFLAGS)
+
+boe.itemdata.o: boe.itemdata.cpp
+	$(CPP) -c boe.itemdata.cpp -o boe.itemdata.o $(CXXFLAGS)
+
+boe.items.o: boe.items.cpp
+	$(CPP) -c boe.items.cpp -o boe.items.o $(CXXFLAGS)
+
+boe.locutils.o: boe.locutils.cpp
+	$(CPP) -c boe.locutils.cpp -o boe.locutils.o $(CXXFLAGS)
+
+boe.monster.o: boe.monster.cpp
+	$(CPP) -c boe.monster.cpp -o boe.monster.o $(CXXFLAGS)
+
+boe.newgraph.o: boe.newgraph.cpp
+	$(CPP) -c boe.newgraph.cpp -o boe.newgraph.o $(CXXFLAGS)
+
+boe.party.o: boe.party.cpp
+	$(CPP) -c boe.party.cpp -o boe.party.o $(CXXFLAGS)
+
+boe.specials.o: boe.specials.cpp
+	$(CPP) -c boe.specials.cpp -o boe.specials.o $(CXXFLAGS)
+
+boe.text.o: boe.text.cpp
+	$(CPP) -c boe.text.cpp -o boe.text.o $(CXXFLAGS)
+
+boe.town.o: boe.town.cpp
+	$(CPP) -c boe.town.cpp -o boe.town.o $(CXXFLAGS)
+
+globvar.o: globvar.cpp
+	$(CPP) -c globvar.cpp -o globvar.o $(CXXFLAGS)
+
+tools/soundtool.o: tools/soundtool.cpp
+	$(CPP) -c tools/soundtool.cpp -o tools/soundtool.o $(CXXFLAGS)
+
+tools/soundvars.o: tools/soundvars.cpp
+	$(CPP) -c tools/soundvars.cpp -o tools/soundvars.o $(CXXFLAGS)
+
+tools/dlogtool.o: tools/dlogtool.cpp
+	$(CPP) -c tools/dlogtool.cpp -o tools/dlogtool.o $(CXXFLAGS)
+
+tools/mathutil.o: tools/mathutil.cpp
+	$(CPP) -c tools/mathutil.cpp -o tools/mathutil.o $(CXXFLAGS)
+
+classes/item.o: classes/item.cpp
+	$(CPP) -c classes/item.cpp -o classes/item.o $(CXXFLAGS)
+
+classes/location.o: classes/location.cpp
+	$(CPP) -c classes/location.cpp -o classes/location.o $(CXXFLAGS)
+
+classes/pc.o: classes/pc.cpp
+	$(CPP) -c classes/pc.cpp -o classes/pc.o $(CXXFLAGS)
+
+Blades_of_Exile_private.res: Blades_of_Exile_private.rc BLADES.RC GAMEDLOG.RC GAMESTR.RC 
+	$(WINDRES) -i Blades_of_Exile_private.rc --input-format=rc -o Blades_of_Exile_private.res -O coff -D_INCLUDED_RC
diff --git a/Win32/Blades of Exile/Makefile-Nightly-i586 b/Win32/Blades of Exile/Makefile-Nightly-i586
new file mode 100644
index 00000000..778d3443
--- /dev/null
+++ b/Win32/Blades of Exile/Makefile-Nightly-i586	
@@ -0,0 +1,111 @@
+# Project: Blades of Exile Win32
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = i586-mingw32msvc-g++
+CC   = i586-mingw32msvc-gcc
+WINDRES = i586-mingw32msvc-windres
+RES  = Blades_of_Exile_private.res
+OBJ  = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
+LINKOBJ  = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
+LIBS = -mwindows -lwinmm  
+INCS =  -I"include" 
+CXXINCS = 
+BIN  = "Blades of Exile.exe"
+CXXFLAGS = $(CXXINCS) -Wall    -O2
+CFLAGS = $(INCS)   -O2
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile.exe" $(LIBS)
+
+boe.actions.o: boe.actions.cpp
+	$(CPP) -c boe.actions.cpp -o boe.actions.o $(CXXFLAGS)
+
+boe.main.o: boe.main.cpp
+	$(CPP) -c boe.main.cpp -o boe.main.o $(CXXFLAGS)
+
+boe.combat.o: boe.combat.cpp
+	$(CPP) -c boe.combat.cpp -o boe.combat.o $(CXXFLAGS)
+
+boe.dlgutil.o: boe.dlgutil.cpp
+	$(CPP) -c boe.dlgutil.cpp -o boe.dlgutil.o $(CXXFLAGS)
+
+boe.fields.o: boe.fields.cpp
+	$(CPP) -c boe.fields.cpp -o boe.fields.o $(CXXFLAGS)
+
+boe.fileio.o: boe.fileio.cpp
+	$(CPP) -c boe.fileio.cpp -o boe.fileio.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+boe.graphics.o: boe.graphics.cpp
+	$(CPP) -c boe.graphics.cpp -o boe.graphics.o $(CXXFLAGS)
+
+boe.graphutil.o: boe.graphutil.cpp
+	$(CPP) -c boe.graphutil.cpp -o boe.graphutil.o $(CXXFLAGS)
+
+boe.infodlg.o: boe.infodlg.cpp
+	$(CPP) -c boe.infodlg.cpp -o boe.infodlg.o $(CXXFLAGS)
+
+boe.itemdata.o: boe.itemdata.cpp
+	$(CPP) -c boe.itemdata.cpp -o boe.itemdata.o $(CXXFLAGS)
+
+boe.items.o: boe.items.cpp
+	$(CPP) -c boe.items.cpp -o boe.items.o $(CXXFLAGS)
+
+boe.locutils.o: boe.locutils.cpp
+	$(CPP) -c boe.locutils.cpp -o boe.locutils.o $(CXXFLAGS)
+
+boe.monster.o: boe.monster.cpp
+	$(CPP) -c boe.monster.cpp -o boe.monster.o $(CXXFLAGS)
+
+boe.newgraph.o: boe.newgraph.cpp
+	$(CPP) -c boe.newgraph.cpp -o boe.newgraph.o $(CXXFLAGS)
+
+boe.party.o: boe.party.cpp
+	$(CPP) -c boe.party.cpp -o boe.party.o $(CXXFLAGS)
+
+boe.specials.o: boe.specials.cpp
+	$(CPP) -c boe.specials.cpp -o boe.specials.o $(CXXFLAGS)
+
+boe.text.o: boe.text.cpp
+	$(CPP) -c boe.text.cpp -o boe.text.o $(CXXFLAGS)
+
+boe.town.o: boe.town.cpp
+	$(CPP) -c boe.town.cpp -o boe.town.o $(CXXFLAGS)
+
+globvar.o: globvar.cpp
+	$(CPP) -c globvar.cpp -o globvar.o $(CXXFLAGS)
+
+tools/soundtool.o: tools/soundtool.cpp
+	$(CPP) -c tools/soundtool.cpp -o tools/soundtool.o $(CXXFLAGS)
+
+tools/soundvars.o: tools/soundvars.cpp
+	$(CPP) -c tools/soundvars.cpp -o tools/soundvars.o $(CXXFLAGS)
+
+tools/dlogtool.o: tools/dlogtool.cpp
+	$(CPP) -c tools/dlogtool.cpp -o tools/dlogtool.o $(CXXFLAGS)
+
+tools/mathutil.o: tools/mathutil.cpp
+	$(CPP) -c tools/mathutil.cpp -o tools/mathutil.o $(CXXFLAGS)
+
+classes/item.o: classes/item.cpp
+	$(CPP) -c classes/item.cpp -o classes/item.o $(CXXFLAGS)
+
+classes/location.o: classes/location.cpp
+	$(CPP) -c classes/location.cpp -o classes/location.o $(CXXFLAGS)
+
+classes/pc.o: classes/pc.cpp
+	$(CPP) -c classes/pc.cpp -o classes/pc.o $(CXXFLAGS)
+
+Blades_of_Exile_private.res: Blades_of_Exile_private.rc BLADES.RC GAMEDLOG.RC GAMESTR.RC 
+	$(WINDRES) -i Blades_of_Exile_private.rc --input-format=rc -o Blades_of_Exile_private.res -O coff -D_INCLUDED_RC
diff --git a/Win32/Scenario Editor/BLSCENED.RC b/Win32/Scenario Editor/BLSCENED.RC
index 0bc3180f..59d46cda 100644
--- a/Win32/Scenario Editor/BLSCENED.RC	
+++ b/Win32/Scenario Editor/BLSCENED.RC	
@@ -268,5 +268,5 @@ ACCELERATORS_1 ACCELERATORS
 137 CURSOR "8.cur"
 
 
-10 ICON "blscened.ico"
+10 ICON "BLSCENED.ICO"
 
diff --git a/Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc b/Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc
new file mode 100644
index 00000000..2ef86e90
--- /dev/null
+++ b/Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc	
@@ -0,0 +1,7 @@
+/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
+/* DO NOT EDIT! */
+
+#include "BLSCENED.RC"
+#include "GAMEDLOG.RC"
+#include "STRINGS.RC"
+
diff --git a/Win32/Scenario Editor/Makefile-Nightly-amd64 b/Win32/Scenario Editor/Makefile-Nightly-amd64
new file mode 100644
index 00000000..d016ff1d
--- /dev/null
+++ b/Win32/Scenario Editor/Makefile-Nightly-amd64	
@@ -0,0 +1,66 @@
+# Project: Blades of Exile Scenario Editor
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = amd64-mingw32msvc-g++
+CC   = amd64-mingw32msvc-gcc
+WINDRES = amd64-mingw32msvc-windres
+RES  = Blades_of_Exile_Scenario_Editor_private.res
+OBJ  = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
+LINKOBJ  = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
+LIBS =  -mwindows -lwinmm --strip-all  
+INCS =  -I"include" 
+CXXINCS = 
+BIN  = "Blades of Exile Scenario Editor.exe"
+CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti  
+CFLAGS = $(INCS)  
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile Scenario Editor.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS)
+
+buttonmg.o: buttonmg.cpp
+	$(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS)
+
+dlogtool.o: dlogtool.cpp
+	$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+graphutl.o: graphutl.cpp
+	$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
+
+keydlgs.o: keydlgs.cpp
+	$(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS)
+
+tfileio.o: tfileio.cpp
+	$(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS)
+
+townout.o: townout.cpp
+	$(CPP) -c townout.cpp -o townout.o $(CXXFLAGS)
+
+edsound.o: edsound.cpp
+	$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
+
+graphics.o: graphics.cpp
+	$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
+
+scenario.o: scenario.cpp
+	$(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS)
+
+blscened.o: blscened.cpp
+	$(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS)
+
+tactions.o: tactions.cpp
+	$(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS)
+
+Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC 
+	$(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff  -D_INCLUDED_RC
diff --git a/Win32/Scenario Editor/Makefile-Nightly-i586 b/Win32/Scenario Editor/Makefile-Nightly-i586
new file mode 100644
index 00000000..2a575538
--- /dev/null
+++ b/Win32/Scenario Editor/Makefile-Nightly-i586	
@@ -0,0 +1,66 @@
+# Project: Blades of Exile Scenario Editor
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = i586-mingw32msvc-g++
+CC   = i586-mingw32msvc-gcc
+WINDRES = i586-mingw32msvc-windres
+RES  = Blades_of_Exile_Scenario_Editor_private.res
+OBJ  = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
+LINKOBJ  = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
+LIBS =  -mwindows -lwinmm --strip-all  
+INCS =  -I"include" 
+CXXINCS = 
+BIN  = "Blades of Exile Scenario Editor.exe"
+CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti  
+CFLAGS = $(INCS)  
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before "Blades of Exile Scenario Editor.exe" all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS)
+
+buttonmg.o: buttonmg.cpp
+	$(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS)
+
+dlogtool.o: dlogtool.cpp
+	$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
+
+global.o: global.cpp
+	$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
+
+graphutl.o: graphutl.cpp
+	$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
+
+keydlgs.o: keydlgs.cpp
+	$(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS)
+
+tfileio.o: tfileio.cpp
+	$(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS)
+
+townout.o: townout.cpp
+	$(CPP) -c townout.cpp -o townout.o $(CXXFLAGS)
+
+edsound.o: edsound.cpp
+	$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
+
+graphics.o: graphics.cpp
+	$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
+
+scenario.o: scenario.cpp
+	$(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS)
+
+blscened.o: blscened.cpp
+	$(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS)
+
+tactions.o: tactions.cpp
+	$(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS)
+
+Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC 
+	$(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff  -D_INCLUDED_RC
diff --git a/Win32/Scenario Editor/dlogtool.cpp b/Win32/Scenario Editor/dlogtool.cpp
index 56f96640..7a6463f9 100644
--- a/Win32/Scenario Editor/dlogtool.cpp	
+++ b/Win32/Scenario Editor/dlogtool.cpp	
@@ -53,7 +53,7 @@ short item_flag[NI];
 char item_active[NI];
 char item_key[NI];
 short item_label[NI];
-short item_label_loc[NI];
+short item_label_loc[NI];
 short custom_type[NI];//0 - not custom, 1 - 1x1, 2 - 2x1, 3 - 1x2, 4 - 2x2, 5 - animated custom
 
 char text_long_str[10][256];
@@ -573,7 +573,7 @@ short cd_kill_dialog(short dlog_num,short parent_message)
 		SetFocus(dlg_parent[which_dlg]);
 		SetWindowPos(dlg_parent[which_dlg],HWND_TOP,0,0,100,100,
 			SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW);
-		cd_set_edit_focus((short)dlg_parent[which_dlg]);
+		cd_set_edit_focus((size_t)dlg_parent[which_dlg]);
         }
 
 	if (parent_message > 0)
@@ -724,13 +724,13 @@ void cd_set_pict(short dlog_num, short item_num, short pict_num, short custom_pi
 		beep();
 		return;
 		}
-	item_flag[item_index] = pict_num;
+	item_flag[item_index] = pict_num;
 	custom_type[item_index] = custom_pic_type;
 	if (pict_num == -1)
 		cd_erase_item(dlog_num,item_num);
 		else cd_draw_item(dlog_num,item_num);
 }
-
+
 void cd_activate_item(short dlog_num, short item_num, short status)
 {
 	short dlg_index,item_index;
@@ -845,8 +845,8 @@ cd_set_item_text( dlog_num,  item_num, str);
 void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type)
 {
 	cd_set_pict( dlog_num,  item_num,  pict_num, custom_pic_type);
-}
-
+}
+
 void cd_set_item_text(short dlog_num, short item_num, char *str)
 {
 	short dlg_index,item_index,i;
@@ -1086,10 +1086,10 @@ void cd_draw_item(short dlog_num,short item_num)
 				case 5:
 					if (item_flag[item_index] == -1)
 						cd_erase_item(dlog_num,item_num);
-					else if(custom_type[item_index] > 0){
-                        draw_custom_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
-						item_flag[item_index], TRUE,0, custom_type[item_index]);
-                    }
+					else if(custom_type[item_index] > 0){
+                        draw_custom_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
+						item_flag[item_index], TRUE,0, custom_type[item_index]);
+                    }
                     else draw_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
 						item_flag[item_index],(item_flag[item_index] >= 2000) ? FALSE : TRUE,0);
 					break;
diff --git a/Win32/Scenario Editor/tfileio.cpp b/Win32/Scenario Editor/tfileio.cpp
index 682281e5..dd02e673 100644
--- a/Win32/Scenario Editor/tfileio.cpp	
+++ b/Win32/Scenario Editor/tfileio.cpp	
@@ -3099,7 +3099,7 @@ void port_dummy_talk_nodes()
 
 void port_t_d()
 {
-	short i,;
+	short i;
 	if (cur_scen_is_win == TRUE)
 		return;