diff --git a/configs/clcmds.ini b/configs/clcmds.ini
index 8ef27c75..836a01c2 100755
--- a/configs/clcmds.ini
+++ b/configs/clcmds.ini
@@ -1,4 +1,4 @@
-; Client commands configuration file
+; Menu configuration file
 ; File location: $moddir/addons/amx/clcmds.ini
 ; To use with Players Menu plugin
 
@@ -12,7 +12,7 @@
 ; "c" - execute on selected player
 ; "d" - back to menu when executed
 
-"Kick player" 		"amx_kick  #%userid%" 	"b" 	"u"
-"Slay player" 		"amx_slay  #%userid%" 	"bd" 	"u"
-"Slap with 1 dmg." 	"amx_slap  #%userid% 1" "b" 	"u"
-"Ban on 5 minutes" 	"amx_banip 5 #%userid%" 	"b" 	"u"
\ No newline at end of file
+"Kick player" 		"amx_kick #%userid%"		"b"	"u"
+"Slay player" 		"amx_slay #%userid%"		"bd"	"u"
+"Slap with 1 dmg." 	"amx_slap #%userid% 1"		"b"	"u"
+"Ban for 5 minutes" 	"amx_banid #%userid% 5"		"b"	"u"
diff --git a/configs/cmds.ini b/configs/cmds.ini
index 39f9deb1..5f8aa56d 100755
--- a/configs/cmds.ini
+++ b/configs/cmds.ini
@@ -12,6 +12,6 @@
 ; "c" - execute on all clients
 ; "d" - back to menu when executed
 
-"Pause" "amx_pause" "ad" "u"
-" " "-" "" "u"
-"Restart Round" "sv_restartround 1" "a" "u"
+"Pause"		"amx_pause"		"ad"	"u"
+" "		"-"			""	"u"
+"Restart Round"	"sv_restartround 1"	"a"	"u"
diff --git a/configs/configs.ini b/configs/configs.ini
index 83959498..49348599 100755
--- a/configs/configs.ini
+++ b/configs/configs.ini
@@ -12,11 +12,11 @@
 ; "c" - execute on all clients
 ; "d" - back to menu when executed
 
-"PUBLIC Settings" "servercfgfile server.cfg;exec server.cfg" "a" "u"
-"Clanbase" "exec clanbase.cfg;servercfgfile \'\'" "a" "u"
-"Clanbase Charges Only" "exec clanbase_co.cfg;servercfgfile \'\'" "a" "u"
-"Official CAL Match" "exec cal.cfg;servercfgfile \'\'" "a" "u"
-"ProvingGrounds Server Config" "exec leagues/pg.cfg;servercfgfile \'\'" "a" "u"
-"OGL CS Server Config" "exec ogl.cfg;servercfgfile \'\'" "a" "u"
-"OGL CS FF Server Config" "exec ogl_ff.cfg;servercfgfile \'\'" "a" "u"
-"OGL CS Advanced Server Config" "exec ogl_adv.cfg;servercfgfile \'\'" "a" "u"
+"PUBLIC Settings"			"servercfgfile server.cfg;exec server.cfg"	"a"	"u"
+;"Clanbase"				"exec clanbase.cfg;servercfgfile \'\'"		"a"	"u"
+;"Clanbase Charges Only"		"exec clanbase_co.cfg;servercfgfile \'\'"	"a"	"u"
+;"Official CAL Match"			"exec cal.cfg;servercfgfile \'\'"		"a"	"u"
+;"ProvingGrounds Server Config"		"exec leagues/pg.cfg;servercfgfile \'\'"	"a"	"u"
+;"OGL CS Server Config"			"exec ogl.cfg;servercfgfile \'\'"		"a"	"u"
+;"OGL CS FF Server Config"		"exec ogl_ff.cfg;servercfgfile \'\'"		"a"	"u"
+;"OGL CS Advanced Server Config"	"exec ogl_adv.cfg;servercfgfile \'\'"		"a"	"u"
diff --git a/configs/conmotd.txt b/configs/conmotd.txt
index 7f2b61bd..361e01c5 100755
--- a/configs/conmotd.txt
+++ b/configs/conmotd.txt
@@ -1 +1 @@
-For newest AMX Mod and many plugins visit http://amxmod.net
+For newest AMX Mod X and many plugins visit http://www.amxmod.info/
\ No newline at end of file
diff --git a/configs/core.ini b/configs/core.ini
index 88d32b97..2c78c61e 100755
--- a/configs/core.ini
+++ b/configs/core.ini
@@ -1,4 +1,4 @@
-; Configuration file for AMX
+; Configuration file for AMX Mod X
 amx_logdir	addons/amx/logs
 amx_modules	addons/amx/modules.ini
 amx_plugins	addons/amx/plugins/plugins.ini
