5 files changed, 413 insertions, 400 deletions
diff --git a/Changes b/Changes
index 6b0b9ad81..e2cab0e72 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Anope Version  S V N
 09/15 F Dealt with the nss_dns.so.1 issue on freebsd 7.                   [ #00]
 09/23 F Fixed numerous possible buffer overflows in NS and CS.            [ #00]
 09/25 F Fixed UnRestrictSAdmin on Unreal and Inspircd.                    [#942]
+09/25 F Fixed menu not properly removed after uninstall on windows.       [#944]
 
 Provided by Robin Burchell <w00t@inspircd.org> - 2008
 09/22 F Enabled UMODE functionality for InspIRCd 1.1                      [ #00]
diff --git a/anope.bat b/anope.bat
new file mode 100644
index 000000000..20cebfa9c
--- /dev/null
+++ b/anope.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+anope.exe %1 %2 %3 %4 %5
+pause
+\ No newline at end of file
diff --git a/src/tools/Anope_Install_Script.nsi b/src/tools/Anope_Install_Script.nsi
index cc3bbca8f..14eb73b3b 100644
--- a/src/tools/Anope_Install_Script.nsi
+++ b/src/tools/Anope_Install_Script.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Anope IRC Services"
-!define PRODUCT_VERSION "1.7.21"
+!define PRODUCT_VERSION "1.7.22"
 !define PRODUCT_PUBLISHER "Anope"
 !define PRODUCT_WEB_SITE "http://www.anope.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\anope.exe"
@@ -26,7 +26,7 @@
 !insertmacro MUI_PAGE_WELCOME
 ; License page
 !define MUI_LICENSEPAGE_RADIOBUTTONS
-!insertmacro MUI_PAGE_LICENSE "anope-1.7.21\docs\COPYING.txt"
+!insertmacro MUI_PAGE_LICENSE "anope-1.7.22\docs\COPYING.txt"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -50,7 +50,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Anope-1.7.21.exe"
+OutFile "Anope-1.7.22.exe"
 InstallDir "$PROGRAMFILES\Anope"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -62,8 +62,9 @@ FunctionEnd
 
 Section "MainSection" SEC01
   SetOutPath "$INSTDIR"
-  File "anope-1.7.21\anope.exe"
-File "anope-1.7.21\anope.bat"
+  File "anope-1.7.22\anope.exe"
+File "anope-1.7.22\anope.bat"
+  SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\Anope"
   CreateShortCut "$SMPROGRAMS\Anope\Anope IRC Services.lnk" "$INSTDIR\anope.exe"
   CreateDirectory "$SMPROGRAMS\Anope\Advanced"
@@ -71,211 +72,211 @@ File "anope-1.7.21\anope.bat"
   CreateShortCut "$SMPROGRAMS\Anope\Advanced\Anope IRC Services (Window Logging).lnk" "$INSTDIR\anope.bat" "-nofork"
   CreateShortCut "$SMPROGRAMS\Anope\Advanced\Anope IRC Services (No Third Party Modules).lnk" "$INSTDIR\anope.bat" "-nothird"
   CreateShortCut "$DESKTOP\Anope IRC Services.lnk" "$INSTDIR\anope.exe"
-  File "anope-1.7.21\anope.exe.manifest"
-  File "anope-1.7.21\Changes.conf.txt"
-  File "anope-1.7.21\Changes.lang.txt"
-  File "anope-1.7.21\Changes.mysql.txt"
-  File "anope-1.7.21\Changes.txt"
+  File "anope-1.7.22\anope.exe.manifest"
+  File "anope-1.7.22\Changes.conf.txt"
+  File "anope-1.7.22\Changes.lang.txt"
+  File "anope-1.7.22\Changes.mysql.txt"
+  File "anope-1.7.22\Changes.txt"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21\data\anopesmtp.exe"
-  File "anope-1.7.21\data\anopesmtp.exe.manifest"
+  File "anope-1.7.22\data\anopesmtp.exe"
+  File "anope-1.7.22\data\anopesmtp.exe.manifest"
   SetOutPath "$INSTDIR\data\bin"
-  File "anope-1.7.21\data\bin\am"
-  File "anope-1.7.21\data\bin\anoperc.in"
-  File "anope-1.7.21\data\bin\cp-recursive"
-  File "anope-1.7.21\data\bin\langtool"
-  File "anope-1.7.21\data\bin\mydbgen"
-  File "anope-1.7.21\data\bin\register"
+  File "anope-1.7.22\data\bin\am"
+  File "anope-1.7.22\data\bin\anoperc.in"
+  File "anope-1.7.22\data\bin\cp-recursive"
+  File "anope-1.7.22\data\bin\langtool"
+  File "anope-1.7.22\data\bin\mydbgen"
+  File "anope-1.7.22\data\bin\register"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21\data\db-merger.exe"
-  File "anope-1.7.21\data\db-merger.exe.manifest"
-  File "anope-1.7.21\data\epona2anope.exe"
-  File "anope-1.7.21\data\epona2anope.exe.manifest"
-  File "anope-1.7.21\data\example.conf"
+  File "anope-1.7.22\data\db-merger.exe"
+  File "anope-1.7.22\data\db-merger.exe.manifest"
+  File "anope-1.7.22\data\epona2anope.exe"
+  File "anope-1.7.22\data\epona2anope.exe.manifest"
+  File "anope-1.7.22\data\example.conf"
   SetOutPath "$INSTDIR\data\languages"
-  File "anope-1.7.21\data\languages\cat"
-  File "anope-1.7.21\data\languages\de"
-  File "anope-1.7.21\data\languages\en_us"
-  File "anope-1.7.21\data\languages\es"
-  File "anope-1.7.21\data\languages\fr"
-  File "anope-1.7.21\data\languages\gr"
-  File "anope-1.7.21\data\languages\hun"
-  File "anope-1.7.21\data\languages\it"
-  File "anope-1.7.21\data\languages\nl"
-  File "anope-1.7.21\data\languages\pl"
-  File "anope-1.7.21\data\languages\pt"
-  File "anope-1.7.21\data\languages\ru"
-  File "anope-1.7.21\data\languages\tr"
+  File "anope-1.7.22\data\languages\cat"
+  File "anope-1.7.22\data\languages\de"
+  File "anope-1.7.22\data\languages\en_us"
+  File "anope-1.7.22\data\languages\es"
+  File "anope-1.7.22\data\languages\fr"
+  File "anope-1.7.22\data\languages\gr"
+  File "anope-1.7.22\data\languages\hun"
+  File "anope-1.7.22\data\languages\it"
+  File "anope-1.7.22\data\languages\nl"
+  File "anope-1.7.22\data\languages\pl"
+  File "anope-1.7.22\data\languages\pt"
+  File "anope-1.7.22\data\languages\ru"
+  File "anope-1.7.22\data\languages\tr"
   SetOutPath "$INSTDIR\data\logs"
 	SetOutPath "$INSTDIR\data\backups"
   SetOutPath "$INSTDIR\data\modules"
-  File "anope-1.7.21\data\modules\bahamut.dll"
-  File "anope-1.7.21\data\modules\bs_act.dll"
-  File "anope-1.7.21\data\modules\bs_assign.dll"
-  File "anope-1.7.21\data\modules\bs_badwords.dll"
-  File "anope-1.7.21\data\modules\bs_bot.dll"
-  File "anope-1.7.21\data\modules\bs_botlist.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy_kick.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy_kickban.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy_owner.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy_seen.dll"
-  File "anope-1.7.21\data\modules\bs_fantasy_unban.dll"
-  File "anope-1.7.21\data\modules\bs_help.dll"
-  File "anope-1.7.21\data\modules\bs_info.dll"
-  File "anope-1.7.21\data\modules\bs_kick.dll"
-  File "anope-1.7.21\data\modules\bs_say.dll"
-  File "anope-1.7.21\data\modules\bs_set.dll"
-  File "anope-1.7.21\data\modules\bs_unassign.dll"
-  File "anope-1.7.21\data\modules\charybdis.dll"
-  File "anope-1.7.21\data\modules\cs_access.dll"
-  File "anope-1.7.21\data\modules\cs_akick.dll"
-  File "anope-1.7.21\data\modules\cs_appendtopic.dll"
-  File "anope-1.7.21\data\modules\cs_ban.dll"
-  File "anope-1.7.21\data\modules\cs_clear.dll"
-  File "anope-1.7.21\data\modules\cs_drop.dll"
-  File "anope-1.7.21\data\modules\cs_enforce.dll"
-  File "anope-1.7.21\data\modules\cs_forbid.dll"
-  File "anope-1.7.21\data\modules\cs_getkey.dll"
-  File "anope-1.7.21\data\modules\cs_getpass.dll"
-  File "anope-1.7.21\data\modules\cs_help.dll"
-  File "anope-1.7.21\data\modules\cs_identify.dll"
-  File "anope-1.7.21\data\modules\cs_info.dll"
-  File "anope-1.7.21\data\modules\cs_invite.dll"
-  File "anope-1.7.21\data\modules\cs_kick.dll"
-  File "anope-1.7.21\data\modules\cs_list.dll"
-  File "anope-1.7.21\data\modules\cs_logout.dll"
-  File "anope-1.7.21\data\modules\cs_modes.dll"
-  File "anope-1.7.21\data\modules\cs_register.dll"
-  File "anope-1.7.21\data\modules\cs_sendpass.dll"
-  File "anope-1.7.21\data\modules\cs_set.dll"
-  File "anope-1.7.21\data\modules\cs_status.dll"
-  File "anope-1.7.21\data\modules\cs_suspend.dll"
-  File "anope-1.7.21\data\modules\cs_tban.dll"
-  File "anope-1.7.21\data\modules\cs_topic.dll"
-  File "anope-1.7.21\data\modules\cs_xop.dll"
-  File "anope-1.7.21\data\modules\dreamforge.dll"
-  File "anope-1.7.21\data\modules\enc_md5.dll"
-  File "anope-1.7.21\data\modules\enc_none.dll"
-  File "anope-1.7.21\data\modules\enc_old.dll"
-  File "anope-1.7.21\data\modules\he_help.dll"
-  File "anope-1.7.21\data\modules\hs_del.dll"
-  File "anope-1.7.21\data\modules\hs_delall.dll"
-  File "anope-1.7.21\data\modules\hs_group.dll"
-  File "anope-1.7.21\data\modules\hs_help.dll"
-  File "anope-1.7.21\data\modules\hs_list.dll"
-  File "anope-1.7.21\data\modules\hs_off.dll"
-  File "anope-1.7.21\data\modules\hs_on.dll"
-  File "anope-1.7.21\data\modules\hs_request.dll"
-  File "anope-1.7.21\data\modules\hs_set.dll"
-  File "anope-1.7.21\data\modules\hs_setall.dll"
-  File "anope-1.7.21\data\modules\hybrid.dll"
-  File "anope-1.7.21\data\modules\inspircd10.dll"
-  File "anope-1.7.21\data\modules\inspircd11.dll"
-  File "anope-1.7.21\data\modules\ms_cancel.dll"
-  File "anope-1.7.21\data\modules\ms_check.dll"
-  File "anope-1.7.21\data\modules\ms_del.dll"
-  File "anope-1.7.21\data\modules\ms_help.dll"
-  File "anope-1.7.21\data\modules\ms_info.dll"
-  File "anope-1.7.21\data\modules\ms_list.dll"
-  File "anope-1.7.21\data\modules\ms_read.dll"
-  File "anope-1.7.21\data\modules\ms_rsend.dll"
-  File "anope-1.7.21\data\modules\ms_send.dll"
-  File "anope-1.7.21\data\modules\ms_sendall.dll"
-  File "anope-1.7.21\data\modules\ms_set.dll"
-  File "anope-1.7.21\data\modules\ms_staff.dll"
-  File "anope-1.7.21\data\modules\ns_access.dll"
-  File "anope-1.7.21\data\modules\ns_alist.dll"
-  File "anope-1.7.21\data\modules\ns_drop.dll"
-  File "anope-1.7.21\data\modules\ns_forbid.dll"
-  File "anope-1.7.21\data\modules\ns_getemail.dll"
-  File "anope-1.7.21\data\modules\ns_getpass.dll"
-  File "anope-1.7.21\data\modules\ns_ghost.dll"
-  File "anope-1.7.21\data\modules\ns_group.dll"
-  File "anope-1.7.21\data\modules\ns_help.dll"
-  File "anope-1.7.21\data\modules\ns_identify.dll"
-  File "anope-1.7.21\data\modules\ns_info.dll"
-  File "anope-1.7.21\data\modules\ns_list.dll"
-  File "anope-1.7.21\data\modules\ns_logout.dll"
-  File "anope-1.7.21\data\modules\ns_maxemail.dll"
-  File "anope-1.7.21\data\modules\ns_recover.dll"
-  File "anope-1.7.21\data\modules\ns_register.dll"
-  File "anope-1.7.21\data\modules\ns_release.dll"
-  File "anope-1.7.21\data\modules\ns_saset.dll"
-  File "anope-1.7.21\data\modules\ns_sendpass.dll"
-  File "anope-1.7.21\data\modules\ns_set.dll"
-  File "anope-1.7.21\data\modules\ns_status.dll"
-  File "anope-1.7.21\data\modules\ns_suspend.dll"
-  File "anope-1.7.21\data\modules\ns_update.dll"
-  File "anope-1.7.21\data\modules\os_admin.dll"
-  File "anope-1.7.21\data\modules\os_akill.dll"
-  File "anope-1.7.21\data\modules\os_chankill.dll"
-  File "anope-1.7.21\data\modules\os_chanlist.dll"
-  File "anope-1.7.21\data\modules\os_clearmodes.dll"
-  File "anope-1.7.21\data\modules\os_defcon.dll"
-  File "anope-1.7.21\data\modules\os_global.dll"
-  File "anope-1.7.21\data\modules\os_help.dll"
-  File "anope-1.7.21\data\modules\os_ignore.dll"
-  File "anope-1.7.21\data\modules\os_info.dll"
-  File "anope-1.7.21\data\modules\os_jupe.dll"
-  File "anope-1.7.21\data\modules\os_kick.dll"
-  File "anope-1.7.21\data\modules\os_logonnews.dll"
-  File "anope-1.7.21\data\modules\os_mode.dll"
-  File "anope-1.7.21\data\modules\os_modinfo.dll"
-  File "anope-1.7.21\data\modules\os_modlist.dll"
-  File "anope-1.7.21\data\modules\os_modload.dll"
-  File "anope-1.7.21\data\modules\os_modunload.dll"
-  File "anope-1.7.21\data\modules\os_noop.dll"
-  File "anope-1.7.21\data\modules\os_oline.dll"
-  File "anope-1.7.21\data\modules\os_oper.dll"
-  File "anope-1.7.21\data\modules\os_opernews.dll"
-  File "anope-1.7.21\data\modules\os_quit.dll"
-  File "anope-1.7.21\data\modules\os_randomnews.dll"
-  File "anope-1.7.21\data\modules\os_raw.dll"
-  File "anope-1.7.21\data\modules\os_reload.dll"
-  File "anope-1.7.21\data\modules\os_restart.dll"
-  File "anope-1.7.21\data\modules\os_session.dll"
-  File "anope-1.7.21\data\modules\os_set.dll"
-  File "anope-1.7.21\data\modules\os_sgline.dll"
-  File "anope-1.7.21\data\modules\os_shutdown.dll"
-  File "anope-1.7.21\data\modules\os_sqline.dll"
-  File "anope-1.7.21\data\modules\os_staff.dll"
-  File "anope-1.7.21\data\modules\os_stats.dll"
-  File "anope-1.7.21\data\modules\os_svsnick.dll"
-  File "anope-1.7.21\data\modules\os_szline.dll"
-  File "anope-1.7.21\data\modules\os_umode.dll"
-  File "anope-1.7.21\data\modules\os_update.dll"
-  File "anope-1.7.21\data\modules\os_userlist.dll"
-  File "anope-1.7.21\data\modules\plexus2.dll"
-  File "anope-1.7.21\data\modules\plexus3.dll"
-  File "anope-1.7.21\data\modules\ptlink.dll"
-  File "anope-1.7.21\data\modules\rageircd.dll"
-  File "anope-1.7.21\data\modules\ratbox.dll"
-  File "anope-1.7.21\data\modules\shadowircd.dll"
-  File "anope-1.7.21\data\modules\solidircd.dll"
-  File "anope-1.7.21\data\modules\ultimate2.dll"
-  File "anope-1.7.21\data\modules\ultimate3.dll"
-  File "anope-1.7.21\data\modules\unreal31.dll"
-  File "anope-1.7.21\data\modules\unreal32.dll"
-  File "anope-1.7.21\data\modules\viagra.dll"
+  File "anope-1.7.22\data\modules\bahamut.dll"
+  File "anope-1.7.22\data\modules\bs_act.dll"
+  File "anope-1.7.22\data\modules\bs_assign.dll"
+  File "anope-1.7.22\data\modules\bs_badwords.dll"
+  File "anope-1.7.22\data\modules\bs_bot.dll"
+  File "anope-1.7.22\data\modules\bs_botlist.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy_kick.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy_kickban.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy_owner.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy_seen.dll"
+  File "anope-1.7.22\data\modules\bs_fantasy_unban.dll"
+  File "anope-1.7.22\data\modules\bs_help.dll"
+  File "anope-1.7.22\data\modules\bs_info.dll"
+  File "anope-1.7.22\data\modules\bs_kick.dll"
+  File "anope-1.7.22\data\modules\bs_say.dll"
+  File "anope-1.7.22\data\modules\bs_set.dll"
+  File "anope-1.7.22\data\modules\bs_unassign.dll"
+  File "anope-1.7.22\data\modules\charybdis.dll"
+  File "anope-1.7.22\data\modules\cs_access.dll"
+  File "anope-1.7.22\data\modules\cs_akick.dll"
+  File "anope-1.7.22\data\modules\cs_appendtopic.dll"
+  File "anope-1.7.22\data\modules\cs_ban.dll"
+  File "anope-1.7.22\data\modules\cs_clear.dll"
+  File "anope-1.7.22\data\modules\cs_drop.dll"
+  File "anope-1.7.22\data\modules\cs_enforce.dll"
+  File "anope-1.7.22\data\modules\cs_forbid.dll"
+  File "anope-1.7.22\data\modules\cs_getkey.dll"
+  File "anope-1.7.22\data\modules\cs_getpass.dll"
+  File "anope-1.7.22\data\modules\cs_help.dll"
+  File "anope-1.7.22\data\modules\cs_identify.dll"
+  File "anope-1.7.22\data\modules\cs_info.dll"
+  File "anope-1.7.22\data\modules\cs_invite.dll"
+  File "anope-1.7.22\data\modules\cs_kick.dll"
+  File "anope-1.7.22\data\modules\cs_list.dll"
+  File "anope-1.7.22\data\modules\cs_logout.dll"
+  File "anope-1.7.22\data\modules\cs_modes.dll"
+  File "anope-1.7.22\data\modules\cs_register.dll"
+  File "anope-1.7.22\data\modules\cs_sendpass.dll"
+  File "anope-1.7.22\data\modules\cs_set.dll"
+  File "anope-1.7.22\data\modules\cs_status.dll"
+  File "anope-1.7.22\data\modules\cs_suspend.dll"
+  File "anope-1.7.22\data\modules\cs_tban.dll"
+  File "anope-1.7.22\data\modules\cs_topic.dll"
+  File "anope-1.7.22\data\modules\cs_xop.dll"
+  File "anope-1.7.22\data\modules\dreamforge.dll"
+  File "anope-1.7.22\data\modules\enc_md5.dll"
+  File "anope-1.7.22\data\modules\enc_none.dll"
+  File "anope-1.7.22\data\modules\enc_old.dll"
+  File "anope-1.7.22\data\modules\he_help.dll"
+  File "anope-1.7.22\data\modules\hs_del.dll"
+  File "anope-1.7.22\data\modules\hs_delall.dll"
+  File "anope-1.7.22\data\modules\hs_group.dll"
+  File "anope-1.7.22\data\modules\hs_help.dll"
+  File "anope-1.7.22\data\modules\hs_list.dll"
+  File "anope-1.7.22\data\modules\hs_off.dll"
+  File "anope-1.7.22\data\modules\hs_on.dll"
+  File "anope-1.7.22\data\modules\hs_request.dll"
+  File "anope-1.7.22\data\modules\hs_set.dll"
+  File "anope-1.7.22\data\modules\hs_setall.dll"
+  File "anope-1.7.22\data\modules\hybrid.dll"
+  File "anope-1.7.22\data\modules\inspircd10.dll"
+  File "anope-1.7.22\data\modules\inspircd11.dll"
+  File "anope-1.7.22\data\modules\ms_cancel.dll"
+  File "anope-1.7.22\data\modules\ms_check.dll"
+  File "anope-1.7.22\data\modules\ms_del.dll"
+  File "anope-1.7.22\data\modules\ms_help.dll"
+  File "anope-1.7.22\data\modules\ms_info.dll"
+  File "anope-1.7.22\data\modules\ms_list.dll"
+  File "anope-1.7.22\data\modules\ms_read.dll"
+  File "anope-1.7.22\data\modules\ms_rsend.dll"
+  File "anope-1.7.22\data\modules\ms_send.dll"
+  File "anope-1.7.22\data\modules\ms_sendall.dll"
+  File "anope-1.7.22\data\modules\ms_set.dll"
+  File "anope-1.7.22\data\modules\ms_staff.dll"
+  File "anope-1.7.22\data\modules\ns_access.dll"
+  File "anope-1.7.22\data\modules\ns_alist.dll"
+  File "anope-1.7.22\data\modules\ns_drop.dll"
+  File "anope-1.7.22\data\modules\ns_forbid.dll"
+  File "anope-1.7.22\data\modules\ns_getemail.dll"
+  File "anope-1.7.22\data\modules\ns_getpass.dll"
+  File "anope-1.7.22\data\modules\ns_ghost.dll"
+  File "anope-1.7.22\data\modules\ns_group.dll"
+  File "anope-1.7.22\data\modules\ns_help.dll"
+  File "anope-1.7.22\data\modules\ns_identify.dll"
+  File "anope-1.7.22\data\modules\ns_info.dll"
+  File "anope-1.7.22\data\modules\ns_list.dll"
+  File "anope-1.7.22\data\modules\ns_logout.dll"
+  File "anope-1.7.22\data\modules\ns_maxemail.dll"
+  File "anope-1.7.22\data\modules\ns_recover.dll"
+  File "anope-1.7.22\data\modules\ns_register.dll"
+  File "anope-1.7.22\data\modules\ns_release.dll"
+  File "anope-1.7.22\data\modules\ns_saset.dll"
+  File "anope-1.7.22\data\modules\ns_sendpass.dll"
+  File "anope-1.7.22\data\modules\ns_set.dll"
+  File "anope-1.7.22\data\modules\ns_status.dll"
+  File "anope-1.7.22\data\modules\ns_suspend.dll"
+  File "anope-1.7.22\data\modules\ns_update.dll"
+  File "anope-1.7.22\data\modules\os_admin.dll"
+  File "anope-1.7.22\data\modules\os_akill.dll"
+  File "anope-1.7.22\data\modules\os_chankill.dll"
+  File "anope-1.7.22\data\modules\os_chanlist.dll"
+  File "anope-1.7.22\data\modules\os_clearmodes.dll"
+  File "anope-1.7.22\data\modules\os_defcon.dll"
+  File "anope-1.7.22\data\modules\os_global.dll"
+  File "anope-1.7.22\data\modules\os_help.dll"
+  File "anope-1.7.22\data\modules\os_ignore.dll"
+  File "anope-1.7.22\data\modules\os_info.dll"
+  File "anope-1.7.22\data\modules\os_jupe.dll"
+  File "anope-1.7.22\data\modules\os_kick.dll"
+  File "anope-1.7.22\data\modules\os_logonnews.dll"
+  File "anope-1.7.22\data\modules\os_mode.dll"
+  File "anope-1.7.22\data\modules\os_modinfo.dll"
+  File "anope-1.7.22\data\modules\os_modlist.dll"
+  File "anope-1.7.22\data\modules\os_modload.dll"
+  File "anope-1.7.22\data\modules\os_modunload.dll"
+  File "anope-1.7.22\data\modules\os_noop.dll"
+  File "anope-1.7.22\data\modules\os_oline.dll"
+  File "anope-1.7.22\data\modules\os_oper.dll"
+  File "anope-1.7.22\data\modules\os_opernews.dll"
+  File "anope-1.7.22\data\modules\os_quit.dll"
+  File "anope-1.7.22\data\modules\os_randomnews.dll"
+  File "anope-1.7.22\data\modules\os_raw.dll"
+  File "anope-1.7.22\data\modules\os_reload.dll"
+  File "anope-1.7.22\data\modules\os_restart.dll"
+  File "anope-1.7.22\data\modules\os_session.dll"
+  File "anope-1.7.22\data\modules\os_set.dll"
+  File "anope-1.7.22\data\modules\os_sgline.dll"
+  File "anope-1.7.22\data\modules\os_shutdown.dll"
+  File "anope-1.7.22\data\modules\os_sqline.dll"
+  File "anope-1.7.22\data\modules\os_staff.dll"
+  File "anope-1.7.22\data\modules\os_stats.dll"
+  File "anope-1.7.22\data\modules\os_svsnick.dll"
+  File "anope-1.7.22\data\modules\os_szline.dll"
+  File "anope-1.7.22\data\modules\os_umode.dll"
+  File "anope-1.7.22\data\modules\os_update.dll"
+  File "anope-1.7.22\data\modules\os_userlist.dll"
+  File "anope-1.7.22\data\modules\plexus2.dll"
+  File "anope-1.7.22\data\modules\plexus3.dll"
+  File "anope-1.7.22\data\modules\ptlink.dll"
+  File "anope-1.7.22\data\modules\rageircd.dll"
+  File "anope-1.7.22\data\modules\ratbox.dll"
+  File "anope-1.7.22\data\modules\shadowircd.dll"
+  File "anope-1.7.22\data\modules\solidircd.dll"
+  File "anope-1.7.22\data\modules\ultimate2.dll"
+  File "anope-1.7.22\data\modules\ultimate3.dll"
+  File "anope-1.7.22\data\modules\unreal31.dll"
+  File "anope-1.7.22\data\modules\unreal32.dll"
+  File "anope-1.7.22\data\modules\viagra.dll"
   SetOutPath "$INSTDIR\data\modules\runtime"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21\data\tables.sql"
+  File "anope-1.7.22\data\tables.sql"
   SetOutPath "$INSTDIR\docs"
-  File "anope-1.7.21\docs\BUGS.txt"
-  File "anope-1.7.21\docs\COPYING.txt"
-  File "anope-1.7.21\docs\DEFCON.txt"
-  File "anope-1.7.21\docs\EVENTS.txt"
-  File "anope-1.7.21\docs\FAQ.txt"
-  File "anope-1.7.21\docs\INSTALL.txt"
-  File "anope-1.7.21\docs\IRCD.txt"
-  File "anope-1.7.21\docs\MODULES.txt"
-  File "anope-1.7.21\docs\MYSQL.txt"
-  File "anope-1.7.21\docs\NEWS.txt"
-  File "anope-1.7.21\docs\OLDCHANGES.txt"
-  File "anope-1.7.21\docs\PROXY.txt"
-  File "anope-1.7.21\docs\README.txt"
-  File "anope-1.7.21\docs\WIN32.txt"
+  File "anope-1.7.22\docs\BUGS.txt"
+  File "anope-1.7.22\docs\COPYING.txt"
+  File "anope-1.7.22\docs\DEFCON.txt"
+  File "anope-1.7.22\docs\EVENTS.txt"
+  File "anope-1.7.22\docs\FAQ.txt"
+  File "anope-1.7.22\docs\INSTALL.txt"
+  File "anope-1.7.22\docs\IRCD.txt"
+  File "anope-1.7.22\docs\MODULES.txt"
+  File "anope-1.7.22\docs\MYSQL.txt"
+  File "anope-1.7.22\docs\NEWS.txt"
+  File "anope-1.7.22\docs\OLDCHANGES.txt"
+  File "anope-1.7.22\docs\PROXY.txt"
+  File "anope-1.7.22\docs\README.txt"
+  File "anope-1.7.22\docs\WIN32.txt"
 SectionEnd
 
 Section -AdditionalIcons
@@ -508,6 +509,7 @@ Section Uninstall
   Delete "$INSTDIR\anope.exe.manifest"
   Delete "$INSTDIR\anope.exe"
 Delete "$INSTDIR\anope.bat"
+  SetShellVarContext all
   Delete "$SMPROGRAMS\Anope\Uninstall.lnk"
   Delete "$SMPROGRAMS\Anope\Website.lnk"
   Delete "$DESKTOP\Anope IRC Services.lnk"
diff --git a/src/tools/Anope_MySQL_Install_Script.nsi b/src/tools/Anope_MySQL_Install_Script.nsi
index 6c287bf9c..5d2a70779 100644
--- a/src/tools/Anope_MySQL_Install_Script.nsi
+++ b/src/tools/Anope_MySQL_Install_Script.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Anope IRC Services"
-!define PRODUCT_VERSION "1.7.21-MySQL"
+!define PRODUCT_VERSION "1.7.22-MySQL"
 !define PRODUCT_PUBLISHER "Anope"
 !define PRODUCT_WEB_SITE "http://www.anope.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\anope.exe"
@@ -26,7 +26,7 @@
 !insertmacro MUI_PAGE_WELCOME
 ; License page
 !define MUI_LICENSEPAGE_RADIOBUTTONS
-!insertmacro MUI_PAGE_LICENSE "anope-1.7.21-MySQL\docs\COPYING.txt"
+!insertmacro MUI_PAGE_LICENSE "anope-1.7.22-MySQL\docs\COPYING.txt"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -50,7 +50,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Anope-1.7.21-MySQL.exe"
+OutFile "Anope-1.7.22-MySQL.exe"
 InstallDir "$PROGRAMFILES\Anope"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -62,7 +62,9 @@ FunctionEnd
 
 Section "MainSection" SEC01
   SetOutPath "$INSTDIR"
-  File "anope-1.7.21-MySQL\anope.exe"
+  File "anope-1.7.22-MySQL\anope.exe"
+File "anope-1.7.22\anope.bat"
+  SetShellVarContext all
   CreateDirectory "$SMPROGRAMS\Anope"
   CreateShortCut "$SMPROGRAMS\Anope\Anope IRC Services.lnk" "$INSTDIR\anope.exe"
   CreateShortCut "$DESKTOP\Anope IRC Services.lnk" "$INSTDIR\anope.exe"
@@ -71,211 +73,211 @@ Section "MainSection" SEC01
   CreateShortCut "$SMPROGRAMS\Anope\Advanced\Anope IRC Services (Window Logging).lnk" "$INSTDIR\anope.bat" "-nofork"
   CreateShortCut "$SMPROGRAMS\Anope\Advanced\Anope IRC Services (No Third Party Modules).lnk" "$INSTDIR\anope.bat" "-nothird"
 
-  File "anope-1.7.21-MySQL\anope.exe.manifest"
-  File "anope-1.7.21-MySQL\Changes.conf.txt"
-  File "anope-1.7.21-MySQL\Changes.lang.txt"
-  File "anope-1.7.21-MySQL\Changes.mysql.txt"
-  File "anope-1.7.21-MySQL\Changes.txt"
+  File "anope-1.7.22-MySQL\anope.exe.manifest"
+  File "anope-1.7.22-MySQL\Changes.conf.txt"
+  File "anope-1.7.22-MySQL\Changes.lang.txt"
+  File "anope-1.7.22-MySQL\Changes.mysql.txt"
+  File "anope-1.7.22-MySQL\Changes.txt"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21-MySQL\data\anopesmtp.exe"
-  File "anope-1.7.21-MySQL\data\anopesmtp.exe.manifest"
+  File "anope-1.7.22-MySQL\data\anopesmtp.exe"
+  File "anope-1.7.22-MySQL\data\anopesmtp.exe.manifest"
   SetOutPath "$INSTDIR\data\bin"
-  File "anope-1.7.21-MySQL\data\bin\am"
-  File "anope-1.7.21-MySQL\data\bin\anoperc.in"
-  File "anope-1.7.21-MySQL\data\bin\cp-recursive"
-  File "anope-1.7.21-MySQL\data\bin\langtool"
-  File "anope-1.7.21-MySQL\data\bin\mydbgen"
-  File "anope-1.7.21-MySQL\data\bin\register"
+  File "anope-1.7.22-MySQL\data\bin\am"
+  File "anope-1.7.22-MySQL\data\bin\anoperc.in"
+  File "anope-1.7.22-MySQL\data\bin\cp-recursive"
+  File "anope-1.7.22-MySQL\data\bin\langtool"
+  File "anope-1.7.22-MySQL\data\bin\mydbgen"
+  File "anope-1.7.22-MySQL\data\bin\register"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21-MySQL\data\db-merger.exe"
-  File "anope-1.7.21-MySQL\data\db-merger.exe.manifest"
-  File "anope-1.7.21-MySQL\data\epona2anope.exe"
-  File "anope-1.7.21-MySQL\data\epona2anope.exe.manifest"
-  File "anope-1.7.21-MySQL\data\example.conf"
+  File "anope-1.7.22-MySQL\data\db-merger.exe"
+  File "anope-1.7.22-MySQL\data\db-merger.exe.manifest"
+  File "anope-1.7.22-MySQL\data\epona2anope.exe"
+  File "anope-1.7.22-MySQL\data\epona2anope.exe.manifest"
+  File "anope-1.7.22-MySQL\data\example.conf"
   SetOutPath "$INSTDIR\data\languages"
-  File "anope-1.7.21-MySQL\data\languages\cat"
-  File "anope-1.7.21-MySQL\data\languages\de"
-  File "anope-1.7.21-MySQL\data\languages\en_us"
-  File "anope-1.7.21-MySQL\data\languages\es"
-  File "anope-1.7.21-MySQL\data\languages\fr"
-  File "anope-1.7.21-MySQL\data\languages\gr"
-  File "anope-1.7.21-MySQL\data\languages\hun"
-  File "anope-1.7.21-MySQL\data\languages\it"
-  File "anope-1.7.21-MySQL\data\languages\nl"
-  File "anope-1.7.21-MySQL\data\languages\pl"
-  File "anope-1.7.21-MySQL\data\languages\pt"
-  File "anope-1.7.21-MySQL\data\languages\ru"
-  File "anope-1.7.21-MySQL\data\languages\tr"
+  File "anope-1.7.22-MySQL\data\languages\cat"
+  File "anope-1.7.22-MySQL\data\languages\de"
+  File "anope-1.7.22-MySQL\data\languages\en_us"
+  File "anope-1.7.22-MySQL\data\languages\es"
+  File "anope-1.7.22-MySQL\data\languages\fr"
+  File "anope-1.7.22-MySQL\data\languages\gr"
+  File "anope-1.7.22-MySQL\data\languages\hun"
+  File "anope-1.7.22-MySQL\data\languages\it"
+  File "anope-1.7.22-MySQL\data\languages\nl"
+  File "anope-1.7.22-MySQL\data\languages\pl"
+  File "anope-1.7.22-MySQL\data\languages\pt"
+  File "anope-1.7.22-MySQL\data\languages\ru"
+  File "anope-1.7.22-MySQL\data\languages\tr"
   SetOutPath "$INSTDIR\data\logs"
 SetOutPath "$INSTDIR\data\backups"
   SetOutPath "$INSTDIR\data\modules"
-  File "anope-1.7.21-MySQL\data\modules\bahamut.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_act.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_assign.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_badwords.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_bot.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_botlist.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy_kick.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy_kickban.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy_owner.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy_seen.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_fantasy_unban.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_info.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_kick.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_say.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\bs_unassign.dll"
-  File "anope-1.7.21-MySQL\data\modules\charybdis.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_access.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_akick.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_appendtopic.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_ban.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_clear.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_drop.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_enforce.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_forbid.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_getkey.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_getpass.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_identify.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_info.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_invite.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_kick.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_list.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_logout.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_modes.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_register.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_sendpass.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_status.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_suspend.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_tban.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_topic.dll"
-  File "anope-1.7.21-MySQL\data\modules\cs_xop.dll"
-  File "anope-1.7.21-MySQL\data\modules\dreamforge.dll"
-  File "anope-1.7.21-MySQL\data\modules\enc_md5.dll"
-  File "anope-1.7.21-MySQL\data\modules\enc_none.dll"
-  File "anope-1.7.21-MySQL\data\modules\enc_old.dll"
-  File "anope-1.7.21-MySQL\data\modules\he_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_del.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_delall.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_group.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_list.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_off.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_on.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_request.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\hs_setall.dll"
-  File "anope-1.7.21-MySQL\data\modules\hybrid.dll"
-  File "anope-1.7.21-MySQL\data\modules\inspircd10.dll"
-  File "anope-1.7.21-MySQL\data\modules\inspircd11.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_cancel.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_check.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_del.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_info.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_list.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_read.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_rsend.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_send.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_sendall.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\ms_staff.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_access.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_alist.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_drop.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_forbid.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_getemail.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_getpass.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_ghost.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_group.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_identify.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_info.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_list.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_logout.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_maxemail.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_recover.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_register.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_release.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_saset.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_sendpass.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_status.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_suspend.dll"
-  File "anope-1.7.21-MySQL\data\modules\ns_update.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_admin.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_akill.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_chankill.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_chanlist.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_clearmodes.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_defcon.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_global.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_help.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_ignore.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_info.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_jupe.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_kick.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_logonnews.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_mode.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_modinfo.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_modlist.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_modload.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_modunload.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_noop.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_oline.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_oper.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_opernews.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_quit.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_randomnews.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_raw.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_reload.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_restart.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_session.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_set.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_sgline.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_shutdown.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_sqline.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_staff.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_stats.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_svsnick.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_szline.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_umode.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_update.dll"
-  File "anope-1.7.21-MySQL\data\modules\os_userlist.dll"
-  File "anope-1.7.21-MySQL\data\modules\plexus2.dll"
-  File "anope-1.7.21-MySQL\data\modules\plexus3.dll"
-  File "anope-1.7.21-MySQL\data\modules\ptlink.dll"
-  File "anope-1.7.21-MySQL\data\modules\rageircd.dll"
-  File "anope-1.7.21-MySQL\data\modules\ratbox.dll"
-  File "anope-1.7.21-MySQL\data\modules\shadowircd.dll"
-  File "anope-1.7.21-MySQL\data\modules\solidircd.dll"
-  File "anope-1.7.21-MySQL\data\modules\ultimate2.dll"
-  File "anope-1.7.21-MySQL\data\modules\ultimate3.dll"
-  File "anope-1.7.21-MySQL\data\modules\unreal31.dll"
-  File "anope-1.7.21-MySQL\data\modules\unreal32.dll"
-  File "anope-1.7.21-MySQL\data\modules\viagra.dll"
+  File "anope-1.7.22-MySQL\data\modules\bahamut.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_act.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_assign.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_badwords.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_bot.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_botlist.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy_kick.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy_kickban.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy_owner.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy_seen.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_fantasy_unban.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_info.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_kick.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_say.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\bs_unassign.dll"
+  File "anope-1.7.22-MySQL\data\modules\charybdis.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_access.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_akick.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_appendtopic.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_ban.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_clear.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_drop.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_enforce.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_forbid.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_getkey.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_getpass.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_identify.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_info.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_invite.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_kick.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_list.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_logout.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_modes.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_register.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_sendpass.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_status.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_suspend.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_tban.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_topic.dll"
+  File "anope-1.7.22-MySQL\data\modules\cs_xop.dll"
+  File "anope-1.7.22-MySQL\data\modules\dreamforge.dll"
+  File "anope-1.7.22-MySQL\data\modules\enc_md5.dll"
+  File "anope-1.7.22-MySQL\data\modules\enc_none.dll"
+  File "anope-1.7.22-MySQL\data\modules\enc_old.dll"
+  File "anope-1.7.22-MySQL\data\modules\he_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_del.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_delall.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_group.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_list.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_off.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_on.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_request.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\hs_setall.dll"
+  File "anope-1.7.22-MySQL\data\modules\hybrid.dll"
+  File "anope-1.7.22-MySQL\data\modules\inspircd10.dll"
+  File "anope-1.7.22-MySQL\data\modules\inspircd11.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_cancel.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_check.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_del.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_info.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_list.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_read.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_rsend.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_send.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_sendall.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\ms_staff.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_access.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_alist.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_drop.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_forbid.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_getemail.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_getpass.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_ghost.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_group.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_identify.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_info.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_list.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_logout.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_maxemail.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_recover.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_register.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_release.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_saset.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_sendpass.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_status.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_suspend.dll"
+  File "anope-1.7.22-MySQL\data\modules\ns_update.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_admin.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_akill.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_chankill.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_chanlist.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_clearmodes.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_defcon.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_global.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_help.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_ignore.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_info.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_jupe.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_kick.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_logonnews.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_mode.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_modinfo.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_modlist.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_modload.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_modunload.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_noop.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_oline.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_oper.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_opernews.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_quit.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_randomnews.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_raw.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_reload.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_restart.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_session.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_set.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_sgline.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_shutdown.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_sqline.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_staff.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_stats.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_svsnick.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_szline.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_umode.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_update.dll"
+  File "anope-1.7.22-MySQL\data\modules\os_userlist.dll"
+  File "anope-1.7.22-MySQL\data\modules\plexus2.dll"
+  File "anope-1.7.22-MySQL\data\modules\plexus3.dll"
+  File "anope-1.7.22-MySQL\data\modules\ptlink.dll"
+  File "anope-1.7.22-MySQL\data\modules\rageircd.dll"
+  File "anope-1.7.22-MySQL\data\modules\ratbox.dll"
+  File "anope-1.7.22-MySQL\data\modules\shadowircd.dll"
+  File "anope-1.7.22-MySQL\data\modules\solidircd.dll"
+  File "anope-1.7.22-MySQL\data\modules\ultimate2.dll"
+  File "anope-1.7.22-MySQL\data\modules\ultimate3.dll"
+  File "anope-1.7.22-MySQL\data\modules\unreal31.dll"
+  File "anope-1.7.22-MySQL\data\modules\unreal32.dll"
+  File "anope-1.7.22-MySQL\data\modules\viagra.dll"
   SetOutPath "$INSTDIR\data\modules\runtime"
   SetOutPath "$INSTDIR\data"
-  File "anope-1.7.21-MySQL\data\tables.sql"
+  File "anope-1.7.22-MySQL\data\tables.sql"
   SetOutPath "$INSTDIR\docs"
-  File "anope-1.7.21-MySQL\docs\BUGS.txt"
-  File "anope-1.7.21-MySQL\docs\COPYING.txt"
-  File "anope-1.7.21-MySQL\docs\DEFCON.txt"
-  File "anope-1.7.21-MySQL\docs\EVENTS.txt"
-  File "anope-1.7.21-MySQL\docs\FAQ.txt"
-  File "anope-1.7.21-MySQL\docs\INSTALL.txt"
-  File "anope-1.7.21-MySQL\docs\IRCD.txt"
-  File "anope-1.7.21-MySQL\docs\MODULES.txt"
-  File "anope-1.7.21-MySQL\docs\MYSQL.txt"
-  File "anope-1.7.21-MySQL\docs\NEWS.txt"
-  File "anope-1.7.21-MySQL\docs\OLDCHANGES.txt"
-  File "anope-1.7.21-MySQL\docs\PROXY.txt"
-  File "anope-1.7.21-MySQL\docs\README.txt"
-  File "anope-1.7.21-MySQL\docs\WIN32.txt"
+  File "anope-1.7.22-MySQL\docs\BUGS.txt"
+  File "anope-1.7.22-MySQL\docs\COPYING.txt"
+  File "anope-1.7.22-MySQL\docs\DEFCON.txt"
+  File "anope-1.7.22-MySQL\docs\EVENTS.txt"
+  File "anope-1.7.22-MySQL\docs\FAQ.txt"
+  File "anope-1.7.22-MySQL\docs\INSTALL.txt"
+  File "anope-1.7.22-MySQL\docs\IRCD.txt"
+  File "anope-1.7.22-MySQL\docs\MODULES.txt"
+  File "anope-1.7.22-MySQL\docs\MYSQL.txt"
+  File "anope-1.7.22-MySQL\docs\NEWS.txt"
+  File "anope-1.7.22-MySQL\docs\OLDCHANGES.txt"
+  File "anope-1.7.22-MySQL\docs\PROXY.txt"
+  File "anope-1.7.22-MySQL\docs\README.txt"
+  File "anope-1.7.22-MySQL\docs\WIN32.txt"
 SectionEnd
 
 Section -AdditionalIcons
@@ -508,6 +510,7 @@ Section Uninstall
   Delete "$INSTDIR\anope.exe.manifest"
   Delete "$INSTDIR\anope.exe"
 Delete "$INSTDIR\anope.bat"
+  SetShellVarContext all
 
   Delete "$SMPROGRAMS\Anope\Uninstall.lnk"
   Delete "$SMPROGRAMS\Anope\Website.lnk"
diff --git a/version.log b/version.log
index d49f79a67..9fccd172f 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="22"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1451"
+VERSION_BUILD="1452"
 
 # $Log$
 #
+# BUILD : 1.7.22 (1452)
+# BUGS  : 944
+# NOTES : Updated NSIS Build script and added anope.bat to properly remove windows menus after uninstall. Provided by chaz.
+#
 # BUILD : 1.7.22 (1451)
 # BUGS  : 942 
 # NOTES : We now enforce UnRestrictSAdmin on Unreal and InspIRCd.