diff --git a/config/menus.cfg b/config/menus.cfg
index 94f53f24..e44aff27 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -88,7 +88,7 @@ newmenu credits
 menuitem "Project Leaders" ""
 menuitem "-----------------" ""
 menuitem "driAn				Lead coder." ""
-menuitem "makkE			Lead artist, models, skins, animations," ""
+menuitem "makkE				Lead artist, models, skins, animations," ""
 menuitem "				mapping, 2D-art, textures, sounds." ""
 menuitem "" ""
 menuitem "Active Developers/Contributors" ""
@@ -100,8 +100,8 @@ menuitem "" ""
 menuitem "Community Mappers" ""
 menuitem "-----------------------" ""
 menuitem "Shadow			Map: ac_elevation." ""
-menuitem "Wotwot			Map: ac_power, plus textures." ""
-menuitem "daMfr0			Map: ac_snow." ""
+menuitem "Wotwot				Map: ac_power, plus textures." ""
+menuitem "daMfr0				Map: ac_snow." ""
 menuitem "MitaMAN			Map: ac_depot, plus textures." ""
 menuitem "Nieb				Map: ac_desert2, plus mapmodels, 2D-art and hosting." ""
 menuitem "" ""
@@ -109,11 +109,11 @@ menuitem "Special thanks" ""
 menuitem "----------------" ""
 menuitem "Aardappel & others		The Cube Game/Engine." ""
 menuitem "Arghvark			Previous project leader, game concept, code." ""
-menuitem "Verbal_			Q&A, advisor, lead tester, pro-coffee service." ""
+menuitem "Verbal_				Q&A, advisor, lead tester, pro-coffee service." ""
 menuitem "Rick Helmus			Bot code." ""
-menuitem "absinth			Packaging AssaultCube for Mac." ""
+menuitem "absinth				Packaging AssaultCube for Mac." ""
 menuitem "dtd				Hosting." ""
-menuitem "ac_stef			Bug fixes." ""
+menuitem "ac_stef				Bug fixes." ""
 menuitem "" ""
 menuitem "						[ Page 2 ]"	[ showmenu "Credits (2)" ]
 
@@ -124,13 +124,13 @@ menuitem "------------" ""
 menuitem "JCDPC						Laptop mapmodel, textures." ""
 menuitem "DCP						End-of-match music." ""
 menuitem "Toca						Mapmodels." ""
-menuitem "Topher					Some crosshairs." ""
-menuitem "leileilol					Bullethole image." ""
+menuitem "Topher						Some crosshairs." ""
+menuitem "leileilol						Bullethole image." ""
 menuitem "Kurt Keslar					Dummy texture." ""
 menuitem "Steini						Skyboxes." ""
 menuitem "wildweasel					Vote sounds." ""
 menuitem "Tremulous team				Gib sound." ""
-menuitem "Lukas Zapletal & Ludek Horacek	Music (Ping pong)." ""
+menuitem "Lukas Zapletal & Ludek Horacek		Music (Ping pong)." ""
 menuitem "Antiklimax					Sniper scope." ""
 menuitem "" ""
 menuitem "Texture sources" ""
diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index 6716cf20..03011821 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -13,7 +13,7 @@ menuitem "Help..."                              [ showmenu "Map editing help" ]
 // Start of "editing help" menu.
 newmenu "Map editing help"
 
-menuitem "Toggle: Edit mode						(Key: E)"	[ edittoggle; echo "Pressing E would be quicker." ]
+menuitem "Toggle: Edit mode					(Key: E)"	[ edittoggle; echo "Pressing E would be quicker." ]
 menuitem "Undo last cube manipulation				(Key: U)"	[ undo; echo "Pressing U would be quicker." ]
 menuitem "Copy selected cubes					(Key: C)"	[ copy; echo "Pressing C would be quicker." ]
 menuitem "Paste selected cubes					(Key: V)"	[ paste; echo "Selection has been pasted from the upper corner of the red dot. Pressing V would be quicker." ]
