diff --git a/installer/amxmodx-installer.nsi b/installer/amxmodx-installer.nsi
index b01e97fa..f79edfed 100755
--- a/installer/amxmodx-installer.nsi
+++ b/installer/amxmodx-installer.nsi
@@ -107,10 +107,10 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\configs\clcmds.ini"
   File "installer\files\base\addons\amxmodx\configs\cmds.ini"
   File "installer\files\base\addons\amxmodx\configs\configs.ini"
-  File "installer\files\base\addons\amxmodx\configs\conmotd.txt"
   File "installer\files\base\addons\amxmodx\configs\core.ini"
   File "installer\files\base\addons\amxmodx\configs\custommenuitems.cfg"
   File "installer\files\base\addons\amxmodx\configs\cvars.ini"
+  File "installer\files\base\addons\amxmodx\configs\hamdata.ini"
   File "installer\files\base\addons\amxmodx\configs\maps.ini"
   File "installer\files\base\addons\amxmodx\configs\modules.ini"
   File "installer\files\base\addons\amxmodx\configs\plugins.ini"
@@ -171,6 +171,8 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\modules\regex_amxx_i386.so"
   File "installer\files\base\addons\amxmodx\modules\sockets_amxx.dll"
   File "installer\files\base\addons\amxmodx\modules\sockets_amxx_i386.so"
+  File "installer\files\base\addons\amxmodx\modules\hamsandwich_amxx.dll"
+  File "installer\files\base\addons\amxmodx\modules\hamsandwich_amxx_i386.so"
   SetOutPath "$INSTDIR\files\base\plugins"
   File "installer\files\base\addons\amxmodx\plugins\admin.amxx"
   File "installer\files\base\addons\amxmodx\plugins\adminchat.amxx"
@@ -190,6 +192,7 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\plugins\nextmap.amxx"
   File "installer\files\base\addons\amxmodx\plugins\pausecfg.amxx"
   File "installer\files\base\addons\amxmodx\plugins\plmenu.amxx"
+  File "installer\files\base\addons\amxmodx\plugins\pluginmenu.amxx"
   File "installer\files\base\addons\amxmodx\plugins\scrollmsg.amxx"
   File "installer\files\base\addons\amxmodx\plugins\statscfg.amxx"
   File "installer\files\base\addons\amxmodx\plugins\telemenu.amxx"
@@ -218,6 +221,7 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\include\amxconst.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\amxmisc.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\amxmodx.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\cellarray.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\core.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\csstats.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\cstrike.inc"
@@ -239,6 +243,9 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\include\float.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\fun.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\geoip.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\ham_const.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\hamsandwich.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\hlsdk_const.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\hlsdk_const.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\lang.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\messages.inc"
@@ -248,11 +255,13 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\include\ns2amx.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\ns_const.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\regex.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\newmenus.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\nvault.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\sockets.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\sorting.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\sqlx.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\string.inc"
+  File "installer\files\base\addons\amxmodx\scripting\include\svn_version.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\tfcconst.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\tfcstats.inc"
   File "installer\files\base\addons\amxmodx\scripting\include\tfcx.inc"
@@ -282,6 +291,7 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\scripting\nextmap.sma"
   File "installer\files\base\addons\amxmodx\scripting\pausecfg.sma"
   File "installer\files\base\addons\amxmodx\scripting\plmenu.sma"
+  File "installer\files\base\addons\amxmodx\scripting\pluginmenu.sma"
   File "installer\files\base\addons\amxmodx\scripting\scrollmsg.sma"
   File "installer\files\base\addons\amxmodx\scripting\statscfg.sma"
   File "installer\files\base\addons\amxmodx\scripting\telemenu.sma"
@@ -589,6 +599,7 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\telemenu.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\statscfg.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\scrollmsg.sma"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pluginmenu.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\plmenu.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\pausecfg.sma"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\nextmap.sma"
@@ -618,6 +629,7 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\tfcstats.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\tfcconst.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\time.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\svn_version.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\string.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\sqlx.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\sorting.inc"
@@ -627,11 +639,14 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\ns2amx.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\ns.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\nvault.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\newmenus.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\message_stocks.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\message_const.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\messages.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\lang.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\hlsdk_const.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\ham_const.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\hamsandwich.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\geoip.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\fun.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\float.inc"
@@ -653,6 +668,7 @@ Section Uninstall
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\cstrike.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\csstats.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\core.inc"
+  Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\cellarray.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmodx.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod.inc"
   Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmisc.inc"
@@ -696,6 +712,7 @@ Section Uninstall
   Delete "$INSTDIR\files\base\plugins\telemenu.amxx"
   Delete "$INSTDIR\files\base\plugins\statscfg.amxx"
   Delete "$INSTDIR\files\base\plugins\scrollmsg.amxx"
+  Delete "$INSTDIR\files\base\plugins\pluginmenu.amxx"
   Delete "$INSTDIR\files\base\plugins\plmenu.amxx"
   Delete "$INSTDIR\files\base\plugins\pausecfg.amxx"
   Delete "$INSTDIR\files\base\plugins\nextmap.amxx"
@@ -731,6 +748,8 @@ Section Uninstall
   Delete "$INSTDIR\files\base\modules\fakemeta_amxx.dll"
   Delete "$INSTDIR\files\base\modules\engine_amxx_i386.so"
   Delete "$INSTDIR\files\base\modules\engine_amxx.dll"
+  Delete "$INSTDIR\files\base\modules\hamsandwich_amxx_i386.so"
+  Delete "$INSTDIR\files\base\modules\hamsandwich_amxx.dll"
   Delete "$INSTDIR\files\base\dlls\metamod_i386.so"
   Delete "$INSTDIR\files\base\dlls\metamod.dll"
   Delete "$INSTDIR\files\base\dlls\amxmodx_mm_i386.so"
@@ -769,10 +788,10 @@ Section Uninstall
   Delete "$INSTDIR\files\base\configs\plugins.ini"
   Delete "$INSTDIR\files\base\configs\modules.ini"
   Delete "$INSTDIR\files\base\configs\maps.ini"
+  Delete "$INSTDIR\files\base\configs\hamdata.ini"
   Delete "$INSTDIR\files\base\configs\cvars.ini"
   Delete "$INSTDIR\files\base\configs\custommenuitems.cfg"
   Delete "$INSTDIR\files\base\configs\core.ini"
-  Delete "$INSTDIR\files\base\configs\conmotd.txt"
   Delete "$INSTDIR\files\base\configs\configs.ini"
   Delete "$INSTDIR\files\base\configs\cmds.ini"
   Delete "$INSTDIR\files\base\configs\clcmds.ini"