change references from winnt to windows

rename sys/winnt to sys/windows move vs (visual studio) folder out of win/win32 and into sys/windows rename include/ntconf.h to include/windconf.h rename winnt.c to windsys.c place visual studio projects into individual subfolders. This will hopefully resolve GitHub issue #484 as well.
2021-06-03 12:14:27 -04:00
parent acfbf20958
commit 0a10bd632d
140 changed files with 1013 additions and 469 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -132,7 +132,7 @@ steps:
    export PDCURSES_TOP=../submodules/pdcurses
    export LUA_VERSION=5.4.3
    export TRAVIS_COMPILER=1
-    cp ../sys/winnt/Makefile.gcc ./Makefile
+    cp ../sys/windows/Makefile.gcc ./Makefile
    mingw32-make LUA_VERSION=$LUA_VERSION install
  condition: eq( variables.toolchain, 'mingw' )
  workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)/src
--- a/include/extern.h
+++ b/include/extern.h
@@ -1539,7 +1539,7 @@ extern void mplayer_talk(struct monst *);

 #if defined(MICRO) || defined(WIN32)

-/* ### msdos.c,os2.c,tos.c,winnt.c ### */
+/* ### msdos.c,os2.c,tos.c,windows.c ### */

 #ifndef WIN32
 extern int tgetch(void);
@@ -1565,7 +1565,7 @@ extern void chdrive(char *);
 extern void disable_ctrlP(void);
 extern void enable_ctrlP(void);
 #endif
-#if defined(MICRO) && !defined(WINNT)
+#if defined(MICRO) && !defined(WIN32)
 extern void get_scr_size(void);
 #ifndef TOS
 extern void gotoxy(int, int);
@@ -1699,19 +1699,19 @@ extern const char *regex_error_desc(struct nhregex *);
 extern boolean regex_match(const char *, struct nhregex *);
 extern void regex_free(struct nhregex *);

-/* ### nttty.c ### */
+/* ### consoletty.c ### */

 #ifdef WIN32
 extern void get_scr_size(void);
-extern int nttty_kbhit(void);
-extern void nttty_open(int);
-extern void nttty_rubout(void);
+extern int consoletty_kbhit(void);
+extern void consoletty_open(int);
+extern void consoletty_rubout(void);
 extern int tgetch(void);
-extern int ntposkey(int *, int *, int *);
+extern int console_poskey(int *, int *, int *);
 extern void set_output_mode(int);
 extern void synch_cursor(void);
-extern void nethack_enter_nttty(void);
-extern void nttty_exit(void);
+extern void nethack_enter_consoletty(void);
+extern void consoletty_exit(void);
 #endif /* WIN32 */

 /* ### o_init.c ### */
@@ -3061,10 +3061,10 @@ extern char *decode_mixed(char *, const char *);
 extern void genl_putmixed(winid, int, const char *);
 extern boolean menuitem_invert_test(int, unsigned, boolean);

-/* ### winnt.c ### */
+/* ### windows.c ### */

 #ifdef WIN32
-extern void nethack_enter_winnt(void);
+extern void nethack_enter_windows(void);
 #endif

 /* ### wizard.c ### */
--- a/include/global.h
+++ b/include/global.h
@@ -162,7 +162,7 @@ extern struct cross_target_s cross_target;
 #endif

 #ifdef WIN32
-#include "ntconf.h"
+#include "windconf.h"
 #endif

 #include "warnings.h"
--- a/include/windconf.h
+++ b/include/windconf.h
@@ -1,9 +1,9 @@
-/* NetHack 3.7	ntconf.h	$NHDT-Date: 1596498552 2020/08/03 23:49:12 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
+/* NetHack 3.7	windconf.h	$NHDT-Date: 1596498552 2020/08/03 23:49:12 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
 /* Copyright (c) NetHack PC Development Team 1993, 1994.  */
 /* NetHack may be freely redistributed.  See license for details. */

-#ifndef NTCONF_H
-#define NTCONF_H
+#ifndef WINDCONF_H
+#define WINDCONF_H

 /* #define SHELL */	/* nt use of pcsys routines caused a hang */

@@ -223,7 +223,7 @@ extern const char *alllevels, *allbones;
 #define getuid() 1
 #define getlogin() ((char *) 0)
 extern void win32_abort(void);
-extern void nttty_preference_update(const char *);
+extern void consoletty_preference_update(const char *);
 extern void toggle_mouse_support(void);
 extern void map_subkeyvalue(char *);
 #if defined(WIN32CON)
@@ -273,7 +273,7 @@ extern int set_win32_option(const char *, const char *);
 extern int alternative_palette(char *);
 #endif

-#define nethack_enter(argc, argv) nethack_enter_winnt()
+#define nethack_enter(argc, argv) nethack_enter_windows()
 extern void nethack_exit(int) NORETURN;
 extern boolean file_exists(const char *);
 extern boolean file_newer(const char *, const char *);