@@ -22,7 +22,7 @@ menuitem "Delete closest light, mapmodel or other entity	(Key: Backspace)"	[ del
 menuitem "Fullbright view"							"fullbright 1" 
 menuitem "Recalculate light"							"recalc"  
 menuitem "Toggle: Show geometric mipmaps			(Key: F5)"	"showmip"
-menuitem "Toggle: Occlusion culling					(Key: F6)"	"toggleocull"
+menuitem "Toggle: Occlusion culling				(Key: F6)"	"toggleocull"
 menuitem """"
 menuitem "Show more..."								[ showmenu "Map editing help (Page 2)" ]
 
@@ -31,17 +31,17 @@ newmenu "Map editing help (Page 2)"
 
 menuitem "Browse through floor textures				(Keys: Insert/Delete)"			[ showmenu "Browse floor textures" ]
 menuitem "Browse through wall textures				(Keys: Home/End)"		[ showmenu "Browse wall textures" ]
-menuitem "Browse through ceiling textures				(Keys: Pageup/Pagedown)"	[ showmenu "Browse ceiling textures" ]
+menuitem "Browse through ceiling textures			(Keys: Pageup/Pagedown)"	[ showmenu "Browse ceiling textures" ]
 menuitem "Browse through upper wall textures			(Keys: Keypad7/Keypad4)"		[ showmenu "Browse upper wall textures" ]
-menuitem "Move floor geometery up					(Key: [ )"			[ editheight 0 -1; echo "Pressing the left-bracket would be quicker." ]
+menuitem "Move floor geometery up				(Key: [ )"			[ editheight 0 -1; echo "Pressing the left-bracket would be quicker." ]
 menuitem "Move floor geometery down				(Key: ] )"			[ editheight 0 1; echo "Pressing right-bracket would be quicker." ]
 menuitem "Move ceiling geometery up				(Key: O)"			[ editheight 2 -1; echo "Pressing O would be quicker." ]
 menuitem "Move ceiling geometery down				(Key: P)"				[ editheight 2 1; echo "Pressing P would be quicker." ]
 menuitem "Make selected geometery SOLID			(Key: F)"				[ solid 1; echo "Pressing F would be quicker." ]
 menuitem "Make selected geometery SPACE			(Key: G)"				[ solid 0; echo "Pressing G would be quicker." ]
 menuitem "Make selected geometery a corner			(Key: K)"			[ corner; echo "Pressing K would be quicker." ]
-menuitem "Equalize the floor level					(Key: ,)"		[ equalize 0; echo "Pressing , would be quicker." ]
-menuitem "Equalize the ceiling level					(Key: .)"			[ equalize 2; echo "Pressing . would be quicker." ]
+menuitem "Equalize the floor level				(Key: ,)"		[ equalize 0; echo "Pressing , would be quicker." ]
+menuitem "Equalize the ceiling level				(Key: .)"			[ equalize 2; echo "Pressing . would be quicker." ]
 menuitem "Make the floor a heightfield				(Key: H)"			[ heightfield 0; echo "Pressing H would be quicker." ]
 menuitem "Make the ceiling a heightfield				(Key: I)"		[ heightfield 2; echo "Pressing I would be quicker." ]
 menuitem "Manipulate the corners of a cube (upward)		(Key: 8)"				[ vdelta -1; echo "Pressing 8 would be quicker." ]
@@ -58,7 +58,7 @@ menuitem "Browse floor textures backwards	(Key: Delete)"		[ edittex 0 -1; echo "
 
 newmenu "Browse wall textures"
 
-menuitem "Browse wall textures forwards	(Key: Home)"	[ edittex 1 1; echo "Pressing 'Home' would be quicker." ]		
+menuitem "Browse wall textures forwards		(Key: Home)"	[ edittex 1 1; echo "Pressing 'Home' would be quicker." ]		
 menuitem "Browse wall textures backwards	(Key: End)"		[ edittex 1 -1; echo "Pressing 'End' would be quicker." ]
 
 
@@ -70,7 +70,7 @@ menuitem "Browse ceiling textures backwards	(Key: Pagedown)"		[ edittex 2 -1; ec
 
 newmenu "Browse upper wall textures"
 
-menuitem "Browse upper wall textures forwards	(Key: Keypad7)"		[ edittex 3 1; echo "Pressing '7' on the keypad would be quicker." ]
+menuitem "Browse upper wall textures forwards		(Key: Keypad7)"		[ edittex 3 1; echo "Pressing '7' on the keypad would be quicker." ]
 menuitem "Browse upper wall textures backwards	(Key: Keypad4)"		[ edittex 3 -1; echo "Pressing '4' on the keypad would be quicker." ]		
 
 
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index d4799133..e29bc78c 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -1,6 +1,6 @@
 newmenu setup
 
-menuitemtextinput "Nickname:		" "result $curname" "name $arg1"
+menuitemtextinput "Nickname:			" "result $curname" "name $arg1"
 menuitemslider "Team: " 0 1 "(curteam)" 1 "CLA RVSF" [team (at [CLA RVSF] $arg1)]
 menuitem "" ""
 menuitem "Select skin.."          [showmenu (at [CLA RVSF] (curteam))]
@@ -53,7 +53,7 @@ newmenu "quick setup"
 
 menuitemtextinput "Nickname:					" "" "name $arg1"
 menuitemtextinput "Resolution (Width):				" "$scr_w" "scr_w $arg1"
-menuitemtextinput "Resolution (Height):			" "$scr_h" "scr_h $arg1"
+menuitemtextinput "Resolution (Height):				" "$scr_h" "scr_h $arg1"
 menuitemslider "Mouse sensitivity: " 2 100 "($sensitivity)" 2 "" "sensitivity $arg1"
 menuitemslider "Graphics detail: " 1 4 "(getgfxq)" 1 "low medium good best" "new_gfx_quality $arg1"
 menuitemslider "Sound detail: " 1 3 "(getsoundq)" 1 "low medium high" "new_sound_quality $arg1"
@@ -163,10 +163,8 @@ alias new_sound_quality [
 ]
 
 
-newmenu "reset settings"
+newmenu "Are you sure you want to reset ALL settings?"
 
-menuitem "Reset all settings?"
-menuitem "" ""
 menuitem "Yes, reset and quit now!" "resetcfg 1; quit"
 menuitem "No"
 
@@ -202,8 +200,8 @@ menuitemslider "Mouse sensitivity: " 2 100 "($sensitivity)" 2 "" "sensitivity $a
 newmenu video
 
 
-menuitemtextinput "Screen width:				" "$scr_w" "scr_w $arg1"
-menuitemtextinput "Screen height:				" "$scr_h" "scr_h $arg1"
+menuitemtextinput "Screen width:					" "$scr_w" "scr_w $arg1"
+menuitemtextinput "Screen height:					" "$scr_h" "scr_h $arg1"
 
 menuitemcheckbox "Fullscreen: " "$fullscreen" "fullscreen $arg1"