diff --git a/configs/cvars.ini b/configs/cvars.ini
index 102a09df..bf7ebb3a 100755
--- a/configs/cvars.ini
+++ b/configs/cvars.ini
@@ -5,19 +5,19 @@
 ; Cvars Menu:
 ; < cvar > < values > ... < access level >
 
-"mp_timelimit" "0" "30" "45" "u"
-"mp_friendlyfire" "0" "1" "u"
-"mp_autoteambalance" "0" "1" "2" "u"
-"sv_password" "" roxor "clanwar" "u"
-"mp_limitteams" "0" "1" "2" "u"
-"mp_freezetime" 0 "6" "u"
-"mp_buytime" "1" "0.5" "u"
-"mp_startmoney" "800" "1800" "3600" "u"
-"mp_c4timer" "35" "45" "15" "u"
-"mp_forcechasecam" "0" "1" "2" "u"
-"pausable" 0 1 "u"
-"sv_minrate" "2000" "3000" "u"
-"sv_maxrate" "7000" "6500" "u"
-"allow_spectators" "0" "1" "u"
-"sv_voiceenable" "0" "1" "u"
-"mp_logmessages" "0" "1" "u"
\ No newline at end of file
+"mp_timelimit"		"0" "30" "45"		"u"
+"mp_friendlyfire"	"0" "1"			"u"
+"mp_autoteambalance"	"0" "1" "2"		"u"
+"sv_password"		"" "mypw" "clanwar"	"u"
+"mp_limitteams"		"0" "1" "2"		"u"
+"mp_freezetime"		"0" "6"			"u"
+"mp_buytime"		"1" "0.5"		"u"
+"mp_startmoney"		"800" "1800" "3600"	"u"
+"mp_c4timer"		"35" "45" "15"		"u"
+"mp_forcechasecam"	"0" "1" "2"		"u"
+"pausable"		"0" "1"			"u"
+"sv_minrate"		"2000" "3000"		"u"
+"sv_maxrate"		"7000" "6500"		"u"
+"allow_spectators"	"0" "1"			"u"
+"sv_voiceenable"	"0" "1"			"u"
+"mp_logmessages"	"0" "1"			"u"
diff --git a/configs/modules.ini b/configs/modules.ini
index 549f6dea..2113963b 100755
--- a/configs/modules.ini
+++ b/configs/modules.ini
@@ -1,14 +1,14 @@
-; AMX Modules
+; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
 
 ; CS Stats
-addons/amx/dlls/csstats_mm.dll
-addons/amx/dlls/csstats_mm_i386.so
+addons/amx/dlls/csstats.dll
+addons/amx/dlls/csstats_i386.so
 
-; More functions for modifications in HL
-addons/amx/dlls/fun_mm.dll
-addons/amx/dlls/fun_mm_i386.so
+; Fun
+addons/amx/dlls/fun.dll
+addons/amx/dlls/fun_i386.so
 
-; MySQL access
+; MySQL
 ;addons/amx/dlls/mysql.dll
 ;addons/amx/dlls/mysql_i386.so
diff --git a/configs/mysql.cfg b/configs/mysql.cfg
index f3267376..2d383d0c 100755
--- a/configs/mysql.cfg
+++ b/configs/mysql.cfg
@@ -1,10 +1,9 @@
 // MySQL access configuration file
-// File location: $moddir/addons/amx
+// File location: $moddir/addons/amx/mysql.cfg
 
 // *NOTE* Linux users may encounter problems if they specify "localhost" instead of "127.0.0.1"
 // We recommend using your server IP address instead of its name
-
-amx_mysql_host  "127.0.0.1"
-amx_mysql_user  "root"
-amx_mysql_pass  ""
-amx_mysql_db    "amx"
+amx_mysql_host	"127.0.0.1"
+amx_mysql_user	"root"
+amx_mysql_pass	""
+amx_mysql_db	"amx"
\ No newline at end of file
diff --git a/configs/plugins.ini b/configs/plugins.ini
index 27f550b9..2aacea2a 100755
--- a/configs/plugins.ini
+++ b/configs/plugins.ini
@@ -1,4 +1,4 @@
-; AMX Mod plugins
+; AMX Mod X plugins
 
 admin.amx		; admin base (required for any admin-related)
 ;admin_mysql.amx	; admin base - MySQL version (comment admin.amx)
@@ -9,6 +9,7 @@ menufront.amx		; front-end for admin menus
 cmdmenu.amx		; command menu (speech, settings)
 plmenu.amx		; players menu (kick, ban, client cmds.)
 restmenu.amx		; restrict weapons menu
+;telemenu.amx		; teleport menu (Fun Module required!)
 mapsmenu.amx		; maps menu (vote, changelevel)
 antiflood.amx		; prevent clients from chat-flooding the server
 adminchat.amx		; console chat commands
@@ -19,7 +20,6 @@ mapchooser.amx		; allows to vote for next map
 scrollmsg.amx		; displays a scrolling message
 imessage.amx		; displays information messages
 pausecfg.amx		; allows to pause and unpause some plugins