@@ -290,4 +290,4 @@ extern void nt_assert_failed(const char *, const char *, int);
 #define nhassert(expression) (void)((!!(expression)) || \
        (nt_assert_failed(#expression, __FILE__, __LINE__), 0))

-#endif /* NTCONF_H */
+#endif /* WINDCONF_H */
--- a/outdated/.travis.yml
+++ b/outdated/.travis.yml
@@ -130,11 +130,11 @@ matrix:
        - export ADD_CURSES=Y
        - export PDCURSES_TOP=../lib/pdcurses
        - export LUA_VERSION=5.4.3
-        - sh sys/winnt/travis-gcc.sh
+        - sh sys/windows/travis-gcc.sh
        - test -d "lib/lua-$LUA_VERSION/src" || exit 0
        - test -d "lib/pdcurses" || exit 0
        - cd src
-        - cp ../sys/winnt/Makefile.gcc ./Makefile
+        - cp ../sys/windows/Makefile.gcc ./Makefile
        - mingw32-make LUA_VERSION=$LUA_VERSION install
    - name: msdos-linux-focal-djgpp-crosscompile
      os: linux
--- a/outdated/include/wceconf.h
+++ b/outdated/include/wceconf.h
@@ -180,7 +180,7 @@ extern char hackdir[];
 #define getlogin() ((char *) 0)
 extern void win32_abort(void);
 #ifdef WIN32CON
-extern void nttty_preference_update(const char *);
+extern void consoletty_preference_update(const char *);
 extern void toggle_mouse_support(void);
 #endif

--- a/outdated/sys/wince/bootstrp.mak
+++ b/outdated/sys/wince/bootstrp.mak
@@ -24,7 +24,7 @@ DOC   = ..\doc       # NetHack documentation files
 UTIL  = ..\util      # Utility source
 SRC   = ..\src       # Main source
 SSYS  = ..\sys\share # Shared system files
-NTSYS = ..\sys\winnt # NT Win32 specific files
+NTSYS = ..\sys\windows # NT Win32 specific files
 TTY   = ..\win\tty   # window port files (tty)
 WIN32 = ..\win\win32 # window port files (WINCE)
 WSHR  = ..\win\share # Tile support files 
@@ -77,7 +77,7 @@ LEVCFLAGS= -c -nologo -DWINVER=0x0400 -DWIN32 -D_WIN32 \
 	$(CC) $(CFLAGSU)  -Fo$@  $<

 #==========================================
-# Rules for files in sys\winnt
+# Rules for files in sys\windows
 #==========================================

 {$(NTSYS)}.c{$(OBJ)}.o:
@@ -175,7 +175,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
 		$(INCL)\system.h $(INCL)\unixconf.h $(INCL)\os2conf.h \
 		$(INCL)\micro.h $(INCL)\pcconf.h $(INCL)\tosconf.h \
 		$(INCL)\amiconf.h $(INCL)\macconf.h $(INCL)\beconf.h \
-		$(INCL)\ntconf.h $(INCL)\wceconf.h
+		$(INCL)\windconf.h $(INCL)\wceconf.h

 HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h \
 		$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
@@ -495,10 +495,10 @@ $(DAT)\dungeon: $(UTIL)\makedefs.exe  $(DAT)\dungeon.def
 # NT dependencies
 #
 #
-#$(O)nttty.o:   $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\nttty.c
-#	$(CC) $(CFLAGSU) -I$(WSHR) -Fo$@  $(NTSYS)\nttty.c
-#$(O)winnt.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\winnt.c
-#	$(CC) $(CFLAGSU) -Fo$@  $(NTSYS)\winnt.c
+#$(O)consoletty.o:   $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(NTSYS)\consoletty.c
+#	$(CC) $(CFLAGSU) -I$(WSHR) -Fo$@  $(NTSYS)\consoletty.c
+#$(O)windsys.o: $(HACK_H) $(INCL)\win32api.h $(NTSYS)\windsys.c
+#	$(CC) $(CFLAGSU) -Fo$@  $(NTSYS)\windsys.c
 #$(O)ntsound.o: $(HACK_H) $(NTSYS)\ntsound.c
 #	$(CC) $(CFLAGSU)  -Fo$@ $(NTSYS)\ntsound.c

--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -577,7 +577,7 @@ endif
 	@$(subst /,\,copy $(SSHR)/NetHack.cnf  $(GAMEDIR)/defaults.nh)
 	-@$(subst /,\,touch $(GAMEDIR)/record)
 	@$(subst /,\,copy $(DOC)/guideb*.txt  $(GAMEDIR))
-	@$(subst /,\,copy ../sys/winnt/sysconf  $(GAMEDIR))
+	@$(subst /,\,copy ../sys/windows/sysconf  $(GAMEDIR))
 	@$(subst /,\,if not exist $(GAMEDIR)/sysconf touch $(GAMEDIR)/sysconf)
 	@$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR))
 ifdef CWSDPMI
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -793,7 +793,7 @@ $(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \
 		../include/tradstdc.h ../include/global.h ../include/warnings.h \
 		../include/coord.h ../include/vmsconf.h ../include/system.h \
 		../include/nhlua.h ../include/unixconf.h ../include/pcconf.h \
-		../include/ntconf.h ../include/fnamesiz.h
+		../include/windconf.h ../include/fnamesiz.h
 	touch $(CONFIG_H)
 # hack.h timestamp
 $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -263,7 +263,7 @@
 		3186A39521A4B0FC0052BF02 /* obj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = obj.h; path = ../../include/obj.h; sourceTree = "<group>"; };
 		3186A39721A4B0FC0052BF02 /* rm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rm.h; path = ../../include/rm.h; sourceTree = "<group>"; };
 		3186A39A21A4B0FD0052BF02 /* wintty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wintty.h; path = ../../include/wintty.h; sourceTree = "<group>"; };
-		3186A39B21A4B0FD0052BF02 /* ntconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ntconf.h; path = ../../include/ntconf.h; sourceTree = "<group>"; };
+		3186A39B21A4B0FD0052BF02 /* windconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = windconf.h; path = ../../include/windconf.h; sourceTree = "<group>"; };
 		3186A39C21A4B0FD0052BF02 /* mkroom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mkroom.h; path = ../../include/mkroom.h; sourceTree = "<group>"; };
 		3186A39E21A4B0FD0052BF02 /* quest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quest.h; path = ../../include/quest.h; sourceTree = "<group>"; };
 		3186A3A021A4B0FD0052BF02 /* dgn_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dgn_file.h; path = ../../include/dgn_file.h; sourceTree = "<group>"; };
@@ -684,7 +684,7 @@
 				3186A38F21A4B0FC0052BF02 /* monflag.h */,
 				3186A3BB21A4B0FD0052BF02 /* monst.h */,
 				3186A38421A4B0FB0052BF02 /* monsym.h */,
-				3186A39B21A4B0FD0052BF02 /* ntconf.h */,
+				3186A39B21A4B0FD0052BF02 /* windconf.h */,
 				3186A39521A4B0FC0052BF02 /* obj.h */,
 				3186A3A821A4B0FD0052BF02 /* objclass.h */,
 				3186A38B21A4B0FC0052BF02 /* onames.h */,
--- a/sys/vms/Install.vms
+++ b/sys/vms/Install.vms
@@ -42,7 +42,7 @@
        [.sys   .wince]  -- Windows CE
        [.sys   .wince   .ceinc] -- more WinCE
        [.sys   .wince   .ceinc   .sys] -- ditto
-        [.sys   .winnt]  -- Windows NT
+        [.sys   .windows]  -- MS Windows
        [.win   .curses] - window routines for curses interface
        [.win   .gem]    -- window routines for Atari/GEM
        [.win   .gnome]  -- window routines for Unix/GNOME
--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -386,7 +386,7 @@ spotless :	clean
 # config.h timestamp
 $(CONFIG_H) : $(INC)config.h $(INC)config1.h $(INC)tradstdc.h $(INC)global.h \
 		$(INC)coord.h $(INC)vmsconf.h $(INC)system.h $(INC)unixconf.h \
-		$(INC)micro.h $(INC)pcconf.h $(INC)ntconf.h
+		$(INC)micro.h $(INC)pcconf.h $(INC)windconf.h
 	$(TOUCH) $(CONFIG_H)
 # hack.h timestamp
 $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
--- a/sys/windows/.gitattributes
+++ b/sys/windows/.gitattributes
@@ -1,4 +1,4 @@
-Install.nt NHSUBST
+Install.windows NHSUBST
 Makefile.* NHSUBST
 defaults.nh NHSUBST
 sysconf NHSUBST
--- a/sys/windows/.gitignore
+++ b/sys/windows/.gitignore
--- a/sys/windows/.nethackrc.template
+++ b/sys/windows/.nethackrc.template
--- a/sys/windows/Install.windows
+++ b/sys/windows/Install.windows
@@ -1,4 +1,4 @@
-         Copyright (c) NetHack Development Team 1990-2020
+         Copyright (c) NetHack Development Team 1990-2021
         NetHack may be freely redistributed.  See license for details.
         ==============================================================
                  Instructions for compiling and installing
@@ -41,13 +41,13 @@ version.  You can use one of the following build environments:

               (NetHack-top)
                     |
-  +-----+-----+------+------+-----+----------+---------~---------+
+  +-----+-----+------+------+-----+-------------+--------~------+
  |     |     |      |      |     |             |               |
 util  dat   doc  include  src   sys           win             lib (external)
                                  |           |                 |
-                                 +----+    +------+        +-----------+
+                              +------+      +------+      +-----------+
                              |      |      |      |      |           |
-                             share  winnt tty   win32  Lua-5.4.3    pdcurses
+                            share windows tty   win32  Lua-5.4.3    pdcurses
                                     |
                                    vs

@@ -115,10 +115,10 @@ to proceeding with steps 1 through 5 above.
 -- Beginning of prerequisite step --

 The first step in building either version of NetHack via Makefile is to
-execute sys\winnt\nhsetup.bat to move some files to their required locations.
+execute sys\windows\nhsetup.bat to move some files to their required locations.

 From the command prompt:
-        cd sys\winnt
+        cd sys\windows
        nhsetup

 From a Windows explorer window:
@@ -222,7 +222,7 @@ Setting Up

 3.  Make sure all the necessary files are in the appropriate directory
    structure.  You should have a main NetHack top directory with
-    subdirectories dat, doc, include, src, sys\share, sys\winnt,
+    subdirectories dat, doc, include, src, sys\share, sys\windows,
    win\tty, util.

    If you are including the optional Curses window port into your
--- a/sys/windows/Makefile.gcc
+++ b/sys/windows/Makefile.gcc
@@ -27,7 +27,7 @@
 #         .y                     yacc   (such as bison)
 #         .l                     lex    (such as flex)
 #
-#   If you have any questions read the sys/winnt/Install.nt file included
+#   If you have any questions read the sys/windows/Install.windows file included
 #   with the distribution.
 #==============================================================================
 # DECISIONS SECTION
@@ -198,7 +198,7 @@ DOC     =../doc
 UTIL    =../util
 SRC     =../src
 SSYS    =../sys/share
-MSWSYS  =../sys/winnt
+MSWSYS  =../sys/windows
 TTY     =../win/tty
 MSWIN   =../win/win32
 WCURSES =../win/curses
@@ -352,7 +352,7 @@ else
 CURSESOBJ=
 endif

-SOBJ   = $(O)windmain.o $(O)winnt.o $(O)win10.o \
+SOBJ   = $(O)windmain.o $(O)windsyso $(O)win10.o \
 	$(O)safeproc.o $(O)nhlan.o $(SOUND)

 OBJS   = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
@@ -495,7 +495,7 @@ CONFIG_H = $(INCL)/config.h $(INCL)/patchlevel.h \
 		$(INCL)/config1.h $(INCL)/tradstdc.h \
 		$(INCL)/global.h $(INCL)/fnamesiz.h $(INCL)/coord.h \
 		$(INCL)/vmsconf.h $(INCL)/system.h $(INCL)/unixconf.h \
-		$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/ntconf.h
+		$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/windconf.h

 HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
 	       $(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
@@ -532,7 +532,7 @@ CURSDEF=
 CURSESLIB=
 endif

-INCLDIR=-I../include -I../sys/winnt $(LUAINCL)
+INCLDIR=-I../include -I../sys/windows $(LUAINCL)

 #==========================================
 #==========================================
@@ -653,7 +653,7 @@ $(OBJ)/%.o : $(SSYS)/%.cpp
 	$(cxx) $(CXXFLAGS) -std=c++11  -o$@  $<

 #==========================================
-# Rules for files in sys/winnt
+# Rules for files in sys/windows
 #==========================================

 $(OBJ)/%.o : $(MSWSYS)/%.c
@@ -796,7 +796,7 @@ endif
 #
 	$(subst /,\,echo install done > $@)

-#  copy $(MSWSYS)/winnt.hlp    $(GAMEDIR)
+#  copy $(MSWSYS)/windsyshlp    $(GAMEDIR)

 recover: $(U)recover.exe
 	$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR))
@@ -839,18 +839,18 @@ gamedir.tag:
 	test -d $(GAMEDIR) || mkdir $(W_GAMEDIR)
 	test -d $(GAMEDIR) && echo directory created > $@

-$(GAMEDIR)/NetHack.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)nttty.o $(O)guistub.o \
+$(GAMEDIR)/NetHack.exe : gamedir.tag $(PDCLIB) $(O)tile.o $(O)consoletty.o $(O)guistub.o \
 			$(ALLOBJ) $(TTYOBJ) $(GUIOBJ) $(O)conres.o $(KEYDLLS) \
 			$(LUATARGETS)
 	@echo Linking $@...
