diff --git a/installer/amxmodx-installer.nsi b/installer/amxmodx-installer.nsi
index 1f498146..f5aefdf5 100755
--- a/installer/amxmodx-installer.nsi
+++ b/installer/amxmodx-installer.nsi
@@ -2,7 +2,7 @@
 ; Licensed under the GNU General Public License
 ; Written by -=HaXoMaTiC=-
 !define PRODUCT_NAME "AMX Mod X Installer"
-!define PRODUCT_VERSION "1.50"
+!define PRODUCT_VERSION "1.55"
 !define PRODUCT_PUBLISHER "AMX Mod X Dev Team"
 !define PRODUCT_WEB_SITE "http://www.amxmodx.org/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Installer.exe"
@@ -63,12 +63,26 @@ Section "MainSection" SEC01
   CreateDirectory "$INSTDIR\temp"
   SetOverwrite try
   File "installer\Installer.exe"
-  SetOutPath "$INSTDIR\AMXX Edit"
-  File "installer\files\amxxedit\AMXX_Edit_v2.exe"
-  File "installer\files\amxxedit\Files.ini"
-  File "installer\files\amxxedit\SciLexer.dll"
-  File "installer\files\amxxedit\gpl.txt"
-  File "installer\files\amxxedit\Config.ini"
+  SetOutPath "$INSTDIR\amxxstudio"
+  File "installer\files\amxxstudio\AMXX_Studio.cfg"
+  File "installer\files\amxxstudio\AMXX_Studio.exe"
+  File "installer\files\amxxstudio\SciLexer.dll"
+  SetOutPath "$INSTDIR\amxxstudio\config"
+  File "installer\files\amxxstudio\config\C++.csl"
+  File "installer\files\amxxstudio\config\Cache.cfg"
+  File "installer\files\amxxstudio\config\Editor.sci"
+  File "installer\files\amxxstudio\config\Notes.dat"
+  File "installer\files\amxxstudio\config\Other.csl"
+  File "installer\files\amxxstudio\config\PAWN.csl"
+  File "installer\files\amxxstudio\config\Plugins.cfg"
+  File "installer\files\amxxstudio\config\Settings.ini"
+  SetOutPath "$INSTDIR\amxxstudio\plugins"
+  File "installer\files\amxxstudio\plugins\Functions and Events.txt"
+  File "installer\files\amxxstudio\plugins\HelloWorld.cfg"
+  File "installer\files\amxxstudio\plugins\HelloWorld.dll"
+  File "installer\files\amxxstudio\plugins\HelloWorld.dof"
+  File "installer\files\amxxstudio\plugins\HelloWorld.dpr"
+  File "installer\files\amxxstudio\plugins\HelloWorld.res"
   SetOutPath "$INSTDIR\files\base\configs"
   File "installer\files\base\configs\amxx.cfg"
   File "installer\files\base\configs\clcmds.ini"
@@ -315,7 +329,6 @@ Section "MainSection" SEC01
   File "installer\files\ns\configs\users.ini"
   SetOutPath "$INSTDIR\files\ns\modules"
   File "installer\files\ns\modules\ns_amxx.dll"
-  File "installer\files\ns\modules\ns_amxx_amd64.so"
   File "installer\files\ns\modules\ns_amxx_i386.so"
   SetOutPath "$INSTDIR\files\ns\plugins"
   File "installer\files\ns\plugins\idlekicker.amxx"
@@ -333,10 +346,11 @@ Section "MainSection" SEC01
   File "installer\files\ns\scripting\unstuck.sma"
   SetOutPath "$INSTDIR\files\esf\configs"
   File "installer\files\esf\configs\modules.ini"
-  SetOutPath "$INSTDIR\files\esf\modules"
-  File "installer\files\esf\modules\esfmod_amxx.dll"
-  File "installer\files\esf\modules\esfmod_amxx_amd64.so"
-  File "installer\files\esf\modules\esfmod_amxx_i386.so"
+  File "installer\files\esf\configs\plugins.ini"
+  SetOutPath "$INSTDIR\files\esf\scripting"
+  FILE "installer\files\esf\scripting\EvolutionX.Core.sma"
+  SetOutPath "$INSTDIR\files\esf\plugins"
+  FILE "installer\files\esf\plugins\EvolutionX.Core.amxx"
   SetOutPath "$INSTDIR\files\tfc\configs"
   File "installer\files\tfc\configs\core.ini"
   File "installer\files\tfc\configs\cvars.ini"
@@ -390,9 +404,9 @@ Section "MainSection" SEC01
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
   CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X.lnk" "$INSTDIR\Installer.exe"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\AMXx Editor.lnk" "$INSTDIR\AMXX Edit\AMXX_Edit_v2.exe"
+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\AMXx Studio.lnk" "$INSTDIR\amxxstudio\AMXX_Studio.exe"
   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation.lnk" "$INSTDIR\files\base\doc\amxmodx-doc.chm"