-;telemenu.amx		; teleport menu (Fun Module required!)
 stats.amx		; stats on death or round end (CSStats Module required!)
 stats_logging.amx	; weapons stats logging (CSStats Module required!)
 miscstats.amx		; bunch of events announcement for Counter-Strike
diff --git a/configs/speech.ini b/configs/speech.ini
index 7ad8a6fb..97c02202 100755
--- a/configs/speech.ini
+++ b/configs/speech.ini
@@ -12,24 +12,24 @@
 ; "c" - execute on all clients
 ; "d" - back to menu when executed
 
-"Hello!" "spk \'vox/hello\'" "cd" "u"
-"Don't think so" "spk \'barney/dontguess\'" "cd" "u"
-"Don't ask me" "spk \'barney/dontaskme\'" "cd" "u"
-"Hey! Stop that!" "spk \'barney/donthurtem\'" "cd" "u"
-"Yup" "spk \'barney/yup\'" "cd" "u"
-"Nope" "spk \'barney/nope\'" "cd" "u"
-"Maybe" "spk \'barney/maybe\'" "cd" "u"
-"Seeya" "spk \'barney/seeya\'" "cd" "u"
-"Man that sounded bad" "spk \'barney/soundsbad\'" "cd" "u"
-"Hello and die" "spk \'vox/hello and die\'" "cd" "u"
-"Move!" "spk \'hgrunt/move! _comma yessir!\'" "cd" "u"
-"You will definitely pay!" "spk \'hgrunt/c2a2_hg_chat5a\'" "cd" "u"
-"Laughter" "spk \'hgrunt/c2a3_hg_laugh\'" "cd" "u"
-"Silence!" "spk \'hgrunt/silence!\'" "cd" "u"
-"You talk too much" "spk \'barney/youtalkmuch\'" "cd" "u"
-"You thinkin?" "spk \'barney/thinking\'" "cd" "u"
-"Open fire Gordon!" "spk \'barney/openfire\'" "cd" "u"
-"Couldnt make a bigger mess" "spk \'barney/bigmess\'" "cd" "u"
-"I have a Bad feeling" "spk \'barney/badfeeling\'" "cd" "u"
-"Yes sir!" "spk \'hgrunt/yessir!\'" "cd" "u"
-"No sir" "spk \'barney/nosir\'" "cd" "u"
\ No newline at end of file
+"Hello!"			"spk \'vox/hello\'"			"cd"	"u"
+"Don't think so"		"spk \'barney/dontguess\'"		"cd"	"u"
+"Don't ask me"			"spk \'barney/dontaskme\'"		"cd"	"u"
+"Hey! Stop that!"		"spk \'barney/donthurtem\'"		"cd"	"u"
+"Yup"				"spk \'barney/yup\'"			"cd"	"u"
+"Nope"				"spk \'barney/nope\'"			"cd"	"u"
+"Maybe"				"spk \'barney/maybe\'"			"cd"	"u"
+"Seeya"				"spk \'barney/seeya\'"			"cd"	"u"
+"Man that sounded bad"		"spk \'barney/soundsbad\'"		"cd"	"u"
+"Hello and die"			"spk \'vox/hello and die\'"		"cd"	"u"
+"Move!"				"spk \'hgrunt/move! _comma yessir!\'"	"cd"	"u"
+"You will definitely pay!"	"spk \'hgrunt/c2a2_hg_chat5a\'"		"cd"	"u"
+"Laughter"			"spk \'hgrunt/c2a3_hg_laugh\'"		"cd"	"u"
+"Silence!"			"spk \'hgrunt/silence!\'"		"cd"	"u"
+"You talk too much"		"spk \'barney/youtalkmuch\'"		"cd"	"u"
+"You thinkin?"			"spk \'barney/thinking\'"		"cd"	"u"
+"Open fire Gordon!"		"spk \'barney/openfire\'"		"cd"	"u"
+"Couldnt make a bigger mess"	"spk \'barney/bigmess\'"		"cd"	"u"
+"I have a Bad feeling"		"spk \'barney/badfeeling\'"		"cd"	"u"
+"Yes sir!"			"spk \'hgrunt/yessir!\'"		"cd"	"u"
+"No sir"			"spk \'barney/nosir\'"			"cd"	"u"
diff --git a/configs/users.ini b/configs/users.ini
index 00eccaec..8dc29224 100755
--- a/configs/users.ini
+++ b/configs/users.ini
@@ -1,3 +1,6 @@
+; Users configuration file
+; File location: $moddir/addons/amx/users.ini
+
 ; Line starting with ; is a comment
 
 ; Access flags:
@@ -22,7 +25,7 @@
 ; s - custom level G
 ; t - custom level H
 ; u - menu access
-; z - user
+; z - user (no admin)
 
 ; Account flags:
 ; a - disconnect player on invalid password