-	$(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o \
+	$(link) $(lflags) -o$@ $(ALLOBJ) $(TTYOBJ) $(O)consoletty.o $(O)tile.o \
 		$(O)guistub.o $(O)conres.o $(PDCLIB) $(LUALIB) $(conlibs) -static -lstdc++
 	$(subst /,\,@if exist $(O)install.tag del $(O)install.tag)

 # NetHackW
 # full tty linkage libs:
 #    libs: $(LIBS) $(guilibs) $(COMCTRL)
-#    objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)nttty.o
+#    objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)consoletty.o
 # otherwise:
 #    libs: $(LIBS) $(guilibs) $(COMCTRL)
 #    objs: $(GAMEOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o
@@ -1322,10 +1322,10 @@ endif
 # NT dependencies
 #

-$(O)nttty.o:   $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/nttty.c
-	$(cc) $(CFLAGS) -I$(WSHR) -o$@  $(MSWSYS)/nttty.c
-$(O)winnt.o: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/winnt.c
-	$(cc) $(CFLAGS) -o$@  $(MSWSYS)/winnt.c
+$(O)consoletty.o:   $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/consoletty.c
+	$(cc) $(CFLAGS) -I$(WSHR) -o$@  $(MSWSYS)/consoletty.c
+$(O)windsyso: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsysc
+	$(cc) $(CFLAGS) -o$@  $(MSWSYS)/windsysc
 $(O)ntsound.o: $(HACK_H) $(MSWSYS)/ntsound.c
 	$(cc) $(CFLAGS)  -o$@ $(MSWSYS)/ntsound.c

--- a/sys/windows/Makefile.msc
+++ b/sys/windows/Makefile.msc
@@ -53,7 +53,7 @@
 #         zlib:      https://www.zlib.net/
 #
 #   If you have any questions about building NetHack for the Windows platform
-#   please read sys/winnt/Install.nt file included in the distribution.
+#   please read sys/windows/Install.windows file included in the distribution.
 #
 #==============================================================================
 # DECISIONS SECTION
@@ -184,7 +184,7 @@ DOC     = ..\doc         # NetHack documentation files
 UTIL    = ..\util        # Utility source
 SRC     = ..\src         # Main source
 SSYS    = ..\sys\share   # Shared system files
-MSWSYS  = ..\sys\winnt   # mswin specific files
+MSWSYS  = ..\sys\windows # MS windows specific files
 TTY     = ..\win\tty     # window port files (tty)
 MSWIN   = ..\win\win32   # window port files (win32)
 WCURSES = ..\win\curses  # window port files (curses)
@@ -339,7 +339,7 @@ CURSESOBJ= $(O)cursdial.o $(O)cursinit.o $(O)cursinvt.o $(O)cursmain.o \
 	   $(O)cursmesg.o $(O)cursmisc.o $(O)cursstat.o $(O)curswins.o
 !ENDIF

-SOBJ   = $(O)windmain.o $(O)winnt.o $(O)win10.o \
+SOBJ   = $(O)windmain.o $(O)windsys.o $(O)win10.o \
 	$(O)safeproc.o $(O)nhlan.o $(SOUND)

 OBJS   = $(MDLIB) \
@@ -489,7 +489,7 @@ CONFIG_H = $(INCL)\config.h $(INCL)\patchlevel.h \
 		$(INCL)\global.h $(INCL)\fnamesiz.h $(INCL)\coord.h \
 		$(INCL)\vmsconf.h $(INCL)\system.h $(INCL)\nhlua.h \
 		$(INCL)\unixconf.h $(INCL)\micro.h $(INCL)\pcconf.h \
-		$(INCL)\ntconf.h
+		$(INCL)\windconf.h

 HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \
 		$(INCL)\dungeon.h $(INCL)\monsym.h $(INCL)\mkroom.h \
@@ -723,7 +723,7 @@ conlibs     = $(baselibs)
 guilibs     = $(winlibs)
 #

-INCLDIR= /I..\include /I..\sys\winnt $(LUAINCL)
+INCLDIR= /I..\include /I..\sys\windows $(LUAINCL)

 #==========================================
 # Util builds
@@ -771,7 +771,7 @@ DLB =
 	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@  $<

 #==========================================
-# Rules for files in sys\winnt
+# Rules for files in sys\windows
 #==========================================

 {$(MSWSYS)}.c{$(OBJ)}.o:
@@ -904,13 +904,13 @@ GAMEOBJ=$(GAMEOBJ:^ =^
 # NetHack
 # full gui linkage libs:
 #    libs: $(LIBS) $(conlibs) $(guilibs) $(COMCTRL)
-#    objs: $(GAMEOBJ) $(TTYOBJ) $(O)nttty.o $(O)tile.o $(GUIOBJ)
+#    objs: $(GAMEOBJ) $(TTYOBJ) $(O)consoletty.o $(O)tile.o $(GUIOBJ)
 # otherwise:
 #    libs: $(LIBS) $(conlibs)
 #    objs: $(GAMEOBJ) $(TTYOBJ) $(O)tile.o $(O)guistub.o


-$(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
+$(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)consoletty.o $(O)guistub.o \
 			$(ALLOBJ) $(TTYOBJ) $(O)console.res $(KEYDLLS) \
 			$(LUATARGETS) $(PDCLIB)
 	@if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR)
@@ -920,7 +920,7 @@ $(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
 		$(conlibs) $(BCRYPT) -out:$@ @<<$(@B).lnk
 		$(GAMEOBJ)
 		$(TTYOBJ)
-		$(O)nttty.o
+		$(O)consoletty.o
 		$(O)tile.o
 		$(O)guistub.o
 		$(O)console.res
@@ -930,7 +930,7 @@ $(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \
 # NetHackW
 # full tty linkage libs:
 #    libs: $(LIBS) $(PDCLIB) $(LUALIB) $(guilibs) $(COMCTRL)
-#    objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)nttty.o
+#    objs: $(GAMEOBJ) $(GUIOBJ) $(TTYOBJ) $(O)tile.o $(O)consoletty.o
 # otherwise:
 #    libs: $(LIBS) $(PDCLIB) $(LUALIB) $(guilibs) $(COMCTRL)
 #    objs: $(GAMEOBJ) $(GUIOBJ) $(O)tile.o $(O)ttystub.o
@@ -1034,7 +1034,7 @@ $(O)install.tag: 	$(DAT)\data	$(DAT)\rumors	$(DAT)\oracles \
 	-if not exist $(GAMEDIR)\record. goto>$(GAMEDIR)\record.
 	echo install done > $@

-#	copy $(MSWSYS)\winnt.hlp    $(GAMEDIR)
+#	copy $(MSWSYS)\windsyshlp    $(GAMEDIR)

 recover: $(U)recover.exe
 	if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR)
@@ -1128,7 +1128,7 @@ $(MSWSYS)\NetHack.ico : $(U)uudecode.exe $(MSWSYS)\nhico.uu

 $(MSWIN)\NetHack.ico : $(U)uudecode.exe $(MSWSYS)\nhico.uu
 	chdir $(MSWIN)
-	..\..\util\uudecode.exe ../../sys/winnt/nhico.uu
+	..\..\util\uudecode.exe ../../sys/windows/nhico.uu
 	chdir ..\..\src

 $(MSWIN)\mnsel.bmp: $(U)uudecode.exe $(MSWIN)\mnsel.uu
@@ -1454,12 +1454,12 @@ $(O)lapi.o: $(LUASRC)\lapi.c
 	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -wd4244 -wd4701 -wd4702 -Fo$@ $(LUASRC)\lapi.c

 #===================================================================
-# sys/winnt dependencies
+# sys/windows dependencies
 #===================================================================

-$(O)nttty.o:   $(MSWSYS)\nttty.c $(WINDHDR) $(HACK_H) $(TILE_H)
-$(O)win10.o:  $(MSWSYS)\winnt.c $(WINDHDR) $(HACK_H)
-$(O)winnt.o:  $(MSWSYS)\winnt.c $(WINDHDR) $(HACK_H)
+$(O)consoletty.o:   $(MSWSYS)\consoletty.c $(WINDHDR) $(HACK_H) $(TILE_H)
+$(O)win10.o:  $(MSWSYS)\win10.c $(WINDHDR) $(HACK_H)
+$(O)windsys.o:  $(MSWSYS)\windsys.c $(WINDHDR) $(HACK_H)
 $(O)ntsound.o: $(MSWSYS)\ntsound.c $(WINDHDR) $(HACK_H)
 $(O)windmain.o: $(MSWSYS)\windmain.c $(WINDHDR) $(HACK_H)

--- a/sys/windows/console.rc
+++ b/sys/windows/console.rc
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -1,8 +1,8 @@
-/* NetHack 3.7	nttty.c	$NHDT-Date: 1596498316 2020/08/03 23:45:16 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
+/* NetHack 3.7	consoletty.c	$NHDT-Date: 1596498316 2020/08/03 23:45:16 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.117 $ */
 /* Copyright (c) NetHack PC Development Team 1993    */
 /* NetHack may be freely redistributed.  See license for details. */

-/* tty.c - (Windows NT) version */
+/* tty.c - (Windows console) version */

 /*
 * Initial Creation 				M. Allison	1993/01/31
@@ -388,14 +388,14 @@ CtrlHandler(DWORD ctrltype)

 /* called by pcmain() and process_options() */
 void
-nttty_open(int mode)
+consoletty_open(int mode)
 {
    DWORD cmode;

    /* Initialize the function pointer that points to
-     * the kbhit() equivalent, in this TTY case nttty_kbhit()
+     * the kbhit() equivalent, in this TTY case consoletty_kbhit()
     */
-    nt_kbhit = nttty_kbhit;
+    nt_kbhit = consoletty_kbhit;

    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE)) {
        /* Unable to set control handler */
@@ -409,7 +409,7 @@ nttty_open(int mode)
 }

 void
-nttty_exit()
+consoletty_exit()
 {
    /* go back to using the safe routines */
    safe_routines();
@@ -440,7 +440,7 @@ process_keystroke(
 }

 int
-nttty_kbhit()
+consoletty_kbhit()
 {
    return keyboard_handler.pNHkbhit(console.hConIn, &ir);
 }
@@ -468,7 +468,7 @@ tgetch()
 }

 int
-ntposkey(int *x, int *y, int *mod)
+console_poskey(int *x, int *y, int *mod)
 {
    int ch;
    coord cc = { 0, 0 };
@@ -522,7 +522,7 @@ really_move_cursor()
        if (GetConsoleTitle(oldtitle, BUFSZ)) {
            oldtitle[39] = '\0';
        }
-        Sprintf(newtitle, "%-55s tty=(%02d,%02d) nttty=(%02d,%02d)", oldtitle,
+        Sprintf(newtitle, "%-55s tty=(%02d,%02d) consoletty=(%02d,%02d)", oldtitle,
                ttyDisplay->curx, ttyDisplay->cury,
                console.cursor.X, console.cursor.Y);
        (void) SetConsoleTitle(newtitle);
@@ -960,7 +960,7 @@ toggle_mouse_support(void)

 /* handle tty options updates here */
 void
-nttty_preference_update(const char* pref)
+consoletty_preference_update(const char* pref)
 {
    if (stricmp(pref, "mouse_support") == 0) {
 #ifndef NO_MOUSE_ALLOWED
@@ -1138,7 +1138,7 @@ void set_altkeyhandler(const char * inName)

 /* fatal error */
 /*VARARGS1*/
-void nttty_error
+void consoletty_error
 VA_DECL(const char *, s)
 {
    char buf[BUFSZ];
@@ -1822,7 +1822,7 @@ void early_raw_print(const char *s)
 }
 #endif

-/* nethack_enter_nttty() is the first thing that is called from main
+/* nethack_enter_consoletty() is the first thing that is called from main
 * once the tty port is confirmed.
 *
 * We initialize all console state to support rendering to the console
@@ -1847,7 +1847,7 @@ void early_raw_print(const char *s)
 *
 */

-void nethack_enter_nttty()
+void nethack_enter_consoletty()
 {
 #if 0
    /* set up state needed by early_raw_print() */
--- a/sys/windows/nethack.def
+++ b/sys/windows/nethack.def
--- a/sys/windows/nh340key.c
+++ b/sys/windows/nh340key.c
--- a/sys/windows/nhdefkey.c
+++ b/sys/windows/nhdefkey.c
--- a/sys/windows/nhico.uu
+++ b/sys/windows/nhico.uu
--- a/sys/windows/nhraykey.c
+++ b/sys/windows/nhraykey.c
--- a/sys/windows/nhsetup.bat
+++ b/sys/windows/nhsetup.bat
@@ -1,7 +1,7 @@
@REM  NetHack 3.7	nhsetup.bat	$NHDT-Date: 1596498315 2020/08/03 23:45:15 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.40 $ */
@REM  Copyright (c) NetHack PC Development Team 1993-2019
@REM  NetHack may be freely redistributed.  See license for details. 
-@REM  Win32 setup batch file, see Install.nt for details
+@REM  Win32 setup batch file, see Install.windows for details
@REM
@echo off
 pushd %~dp0
@@ -25,7 +25,7 @@ if not exist ..\..\include\hack.h goto :err_dir
 if not exist ..\..\src\hack.c goto :err_dir
 if not exist ..\..\dat\wizard1.lua goto :err_dir
 if not exist ..\..\util\makedefs.c goto :err_dir
-if not exist ..\..\sys\winnt\winnt.c goto :err_dir
+if not exist ..\..\sys\windows\windsys.c goto :err_dir
 echo Directories look ok.

 :movemakes
@@ -104,19 +104,19 @@ goto :done
 :err_win
 echo Some of the files needed to build graphical NetHack
 echo for Windows are not in the expected places.
-echo Check "Install.nt" for a list of the steps required 
+echo Check "Install.windows" for a list of the steps required 
 echo to build NetHack.
 goto :fini

 :err_dir
 echo Your directories are not set up properly, please re-read the
-echo documentation and sys/winnt/Install.nt.
+echo documentation and sys/windows/Install.windows.
 goto :fini

 :done
 echo done!
 echo.
-echo Proceed with the next step documented in Install.nt 
+echo Proceed with the next step documented in Install.windows 
 echo.

 :fini
--- a/sys/windows/ntsound.c
+++ b/sys/windows/ntsound.c
--- a/sys/windows/porthelp
+++ b/sys/windows/porthelp
--- a/sys/windows/stub-pdcscrn.c
+++ b/sys/windows/stub-pdcscrn.c
--- a/sys/windows/stubs.c
+++ b/sys/windows/stubs.c
@@ -73,7 +73,7 @@ win_tty_init(int dir)
 }

 void
-nttty_open(int mode)
+consoletty_open(int mode)
 {
    return;
 }
@@ -148,7 +148,7 @@ VA_DECL(const char *, fmt)
 }

 /*VARARGS1*/
-void nttty_error
+void consoletty_error
 VA_DECL(const char *, s)
 {
    VA_START(s);
@@ -172,7 +172,7 @@ more(void)
 }

 void
-nethack_enter_nttty(void)
+nethack_enter_consoletty(void)
 {
    return;
 }
--- a/sys/windows/sysconf.template
+++ b/sys/windows/sysconf.template
--- a/sys/windows/travis-gcc.sh
+++ b/sys/windows/travis-gcc.sh
--- a/sys/windows/vs/.gitattributes
+++ b/sys/windows/vs/.gitattributes
--- a/sys/windows/vs/.gitignore
+++ b/sys/windows/vs/.gitignore
@@ -10,3 +10,8 @@ report.xml
 *.appxbundle
 NetHackPackage_StoreKey.pfx
 NetHackPackage_TemporaryKey.pfx
+NetHackPackage.assets.cache
+NetHackPackage.wapproj.user
+NetHackPackage/obj/
+NetHackW.vcxproj.user
+obj/
--- a/sys/windows/vs/Images/BadgeLogo.scale-100.png
+++ b/sys/windows/vs/Images/BadgeLogo.scale-100.png
--- a/sys/windows/vs/Images/BadgeLogo.scale-125.png
+++ b/sys/windows/vs/Images/BadgeLogo.scale-125.png
--- a/sys/windows/vs/Images/BadgeLogo.scale-150.png
+++ b/sys/windows/vs/Images/BadgeLogo.scale-150.png
--- a/sys/windows/vs/Images/BadgeLogo.scale-200.png
+++ b/sys/windows/vs/Images/BadgeLogo.scale-200.png
--- a/sys/windows/vs/Images/BadgeLogo.scale-400.png
+++ b/sys/windows/vs/Images/BadgeLogo.scale-400.png
--- a/sys/windows/vs/Images/LargeTile.scale-100.png
+++ b/sys/windows/vs/Images/LargeTile.scale-100.png
--- a/sys/windows/vs/Images/LargeTile.scale-125.png
+++ b/sys/windows/vs/Images/LargeTile.scale-125.png
--- a/sys/windows/vs/Images/LargeTile.scale-150.png
+++ b/sys/windows/vs/Images/LargeTile.scale-150.png
--- a/sys/windows/vs/Images/LargeTile.scale-200.png
+++ b/sys/windows/vs/Images/LargeTile.scale-200.png
--- a/sys/windows/vs/Images/LargeTile.scale-400.png
+++ b/sys/windows/vs/Images/LargeTile.scale-400.png
--- a/sys/windows/vs/Images/LockScreenLogo.scale-200.png
+++ b/sys/windows/vs/Images/LockScreenLogo.scale-200.png
--- a/sys/windows/vs/Images/SmallTile.scale-100.png
+++ b/sys/windows/vs/Images/SmallTile.scale-100.png
--- a/sys/windows/vs/Images/SmallTile.scale-125.png
+++ b/sys/windows/vs/Images/SmallTile.scale-125.png
--- a/sys/windows/vs/Images/SmallTile.scale-150.png
+++ b/sys/windows/vs/Images/SmallTile.scale-150.png
--- a/sys/windows/vs/Images/SmallTile.scale-200.png
+++ b/sys/windows/vs/Images/SmallTile.scale-200.png
--- a/sys/windows/vs/Images/SmallTile.scale-400.png
+++ b/sys/windows/vs/Images/SmallTile.scale-400.png
--- a/sys/windows/vs/Images/SplashScreen.scale-100.png
+++ b/sys/windows/vs/Images/SplashScreen.scale-100.png
--- a/sys/windows/vs/Images/SplashScreen.scale-125.png
+++ b/sys/windows/vs/Images/SplashScreen.scale-125.png
--- a/sys/windows/vs/Images/SplashScreen.scale-150.png
+++ b/sys/windows/vs/Images/SplashScreen.scale-150.png
--- a/sys/windows/vs/Images/SplashScreen.scale-200.png
+++ b/sys/windows/vs/Images/SplashScreen.scale-200.png
--- a/sys/windows/vs/Images/SplashScreen.scale-400.png
+++ b/sys/windows/vs/Images/SplashScreen.scale-400.png
--- a/sys/windows/vs/Images/Square150x150Logo.scale-100.png
+++ b/sys/windows/vs/Images/Square150x150Logo.scale-100.png
--- a/sys/windows/vs/Images/Square150x150Logo.scale-125.png
+++ b/sys/windows/vs/Images/Square150x150Logo.scale-125.png
--- a/sys/windows/vs/Images/Square150x150Logo.scale-150.png
+++ b/sys/windows/vs/Images/Square150x150Logo.scale-150.png
--- a/sys/windows/vs/Images/Square150x150Logo.scale-200.png
+++ b/sys/windows/vs/Images/Square150x150Logo.scale-200.png
--- a/sys/windows/vs/Images/Square150x150Logo.scale-400.png
+++ b/sys/windows/vs/Images/Square150x150Logo.scale-400.png
--- a/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png
+++ b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png
--- a/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png
+++ b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png
--- a/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png
+++ b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png
--- a/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png
+++ b/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png
--- a/sys/windows/vs/Images/Square44x44Logo.scale-100.png
+++ b/sys/windows/vs/Images/Square44x44Logo.scale-100.png
--- a/sys/windows/vs/Images/Square44x44Logo.scale-125.png
+++ b/sys/windows/vs/Images/Square44x44Logo.scale-125.png
--- a/sys/windows/vs/Images/Square44x44Logo.scale-150.png
+++ b/sys/windows/vs/Images/Square44x44Logo.scale-150.png
--- a/sys/windows/vs/Images/Square44x44Logo.scale-200.png
+++ b/sys/windows/vs/Images/Square44x44Logo.scale-200.png
--- a/sys/windows/vs/Images/Square44x44Logo.scale-400.png
+++ b/sys/windows/vs/Images/Square44x44Logo.scale-400.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png
--- a/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png
+++ b/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png
--- a/sys/windows/vs/Images/StoreLogo.backup.png
+++ b/sys/windows/vs/Images/StoreLogo.backup.png
--- a/sys/windows/vs/Images/StoreLogo.scale-100.png
+++ b/sys/windows/vs/Images/StoreLogo.scale-100.png
--- a/sys/windows/vs/Images/StoreLogo.scale-125.png
+++ b/sys/windows/vs/Images/StoreLogo.scale-125.png
--- a/sys/windows/vs/Images/StoreLogo.scale-150.png
+++ b/sys/windows/vs/Images/StoreLogo.scale-150.png
--- a/sys/windows/vs/Images/StoreLogo.scale-200.png
+++ b/sys/windows/vs/Images/StoreLogo.scale-200.png
--- a/sys/windows/vs/Images/StoreLogo.scale-400.png
+++ b/sys/windows/vs/Images/StoreLogo.scale-400.png
--- a/sys/windows/vs/Images/Wide310x150Logo.scale-100.png
+++ b/sys/windows/vs/Images/Wide310x150Logo.scale-100.png
--- a/sys/windows/vs/Images/Wide310x150Logo.scale-125.png
+++ b/sys/windows/vs/Images/Wide310x150Logo.scale-125.png
--- a/sys/windows/vs/Images/Wide310x150Logo.scale-150.png
+++ b/sys/windows/vs/Images/Wide310x150Logo.scale-150.png
--- a/sys/windows/vs/Images/Wide310x150Logo.scale-200.png
+++ b/sys/windows/vs/Images/Wide310x150Logo.scale-200.png
--- a/sys/windows/vs/Images/Wide310x150Logo.scale-400.png
+++ b/sys/windows/vs/Images/Wide310x150Logo.scale-400.png
--- a/sys/windows/vs/NetHack.sln
+++ b/sys/windows/vs/NetHack.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
 	ProjectSection(ProjectDependencies) = postProject
 		{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
@@ -12,32 +12,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxpro
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb\dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
 	ProjectSection(ProjectDependencies) = postProject
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
@@ -45,22 +45,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj"
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key\nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey\nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses\PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
 	ProjectSection(SolutionItems) = preProject
--- a/sys/windows/vs/NetHack/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
+  <Import Project="..\config.props" />
+  <Import Project="..\dirs.props" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>NetHack</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
+  <Import Project="$(vsDir)default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="NetHackProperties.props" />
-  <Import Project="console.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
+  <Import Project="$(vsDir)NetHackProperties.props" />
+  <Import Project="$(vsDir)console.props" />
+  <Import Project="$(vsDir)common.props" />
+  <Import Project="$(vsDir)files.props" />
  <PropertyGroup>
    <OutDir>$(BinDir)</OutDir>
  </PropertyGroup>
@@ -34,7 +34,7 @@
      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
@@ -164,13 +164,13 @@
    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
    <ClCompile Include="$(SysShareDir)nhlan.c" />
    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)nttty.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
+    <ClCompile Include="$(SysWindDir)ntsound.c" />
+    <ClCompile Include="$(SysWindDir)consoletty.c" />
+    <ClCompile Include="$(SysWindDir)stubs.c">
      <PreprocessorDefinitions>GUISTUB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
-    <ClCompile Include="$(SysWinntDir)windmain.c" />
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
+    <ClCompile Include="$(SysWindDir)windmain.c" />
+    <ClCompile Include="$(SysWindDir)windsys.c" />
    <ClCompile Include="$(WinShareDir)safeproc.c" />
    <ClCompile Include="$(WinTtyDir)getline.c" />
    <ClCompile Include="$(WinTtyDir)topl.c" />
@@ -216,7 +216,7 @@
    <ClInclude Include="$(IncDir)monst.h" />
    <ClInclude Include="$(IncDir)monsym.h" />
    <ClInclude Include="$(IncDir)nhlua.h" />
-    <ClInclude Include="$(IncDir)ntconf.h" />
+    <ClInclude Include="$(IncDir)windconf.h" />
    <ClInclude Include="$(IncDir)obj.h" />
    <ClInclude Include="$(IncDir)objclass.h" />
    <ClInclude Include="$(IncDir)onames.h" />
--- a/sys/windows/vs/NetHack/afternethack.proj
+++ b/sys/windows/vs/NetHack/afternethack.proj
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
+  <Import Project="..\dirs.props" />
  <!-- TODO not copying record -->
  <Target Name="Build"
-	Inputs="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
+	Inputs="$(SysWindDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWindDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
 	Outputs="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp">
-    <Copy SourceFiles="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
+    <Copy SourceFiles="$(SysWindDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWindDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
 	      DestinationFiles="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp" />
  </Target>
  <Target Name="Clean">
--- a/sys/windows/vs/NetHackPackage.appxmanifest
+++ b/sys/windows/vs/NetHackPackage.appxmanifest
--- a/sys/windows/vs/NetHackPackage.wapproj
+++ b/sys/windows/vs/NetHackPackage.wapproj
@@ -26,7 +26,6 @@
  </PropertyGroup>
  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
  <Import Project="NetHackProperties.props" />
-  <Import Project="dirs.props" />
  <PropertyGroup>
    <OutDir>$(BinDir)</OutDir>
  </PropertyGroup>
@@ -36,7 +35,7 @@
    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
    <DefaultLanguage>en-US</DefaultLanguage>
    <PackageCertificateKeyFile>NetHackPackage_StoreKey.pfx</PackageCertificateKeyFile>
-    <EntryPointProjectUniqueName>NetHackW.vcxproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>NetHackW\NetHackW.vcxproj</EntryPointProjectUniqueName>
    <PackageCertificateThumbprint>19591BE8832D6EFED75019EACE7C4CA42ABC90D4</PackageCertificateThumbprint>
    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
@@ -113,25 +112,25 @@
    <Content Include="Images\Wide310x150Logo.scale-125.png" />
    <Content Include="Images\Wide310x150Logo.scale-150.png" />
    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="$(BinDir).nethackrc.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\.nethackrc.template">
      <Link>NetHackW\.nethackrc.template</Link>
    </Content>
-    <Content Include="$(BinDir)Guidebook.txt">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\Guidebook.txt">
      <Link>NetHackW\Guidebook.txt</Link>
    </Content>
-    <Content Include="$(BinDir)license">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\license">
      <Link>NetHackW\license</Link>
    </Content>
-    <Content Include="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
      <Link>NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)</Link>
    </Content>
-    <Content Include="$(BinDir)opthelp">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\opthelp">
      <Link>NetHackW\opthelp</Link>
    </Content>
-    <Content Include="$(BinDir)symbols.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\symbols.template">
      <Link>NetHackW\symbols.template</Link>
    </Content>
-    <Content Include="$(BinDir)sysconf.template">
+    <Content Include="..\..\..\binary\$(Configuration)\$(Platform)\sysconf.template">
      <Link>NetHackW\sysconf.template</Link>
    </Content>
    <Content Include="Images\Wide310x150Logo.scale-400.png" />
@@ -139,7 +138,7 @@
    <None Include="Package.StoreAssociation.xml" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="NetHackW.vcxproj" />
+    <ProjectReference Include="NetHackW\NetHackW.vcxproj" />
  </ItemGroup>
  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
--- a/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
+++ b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
+  <Identity Name="30485NetHackDevTeam.NetHack3.6" Publisher="CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F" Version="363.0.28.0" />
+  <Properties>
+    <DisplayName>NetHack 3.7</DisplayName>
+    <PublisherDisplayName>NetHack DevTeam</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements DisplayName="NetHack 3.7" Description="NetHack 3.7" BackgroundColor="transparent" Square150x150Logo="Images\Square150x150Logo.png" Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" Square310x310Logo="Images\LargeTile.png" Square71x71Logo="Images\SmallTile.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
--- a/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
+++ b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="..\dirs.props" />
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <Import Project="$(vsDir)NetHackProperties.props" />
+  <PropertyGroup>
+    <OutDir>$(BinDir)</OutDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectGuid>6838ec9d-f25d-4779-9cd7-2edb61e49429</ProjectGuid>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>NetHackPackage_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>19591BE8832D6EFED75019EACE7C4CA42ABC90D4</PackageCertificateThumbprint>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundlePlatforms>x86</AppxBundlePlatforms>
+    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="NetHackPackage.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="NetHackPackage_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(ImageDir)BadgeLogo.scale-100.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-125.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-150.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-200.png" />
+    <Content Include="$(ImageDir)BadgeLogo.scale-400.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-100.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-125.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-150.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-200.png" />
+    <Content Include="$(ImageDir)LargeTile.scale-400.png" />
+    <Content Include="$(ImageDir)LockScreenLogo.scale-200.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-100.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-125.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-150.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-200.png" />
+    <Content Include="$(ImageDir)SmallTile.scale-400.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-100.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-125.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-150.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-200.png" />
+    <Content Include="$(ImageDir)SplashScreen.scale-400.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-200.png" />
+    <Content Include="$(ImageDir)Square150x150Logo.scale-400.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-200.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.scale-400.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-16.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-24.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-256.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-32.png" />
+    <Content Include="$(ImageDir)Square44x44Logo.targetsize-48.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-100.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-125.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-150.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-200.png" />
+    <Content Include="$(ImageDir)StoreLogo.scale-400.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-100.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-125.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-150.png" />
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-200.png" />
+    <Content Include="$(BinDir).nethackrc.template">
+      <Link>$(vsDir)NetHackW\.nethackrc.template</Link>
+    </Content>
+    <Content Include="$(BinDir)Guidebook.txt">
+      <Link>$(vsDir)NetHackW\Guidebook.txt</Link>
+    </Content>
+    <Content Include="$(BinDir)license">
+      <Link>$(vsDir)NetHackW\license</Link>
+    </Content>
+    <Content Include="$(BinDir)nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)">
+      <Link>$(vsDir)NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)</Link>
+    </Content>
+    <Content Include="$(BinDir)opthelp">
+      <Link>$(vsDir)NetHackW\opthelp</Link>
+    </Content>
+    <Content Include="$(BinDir)symbols.template">
+      <Link>$(vsDir)NetHackW\symbols.template</Link>
+    </Content>
+    <Content Include="$(BinDir)sysconf.template">
+      <Link>$(vsDir)NetHackW\sysconf.template</Link>
+    </Content>
+    <Content Include="$(ImageDir)Wide310x150Logo.scale-400.png" />
+    <None Include="NetHackPackage_StoreKey.pfx" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
--- a/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
+++ b/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
--- a/sys/windows/vs/NetHackProperties.props
+++ b/sys/windows/vs/NetHackProperties.props
--- a/sys/windows/vs/NetHackW/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
+  <Import Project="..\config.props" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>
    <RootNamespace>NetHackW</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
+  <Import Project="..\dirs.props" />
+  <Import Project="$(vsDir)default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="NetHackProperties.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
+  <Import Project="$(vsDir)NetHackProperties.props" />
+  <Import Project="$(vsDir)common.props" />
+  <Import Project="$(vsDir)files.props" />
  <PropertyGroup>
    <OutDir>$(BinDir)</OutDir>
  </PropertyGroup>
@@ -20,7 +20,7 @@
      <AdditionalOptions>/Gs /Oi- /w44774 %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;SAFEPROCS;NOTTYGRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <ResourceCompile>
@@ -158,13 +158,13 @@
    <ClCompile Include="$(SysShareDir)cppregex.cpp" />
    <ClCompile Include="$(SysShareDir)nhlan.c" />
    <ClCompile Include="$(SysShareDir)random.c" />
-    <ClCompile Include="$(SysWinntDir)ntsound.c" />
-    <ClCompile Include="$(SysWinntDir)stubs.c">
+    <ClCompile Include="$(SysWindDir)ntsound.c" />
+    <ClCompile Include="$(SysWindDir)stubs.c">
      <PreprocessorDefinitions>TTYSTUB;</PreprocessorDefinitions>
    </ClCompile>
-    <ClCompile Include="$(SysWinntDir)windmain.c" />
-    <ClCompile Include="$(SysWinntDir)winnt.c" />
-    <ClCompile Include="$(SysWinntDir)win10.c" />
+    <ClCompile Include="$(SysWindDir)windmain.c" />
+    <ClCompile Include="$(SysWindDir)windsys.c" />
+    <ClCompile Include="$(SysWindDir)win10.c" />
    <ClCompile Include="$(WinShareDir)safeproc.c" />
    <ClCompile Include="$(WinWin32Dir)mhaskyn.c" />
    <ClCompile Include="$(WinWin32Dir)mhdlg.c" />
@@ -241,7 +241,7 @@
    <ClInclude Include="$(IncDir)monst.h" />
    <ClInclude Include="$(IncDir)monsym.h" />
    <ClInclude Include="$(IncDir)nhlua.h" />
-    <ClInclude Include="$(IncDir)ntconf.h" />
+    <ClInclude Include="$(IncDir)windconf.h" />
    <ClInclude Include="$(IncDir)obj.h" />
    <ClInclude Include="$(IncDir)objclass.h" />
    <ClInclude Include="$(IncDir)onames.h" />
@@ -279,30 +279,30 @@
    <ClInclude Include="$(IncDir)xwindowp.h" />
    <ClInclude Include="$(IncDir)you.h" />
    <ClInclude Include="$(IncDir)youprop.h" />
-    <ClInclude Include="..\resource.h" />
+    <ClInclude Include="$(vsDir)resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <Image Include="..\mnsel.bmp" />
-    <Image Include="..\mnselcnt.bmp" />
-    <Image Include="..\mnunsel.bmp" />
-    <Image Include="..\NETHACK.ICO" />
-    <Image Include="..\petmark.bmp" />
-    <Image Include="..\pilemark.bmp" />
-    <Image Include="..\rip.bmp" />
-    <Image Include="..\splash.bmp" />
-    <Image Include="..\tiles.bmp" />
+    <Image Include="$(WinWin32Dir)mnsel.bmp" />
+    <Image Include="$(WinWin32Dir)mnselcnt.bmp" />
+    <Image Include="$(WinWin32Dir)mnunsel.bmp" />
+    <Image Include="$(WinWin32Dir)NETHACK.ICO" />
+    <Image Include="$(WinWin32Dir)petmark.bmp" />
+    <Image Include="$(WinWin32Dir)pilemark.bmp" />
+    <Image Include="$(WinWin32Dir)rip.bmp" />
+    <Image Include="$(WinWin32Dir)splash.bmp" />
+    <Image Include="$(WinWin32Dir)tiles.bmp" />
  </ItemGroup>
  <ItemGroup>
    <None Include="cpp.hint" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Target Name="AfterBuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
  </Target>
  <Target Name="AfterClean">
-    <MSBuild Projects="afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
  </Target>
  <Target Name="AfterRebuild">
-    <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
  </Target>
 </Project>
--- a/sys/windows/vs/PDCurses/PDCurses.vcxproj
+++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
+  <Import Project="..\dirs.props" />
+  <Import Project="$(vsDir)config.props" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>PDCurses</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default_lib.props" />
+  <Import Project="$(vsDir)default_lib.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="dirs.props" />
  <ItemGroup>
    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addch.c" />
    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addchstr.c" />
--- a/sys/windows/vs/Package.StoreAssociation.xml
+++ b/sys/windows/vs/Package.StoreAssociation.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
+  <Publisher>CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F</Publisher>
+  <PublisherDisplayName>NetHack DevTeam</PublisherDisplayName>
+  <DeveloperAccountType>AAD</DeveloperAccountType>
+  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
+  <SupportedLocales>
+    <Language Code="af" InMinimumRequirementSet="true" />
+    <Language Code="af-za" InMinimumRequirementSet="true" />
+    <Language Code="am" InMinimumRequirementSet="true" />
+    <Language Code="am-et" InMinimumRequirementSet="true" />
+    <Language Code="ar" InMinimumRequirementSet="true" />
+    <Language Code="ar-ae" InMinimumRequirementSet="true" />
+    <Language Code="ar-bh" InMinimumRequirementSet="true" />
+    <Language Code="ar-dz" InMinimumRequirementSet="true" />
+    <Language Code="ar-eg" InMinimumRequirementSet="true" />
+    <Language Code="ar-iq" InMinimumRequirementSet="true" />
+    <Language Code="ar-jo" InMinimumRequirementSet="true" />
+    <Language Code="ar-kw" InMinimumRequirementSet="true" />
+    <Language Code="ar-lb" InMinimumRequirementSet="true" />
+    <Language Code="ar-ly" InMinimumRequirementSet="true" />
+    <Language Code="ar-ma" InMinimumRequirementSet="true" />
+    <Language Code="ar-om" InMinimumRequirementSet="true" />
+    <Language Code="ar-qa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sy" InMinimumRequirementSet="true" />
+    <Language Code="ar-tn" InMinimumRequirementSet="true" />
+    <Language Code="ar-ye" InMinimumRequirementSet="true" />
+    <Language Code="as" InMinimumRequirementSet="true" />
+    <Language Code="as-in" InMinimumRequirementSet="true" />
+    <Language Code="az" InMinimumRequirementSet="true" />
+    <Language Code="az-arab" InMinimumRequirementSet="true" />
+    <Language Code="az-arab-az" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />
+    <Language Code="az-latn" InMinimumRequirementSet="true" />
+    <Language Code="az-latn-az" InMinimumRequirementSet="true" />
+    <Language Code="be" InMinimumRequirementSet="true" />
+    <Language Code="be-by" InMinimumRequirementSet="true" />
+    <Language Code="bg" InMinimumRequirementSet="true" />
+    <Language Code="bg-bg" InMinimumRequirementSet="true" />
+    <Language Code="bn" InMinimumRequirementSet="true" />
+    <Language Code="bn-bd" InMinimumRequirementSet="true" />
+    <Language Code="bn-in" InMinimumRequirementSet="true" />
+    <Language Code="bs" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="ca" InMinimumRequirementSet="true" />
+    <Language Code="ca-es" InMinimumRequirementSet="true" />
+    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />
+    <Language Code="chr-latn" InMinimumRequirementSet="true" />
+    <Language Code="cs" InMinimumRequirementSet="true" />
+    <Language Code="cs-cz" InMinimumRequirementSet="true" />
+    <Language Code="cy" InMinimumRequirementSet="true" />
+    <Language Code="cy-gb" InMinimumRequirementSet="true" />
+    <Language Code="da" InMinimumRequirementSet="true" />
+    <Language Code="da-dk" InMinimumRequirementSet="true" />
+    <Language Code="de" InMinimumRequirementSet="true" />
+    <Language Code="de-at" InMinimumRequirementSet="true" />
+    <Language Code="de-ch" InMinimumRequirementSet="true" />
+    <Language Code="de-de" InMinimumRequirementSet="true" />
+    <Language Code="de-li" InMinimumRequirementSet="true" />
+    <Language Code="de-lu" InMinimumRequirementSet="true" />
+    <Language Code="el" InMinimumRequirementSet="true" />
+    <Language Code="el-gr" InMinimumRequirementSet="true" />
+    <Language Code="en" InMinimumRequirementSet="true" />
+    <Language Code="en-011" InMinimumRequirementSet="true" />
+    <Language Code="en-014" InMinimumRequirementSet="true" />
+    <Language Code="en-018" InMinimumRequirementSet="true" />
+    <Language Code="en-021" InMinimumRequirementSet="true" />
+    <Language Code="en-029" InMinimumRequirementSet="true" />
+    <Language Code="en-053" InMinimumRequirementSet="true" />
+    <Language Code="en-au" InMinimumRequirementSet="true" />
+    <Language Code="en-bz" InMinimumRequirementSet="true" />
+    <Language Code="en-ca" InMinimumRequirementSet="true" />
+    <Language Code="en-gb" InMinimumRequirementSet="true" />
+    <Language Code="en-hk" InMinimumRequirementSet="true" />
+    <Language Code="en-id" InMinimumRequirementSet="true" />
+    <Language Code="en-ie" InMinimumRequirementSet="true" />
+    <Language Code="en-in" InMinimumRequirementSet="true" />
+    <Language Code="en-jm" InMinimumRequirementSet="true" />
+    <Language Code="en-kz" InMinimumRequirementSet="true" />
+    <Language Code="en-mt" InMinimumRequirementSet="true" />
+    <Language Code="en-my" InMinimumRequirementSet="true" />
+    <Language Code="en-nz" InMinimumRequirementSet="true" />
+    <Language Code="en-ph" InMinimumRequirementSet="true" />
+    <Language Code="en-pk" InMinimumRequirementSet="true" />
+    <Language Code="en-sg" InMinimumRequirementSet="true" />
+    <Language Code="en-tt" InMinimumRequirementSet="true" />
+    <Language Code="en-us" InMinimumRequirementSet="true" />
+    <Language Code="en-vn" InMinimumRequirementSet="true" />
+    <Language Code="en-za" InMinimumRequirementSet="true" />
+    <Language Code="en-zw" InMinimumRequirementSet="true" />
+    <Language Code="es" InMinimumRequirementSet="true" />
+    <Language Code="es-019" InMinimumRequirementSet="true" />
+    <Language Code="es-419" InMinimumRequirementSet="true" />
+    <Language Code="es-ar" InMinimumRequirementSet="true" />
+    <Language Code="es-bo" InMinimumRequirementSet="true" />
+    <Language Code="es-cl" InMinimumRequirementSet="true" />
+    <Language Code="es-co" InMinimumRequirementSet="true" />
+    <Language Code="es-cr" InMinimumRequirementSet="true" />
+    <Language Code="es-do" InMinimumRequirementSet="true" />
+    <Language Code="es-ec" InMinimumRequirementSet="true" />
+    <Language Code="es-es" InMinimumRequirementSet="true" />
+    <Language Code="es-gt" InMinimumRequirementSet="true" />
+    <Language Code="es-hn" InMinimumRequirementSet="true" />
+    <Language Code="es-mx" InMinimumRequirementSet="true" />
+    <Language Code="es-ni" InMinimumRequirementSet="true" />
+    <Language Code="es-pa" InMinimumRequirementSet="true" />
+    <Language Code="es-pe" InMinimumRequirementSet="true" />
+    <Language Code="es-pr" InMinimumRequirementSet="true" />
+    <Language Code="es-py" InMinimumRequirementSet="true" />
+    <Language Code="es-sv" InMinimumRequirementSet="true" />
+    <Language Code="es-us" InMinimumRequirementSet="true" />
+    <Language Code="es-uy" InMinimumRequirementSet="true" />
+    <Language Code="es-ve" InMinimumRequirementSet="true" />
+    <Language Code="et" InMinimumRequirementSet="true" />
+    <Language Code="et-ee" InMinimumRequirementSet="true" />
+    <Language Code="eu" InMinimumRequirementSet="true" />
+    <Language Code="eu-es" InMinimumRequirementSet="true" />
+    <Language Code="fa" InMinimumRequirementSet="true" />
+    <Language Code="fa-ir" InMinimumRequirementSet="true" />
+    <Language Code="fi" InMinimumRequirementSet="true" />
+    <Language Code="fi-fi" InMinimumRequirementSet="true" />
+    <Language Code="fil" InMinimumRequirementSet="true" />
+    <Language Code="fil-latn" InMinimumRequirementSet="true" />
+    <Language Code="fil-ph" InMinimumRequirementSet="true" />
+    <Language Code="fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-011" InMinimumRequirementSet="true" />
+    <Language Code="fr-015" InMinimumRequirementSet="true" />
+    <Language Code="fr-021" InMinimumRequirementSet="true" />
+    <Language Code="fr-029" InMinimumRequirementSet="true" />
+    <Language Code="fr-155" InMinimumRequirementSet="true" />
+    <Language Code="fr-be" InMinimumRequirementSet="true" />
+    <Language Code="fr-ca" InMinimumRequirementSet="true" />
+    <Language Code="fr-cd" InMinimumRequirementSet="true" />
+    <Language Code="fr-ch" InMinimumRequirementSet="true" />
+    <Language Code="fr-ci" InMinimumRequirementSet="true" />
+    <Language Code="fr-cm" InMinimumRequirementSet="true" />
+    <Language Code="fr-fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-ht" InMinimumRequirementSet="true" />
+    <Language Code="fr-lu" InMinimumRequirementSet="true" />
+    <Language Code="fr-ma" InMinimumRequirementSet="true" />
+    <Language Code="fr-mc" InMinimumRequirementSet="true" />
+    <Language Code="fr-ml" InMinimumRequirementSet="true" />
+    <Language Code="fr-re" InMinimumRequirementSet="true" />
+    <Language Code="frc-latn" InMinimumRequirementSet="true" />
+    <Language Code="frp-latn" InMinimumRequirementSet="true" />
+    <Language Code="ga" InMinimumRequirementSet="true" />
+    <Language Code="ga-ie" InMinimumRequirementSet="true" />
+    <Language Code="gd-gb" InMinimumRequirementSet="true" />
+    <Language Code="gd-latn" InMinimumRequirementSet="true" />
+    <Language Code="gl" InMinimumRequirementSet="true" />
+    <Language Code="gl-es" InMinimumRequirementSet="true" />
+    <Language Code="gu" InMinimumRequirementSet="true" />
+    <Language Code="gu-in" InMinimumRequirementSet="true" />
+    <Language Code="ha" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />
+    <Language Code="he" InMinimumRequirementSet="true" />
+    <Language Code="he-il" InMinimumRequirementSet="true" />
+    <Language Code="hi" InMinimumRequirementSet="true" />
+    <Language Code="hi-in" InMinimumRequirementSet="true" />
+    <Language Code="hr" InMinimumRequirementSet="true" />
+    <Language Code="hr-ba" InMinimumRequirementSet="true" />
+    <Language Code="hr-hr" InMinimumRequirementSet="true" />
+    <Language Code="hu" InMinimumRequirementSet="true" />
+    <Language Code="hu-hu" InMinimumRequirementSet="true" />
+    <Language Code="hy" InMinimumRequirementSet="true" />
+    <Language Code="hy-am" InMinimumRequirementSet="true" />
+    <Language Code="id" InMinimumRequirementSet="true" />
+    <Language Code="id-id" InMinimumRequirementSet="true" />
+    <Language Code="ig-latn" InMinimumRequirementSet="true" />
+    <Language Code="ig-ng" InMinimumRequirementSet="true" />
+    <Language Code="is" InMinimumRequirementSet="true" />
+    <Language Code="is-is" InMinimumRequirementSet="true" />
+    <Language Code="it" InMinimumRequirementSet="true" />
+    <Language Code="it-ch" InMinimumRequirementSet="true" />
+    <Language Code="it-it" InMinimumRequirementSet="true" />
+    <Language Code="iu-cans" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />
+    <Language Code="ja" InMinimumRequirementSet="true" />
+    <Language Code="ja-jp" InMinimumRequirementSet="true" />
+    <Language Code="ka" InMinimumRequirementSet="true" />
+    <Language Code="ka-ge" InMinimumRequirementSet="true" />
+    <Language Code="kk" InMinimumRequirementSet="true" />
+    <Language Code="kk-kz" InMinimumRequirementSet="true" />
+    <Language Code="km" InMinimumRequirementSet="true" />
+    <Language Code="km-kh" InMinimumRequirementSet="true" />
+    <Language Code="kn" InMinimumRequirementSet="true" />
+    <Language Code="kn-in" InMinimumRequirementSet="true" />
+    <Language Code="ko" InMinimumRequirementSet="true" />
+    <Language Code="ko-kr" InMinimumRequirementSet="true" />
+    <Language Code="kok" InMinimumRequirementSet="true" />
+    <Language Code="kok-in" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />
+    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ky-kg" InMinimumRequirementSet="true" />
+    <Language Code="lb" InMinimumRequirementSet="true" />
+    <Language Code="lb-lu" InMinimumRequirementSet="true" />
+    <Language Code="lo" InMinimumRequirementSet="true" />
+    <Language Code="lo-la" InMinimumRequirementSet="true" />
+    <Language Code="lt" InMinimumRequirementSet="true" />
+    <Language Code="lt-lt" InMinimumRequirementSet="true" />
+    <Language Code="lv" InMinimumRequirementSet="true" />
+    <Language Code="lv-lv" InMinimumRequirementSet="true" />
+    <Language Code="mi" InMinimumRequirementSet="true" />
+    <Language Code="mi-latn" InMinimumRequirementSet="true" />
+    <Language Code="mi-nz" InMinimumRequirementSet="true" />
+    <Language Code="mk" InMinimumRequirementSet="true" />
+    <Language Code="mk-mk" InMinimumRequirementSet="true" />
+    <Language Code="ml" InMinimumRequirementSet="true" />
+    <Language Code="ml-in" InMinimumRequirementSet="true" />
+    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="mn-mn" InMinimumRequirementSet="true" />
+    <Language Code="mn-mong" InMinimumRequirementSet="true" />
+    <Language Code="mn-phag" InMinimumRequirementSet="true" />
+    <Language Code="mr" InMinimumRequirementSet="true" />
+    <Language Code="mr-in" InMinimumRequirementSet="true" />
+    <Language Code="ms" InMinimumRequirementSet="true" />
+    <Language Code="ms-bn" InMinimumRequirementSet="true" />
+    <Language Code="ms-my" InMinimumRequirementSet="true" />
+    <Language Code="mt" InMinimumRequirementSet="true" />
+    <Language Code="mt-mt" InMinimumRequirementSet="true" />
+    <Language Code="nb" InMinimumRequirementSet="true" />
+    <Language Code="nb-no" InMinimumRequirementSet="true" />
+    <Language Code="ne" InMinimumRequirementSet="true" />
+    <Language Code="ne-np" InMinimumRequirementSet="true" />
+    <Language Code="nl" InMinimumRequirementSet="true" />
+    <Language Code="nl-be" InMinimumRequirementSet="true" />
+    <Language Code="nl-nl" InMinimumRequirementSet="true" />
+    <Language Code="nn" InMinimumRequirementSet="true" />
+    <Language Code="nn-no" InMinimumRequirementSet="true" />
+    <Language Code="no" InMinimumRequirementSet="true" />
+    <Language Code="no-no" InMinimumRequirementSet="true" />
+    <Language Code="nso" InMinimumRequirementSet="true" />
+    <Language Code="nso-za" InMinimumRequirementSet="true" />
+    <Language Code="om" InMinimumRequirementSet="false" />
+    <Language Code="om-et" InMinimumRequirementSet="false" />
+    <Language Code="or" InMinimumRequirementSet="true" />
+    <Language Code="or-in" InMinimumRequirementSet="true" />
+    <Language Code="pa" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="pa-deva" InMinimumRequirementSet="true" />
+    <Language Code="pa-in" InMinimumRequirementSet="true" />
+    <Language Code="pl" InMinimumRequirementSet="true" />
+    <Language Code="pl-pl" InMinimumRequirementSet="true" />
+    <Language Code="prs" InMinimumRequirementSet="true" />
+    <Language Code="prs-af" InMinimumRequirementSet="true" />
+    <Language Code="prs-arab" InMinimumRequirementSet="true" />
+    <Language Code="pt" InMinimumRequirementSet="true" />
+    <Language Code="pt-br" InMinimumRequirementSet="true" />
+    <Language Code="pt-pt" InMinimumRequirementSet="true" />
+    <Language Code="quc-latn" InMinimumRequirementSet="true" />
+    <Language Code="qut-gt" InMinimumRequirementSet="true" />
+    <Language Code="qut-latn" InMinimumRequirementSet="true" />
+    <Language Code="quz" InMinimumRequirementSet="true" />
+    <Language Code="quz-bo" InMinimumRequirementSet="true" />
+    <Language Code="quz-ec" InMinimumRequirementSet="true" />
+    <Language Code="quz-pe" InMinimumRequirementSet="true" />
+    <Language Code="ro" InMinimumRequirementSet="true" />
+    <Language Code="ro-ro" InMinimumRequirementSet="true" />
+    <Language Code="ru" InMinimumRequirementSet="true" />
+    <Language Code="ru-ru" InMinimumRequirementSet="true" />
+    <Language Code="rw" InMinimumRequirementSet="true" />
+    <Language Code="rw-rw" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="sd-deva" InMinimumRequirementSet="true" />
+    <Language Code="si" InMinimumRequirementSet="true" />
+    <Language Code="si-lk" InMinimumRequirementSet="true" />
+    <Language Code="sk" InMinimumRequirementSet="true" />
+    <Language Code="sk-sk" InMinimumRequirementSet="true" />
+    <Language Code="sl" InMinimumRequirementSet="true" />
+    <Language Code="sl-si" InMinimumRequirementSet="true" />
+    <Language Code="sq" InMinimumRequirementSet="true" />
+    <Language Code="sq-al" InMinimumRequirementSet="true" />
+    <Language Code="sr" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
+    <Language Code="sv" InMinimumRequirementSet="true" />
+    <Language Code="sv-fi" InMinimumRequirementSet="true" />
+    <Language Code="sv-se" InMinimumRequirementSet="true" />
+    <Language Code="sw" InMinimumRequirementSet="true" />
+    <Language Code="sw-ke" InMinimumRequirementSet="true" />
+    <Language Code="ta" InMinimumRequirementSet="true" />
+    <Language Code="ta-in" InMinimumRequirementSet="true" />
+    <Language Code="te" InMinimumRequirementSet="true" />
+    <Language Code="te-in" InMinimumRequirementSet="true" />
+    <Language Code="tg-arab" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />
+    <Language Code="tg-latn" InMinimumRequirementSet="true" />
+    <Language Code="th" InMinimumRequirementSet="true" />
+    <Language Code="th-th" InMinimumRequirementSet="true" />
+    <Language Code="ti" InMinimumRequirementSet="true" />
+    <Language Code="ti-et" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-tm" InMinimumRequirementSet="true" />
+    <Language Code="tn" InMinimumRequirementSet="true" />
+    <Language Code="tn-bw" InMinimumRequirementSet="true" />
+    <Language Code="tn-za" InMinimumRequirementSet="true" />
+    <Language Code="tr" InMinimumRequirementSet="true" />
+    <Language Code="tr-tr" InMinimumRequirementSet="true" />
+    <Language Code="tt-arab" InMinimumRequirementSet="true" />
+    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tt-latn" InMinimumRequirementSet="true" />
+    <Language Code="tt-ru" InMinimumRequirementSet="true" />
+    <Language Code="ug-arab" InMinimumRequirementSet="true" />
+    <Language Code="ug-cn" InMinimumRequirementSet="true" />
+    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ug-latn" InMinimumRequirementSet="true" />
+    <Language Code="uk" InMinimumRequirementSet="true" />
+    <Language Code="uk-ua" InMinimumRequirementSet="true" />
+    <Language Code="ur" InMinimumRequirementSet="true" />
+    <Language Code="ur-pk" InMinimumRequirementSet="true" />
+    <Language Code="uz" InMinimumRequirementSet="true" />
+    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />
+    <Language Code="vi" InMinimumRequirementSet="true" />
+    <Language Code="vi-vn" InMinimumRequirementSet="true" />
+    <Language Code="wo" InMinimumRequirementSet="true" />
+    <Language Code="wo-sn" InMinimumRequirementSet="true" />
+    <Language Code="xh" InMinimumRequirementSet="true" />
+    <Language Code="xh-za" InMinimumRequirementSet="true" />
+    <Language Code="yo-latn" InMinimumRequirementSet="true" />
+    <Language Code="yo-ng" InMinimumRequirementSet="true" />
+    <Language Code="zh" InMinimumRequirementSet="true" />
+    <Language Code="zh-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
+    <Language Code="zh-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-tw" InMinimumRequirementSet="true" />
+    <Language Code="zu" InMinimumRequirementSet="true" />
+    <Language Code="zu-za" InMinimumRequirementSet="true" />
+  </SupportedLocales>
+  <ProductReservedInfo>
+    <MainPackageIdentityName>30485NetHackDevTeam.NetHack3.6</MainPackageIdentityName>
+    <ReservedNames>
+      <ReservedName>NetHack 3.7</ReservedName>
+    </ReservedNames>
+  </ProductReservedInfo>
+  <AccountPackageIdentityNames>
+    <MainPackageIdentityName>30485NetHackDevTeam.NetHackBeta</MainPackageIdentityName>
+  </AccountPackageIdentityNames>
+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9PJ7BFSRP8M5" />
+</StoreAssociation>
--- a/sys/windows/vs/ScreenShot.PNG
+++ b/sys/windows/vs/ScreenShot.PNG
--- a/sys/windows/vs/build.bat
+++ b/sys/windows/vs/build.bat
--- a/Show More
+++ b/Show More