-  CreateShortCut "$DESKTOP\AMX Mod X Editor.lnk" "$INSTDIR\AMXX Edit\AMXX_Edit_v2.exe"
+  CreateShortCut "$DESKTOP\AMX Mod X Studio.lnk" "$INSTDIR\amxxstudio\AMXX_Studio.exe"
   !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
@@ -432,9 +446,9 @@ Section Uninstall
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\gpl.txt"
   Delete "$INSTDIR\files\esf\configs\modules.ini"
-  Delete "$INSTDIR\files\esf\modules\esfmod_amxx_i386.so"
-  Delete "$INSTDIR\files\esf\modules\esfmod_amxx.dll"
-  Delete "$INSTDIR\files\esf\modules\esfmod_amxx_amd64.so"
+  Delete "$INSTDIR\files\esf\configs\plugins.ini"
+  Delete "$INSTDIR\files\esf\scripting\EvolutionX.Core.sma"
+  Delete "$INSTDIR\files\esf\plugins\EvolutionX.Core.amxx"
   Delete "$INSTDIR\files\ts\scripting\tsstats.sma"
   Delete "$INSTDIR\files\ts\scripting\stats_logging.sma"
   Delete "$INSTDIR\files\ts\scripting\statssounds.sma"
@@ -484,7 +498,6 @@ Section Uninstall
   Delete "$INSTDIR\files\ns\plugins\mapchooser.amxx"
   Delete "$INSTDIR\files\ns\plugins\idlekicker.amxx"
   Delete "$INSTDIR\files\ns\modules\ns_amxx_i386.so"
-  Delete "$INSTDIR\files\ns\modules\ns_amxx_amd64.so"
   Delete "$INSTDIR\files\ns\modules\ns_amxx.dll"
   Delete "$INSTDIR\files\ns\configs\users.ini"
   Delete "$INSTDIR\files\ns\configs\speech.ini"
@@ -709,20 +722,31 @@ Section Uninstall
   Delete "$INSTDIR\files\base\configs\cmds.ini"
   Delete "$INSTDIR\files\base\configs\clcmds.ini"
   Delete "$INSTDIR\files\base\configs\amxx.cfg"
-  Delete "$INSTDIR\AMXX Edit\AMXX_Edit_v2.exe"
-  Delete "$INSTDIR\AMXX Edit\Files.ini"
-  Delete "$INSTDIR\AMXX Edit\SciLexer.dll"
-  Delete "$INSTDIR\AMXX Edit\gpl.txt"
-  Delete "$INSTDIR\AMXX Edit\Config.ini"
-  Delete "$INSTDIR\Installer.exe"
+  Delete "$INSTDIR\files\amxxstudio\AMXX_Studio.cfg"
+  Delete "$INSTDIR\files\amxxstudio\AMXX_Studio.exe"
+  Delete "$INSTDIR\files\amxxstudio\SciLexer.dll"
+  Delete "$INSTDIR\files\amxxstudio\config\C++.csl"
+  Delete "$INSTDIR\files\amxxstudio\config\Cache.cfg"
+  Delete "$INSTDIR\files\amxxstudio\config\Editor.sci"
+  Delete "$INSTDIR\files\amxxstudio\config\Notes.dat"
+  Delete "$INSTDIR\files\amxxstudio\config\Other.csl"
+  Delete "$INSTDIR\files\amxxstudio\config\PAWN.csl"
+  Delete "$INSTDIR\files\amxxstudio\config\Plugins.cfg"
+  Delete "$INSTDIR\files\amxxstudio\config\Settings.ini"
+  Delete "$INSTDIR\files\amxxstudio\plugins\Functions and Events.txt"
+  Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.cfg"
+  Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dll"
+  Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dof"
+  Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.dpr"
+  Delete "$INSTDIR\files\amxxstudio\plugins\HelloWorld.res"
 
   Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
   Delete "$DESKTOP\AMX Mod X Editor.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\AMXx Editor.lnk"
+  Delete "$SMPROGRAMS\$ICONS_GROUP\AMXX Studio.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X Editor.lnk"
+  Delete "$SMPROGRAMS\$ICONS_GROUP\AMX Mod X Studio.lnk"
 
   RMDir "$SMPROGRAMS\$ICONS_GROUP"
   RMDir "$INSTDIR\files\esf\configs"
@@ -760,7 +784,9 @@ Section Uninstall
   RMDir "$INSTDIR\files\base\data\lang"
   RMDir "$INSTDIR\files\base\data"
   RMDir "$INSTDIR\files\base\configs"
-  RMDir "$INSTDIR\AMXX Edit"
+  RMDir "$INSTDIR\AMXX Studio\config"
+  RMDir "$INSTDIR\AMXX Studio\plugins"
+  RMDir "$INSTDIR\AMXX Studio"
   RMDir /r "$INSTDIR"
   RMDir ""