diff --git a/config/menus.cfg b/config/menus.cfg
index c0811610..b2f58e9d 100644
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -4,14 +4,14 @@ persistidents 0
 
 newmenu main
 
-menuitem (_ Multiplayer)  [ showmenu multiplayer ]
-menuitem (_ Singleplayer) [ showmenu singleplayer ]
-menuitem (_ Settings)     [ showmenu settings ]
-menuitem (_ Demo)         [ showmenu [Play demo] ]
-menuitem (_ Editing)      [ showmenu editing ]
-menuitem (_ Help)         [ showmenu help ]
-menuitem (_ About)        [ showmenu about ]
-menuitem (_ Quit)         savequit
+menuitem Multiplayer  [ showmenu multiplayer ]
+menuitem Singleplayer [ showmenu singleplayer ]
+menuitem Settings     [ showmenu settings ]
+menuitem Demo         [ showmenu [Play demo] ]
+menuitem Editing      [ showmenu editing ]
+menuitem Help         [ showmenu help ]
+menuitem About        [ showmenu about ]
+menuitem Quit         savequit
 
 // Start maps.
 genmapitems = [
@@ -32,7 +32,7 @@ newmenu maps
 const defaultmaps [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk]
 genmapitems	$defaultmaps
 menuitem	[] -1
-menuitem	(_ [Show all maps...]) [ showmenu [all maps] ]
+menuitem	[Show all maps...] [ showmenu [all maps] ]
 
 newmenu [all maps]
 menudirlist "packages/maps" cgz [map $arg1]
@@ -42,58 +42,58 @@ newmenu maps_flags
 const ctfmaps [ac_aqueous ac_arabian ac_arid ac_avenue ac_cavern ac_depot ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
 genmapitems $ctfmaps
 menuitem [] -1
-menuitem (_ [Show all maps..]) [showmenu [all maps]]
+menuitem [Show all maps..] [showmenu [all maps]]
 
 newmenu [Play demo]
-menuinit [ echo (_ [To stop demo playback, type:]) (red)/stopdemo ]
+menuinit [ echo [To stop demo playback, type:] (red)/stopdemo ]
 menudirlist demos dmo "demo $arg1"
 
 // in-game menu that opens when pressing escape while watching a demo.
 newmenu [Watching demo]
-menuitem (_ [Stop watching demo]) stopdemo
-menuitem (_ [Restart demo]) [ demo $curdemofile ]
-menuitem (_ [Watch other demo]) [ stopdemo; closecurmenu; showmenu [Play demo] ]
-menuitemtextinput (_ [Custom description: ]) [ getalias (concatword "demodesc_" $curdemofile) ] [ alias (concatword "demodesc_" $curdemofile) $arg1 ] [] 50
-menuitem [] -1
-menuitem (concatword (c 4) (_ [Main menu...])) [ closecurmenu; showmenu main ]
-menuitem (concatword (c 3) (_ [Quit AssaultCube])) savequit
+menuitem "Stop watching demo" stopdemo
+menuitem "Restart demo" [ demo $curdemofile ]
+menuitem "Watch other demo" [ stopdemo; closecurmenu; showmenu [Play demo] ]
+menuitemtextinput "Custom description: " [ getalias (concatword "demodesc_" $curdemofile) ] [ alias (concatword "demodesc_" $curdemofile) $arg1 ] [] 50
+menuitem "" -1
+menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
+menuitem "\f3Quit AssaultCube" savequit
 
 newmenu about
 
 menuitem "AssaultCube Version 1.2" -1
-menuitem [] -1
-menuitem (_ "AssaultCube is developed by various people around the") -1
-menuitem (_ "world. People that enjoy making this game together.") -1
-menuitem [] -1
-menuitem (_ "Thank you to everyone participating to help us make") -1
-menuitem (_ "AssaultCube what it is today. To learn about the team") -1
-menuitem (_ "(Rabid Viper Productions) behind the game, read here:") -1
-menuitem (concatword (c 1) "  http://assault.cubers.net/docs/team.html") -1
-menuitem [] -1
-menuitem (_ "AssaultCube is a total-conversion of the CUBE engine") -1
-menuitem (_ "by Wouter 'Aardappel' van Oortmerssen, and others:") -1
-menuitem "	1http://www.cubeengine.com/" -1
+menuitem "" -1
+menuitem "AssaultCube is developed by various people around the" -1
+menuitem "world. People that enjoy making this game together." -1
+menuitem "" -1
+menuitem "Thank you to everyone participating to help us make" -1
+menuitem "AssaultCube what it is today. To learn about the team" -1
+menuitem "(Rabid Viper Productions) behind the game, read here:" -1
+menuitem "\f1  http://assault.cubers.net/docs/team.html" -1
+menuitem "" -1
+menuitem "AssaultCube is a total-conversion of the CUBE engine" -1
+menuitem "by Wouter 'Aardappel' van Oortmerssen, and others:" -1
+menuitem "	\f1http://www.cubeengine.com/" -1
 
 newmenu help
 
-menuitem (_ [AssaultCube reference]) [ showmenu reference ]
-menuitem (_ [Search the reference])  [ showmenu [Reference search] ]
-// menuitem (_ [Keyboard controls])     [ showmenu controls ] // This was never implemented or something? - Bukz
-menuitem (_ [View the FAQ])          [ load_faq ; showmenu faq ]
-menuitem [] -1
-menuitem (_ [...for further information/help see the README]) [ echo (yellow) (_ [The readme can be found in the base AssaultCube directory.]) ]
+menuitem "AssaultCube reference" [ showmenu reference ]
+menuitem "Search the reference"  [ showmenu [Reference search] ]
+// menuitem "Keyboard controls"     [ showmenu controls ] // This was never implemented or something? - Bukz
+menuitem "View the FAQ"          [ load_faq ; showmenu faq ]
+menuitem "" -1
+menuitem "...for further information/help see the README" [ echo "\f2The readme can be found in the base AssaultCube directory."]
 
 newmenu [Reference search]
 menuinit [ docsearchstring = [] ]
-menuitemtextinput (_ [Search reference for: ]) [] [ docsearchstring = $arg1 ]
-menuitem (concatword (c 2) [		  ] "[ Search ]" [			]) [ docfind $docsearchstring ]
+menuitemtextinput "Search reference for: " [] [ docsearchstring = $arg1 ]
+menuitem "\f2\t  \t [ Search ]\t\t\t" [ docfind $docsearchstring ]
 
 // Show quit dialog if enabled
 newmenu quit
-menuitem (_ [Yes, quit now]) quit
-menuitem (_ [No]) [ showmenu [] ]
-menuitem [] -1
-menuitemcheckbox (_ [Don't ask next time: ]) [(= $askquit 0)] [askquit = (= $arg1 0)]
+menuitem "Yes, quit now" quit
+menuitem "No" [ showmenu [] ]
+menuitem "" -1
+menuitemcheckbox "Don't ask next time: " [(= $askquit 0)] [askquit = (= $arg1 0)]
 
 const savequit [ if $askquit [ showmenu quit ] quit ]
 
diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg
index e06ef0ec..c707892b 100644
--- a/config/menus_bot.cfg
+++ b/config/menus_bot.cfg
@@ -74,27 +74,27 @@ const emptymap [
 newmenu singleplayer
 
 // teamplay not mature yet
-menuitem (_ [Bot Team Deathmatch])         [ tmp_mode = 7; tmp_isbotteammode = 1; showmenu botskill ]
-menuitem (_ [Bot Deathmatch])              [ tmp_mode = 8; tmp_isbotteammode = 0; showmenu botskill ]
-menuitem (_ [Bot One Shot, One Kill])      [ tmp_mode = 12; tmp_isbotteammode = 0; showmenu botskill ]
-menuitem (_ [Bot Pistol Frenzy])           [ tmp_mode = 18; tmp_isbotteammode = 0; showmenu botskill ]
-menuitem (_ [Bot Last Swiss Standing])     [ tmp_mode = 19; tmp_isbotteammode = 0; showmenu botskill ]
-menuitem (_ [Bot Team Survivor])           [ tmp_mode = 20; tmp_isbotteammode = 1; showmenu botskill ]
-menuitem (_ [Bot Team One Shot, One Kill]) [ tmp_mode = 21; tmp_isbotteammode = 1; showmenu botskill ]
-menuitem (_ [Bot Survival])                [ load_survival ; showmenu [Survival Mode] ]
-menuitem [] -1
-menuitem (_ [Bot settings...]) [ showmenu [Bot settings] ]
-menuitem (_ [Empty Map]) emptymap
+menuitem "Bot Team Deathmatch"         [ tmp_mode = 7; tmp_isbotteammode = 1; showmenu botskill ]
+menuitem "Bot Deathmatch"              [ tmp_mode = 8; tmp_isbotteammode = 0; showmenu botskill ]
+menuitem "Bot One Shot, One Kill"      [ tmp_mode = 12; tmp_isbotteammode = 0; showmenu botskill ]
+menuitem "Bot Pistol Frenzy"           [ tmp_mode = 18; tmp_isbotteammode = 0; showmenu botskill ]
+menuitem "Bot Last Swiss Standing"     [ tmp_mode = 19; tmp_isbotteammode = 0; showmenu botskill ]
+menuitem "Bot Team Survivor"           [ tmp_mode = 20; tmp_isbotteammode = 1; showmenu botskill ]
+menuitem "Bot Team One Shot, One Kill" [ tmp_mode = 21; tmp_isbotteammode = 1; showmenu botskill ]
+menuitem "Bot Survival"                [ load_survival ; showmenu [Survival Mode] ]
+menuitem "" -1
+menuitem "Bot settings..." [ showmenu [Bot settings] ]
+menuitem "Empty Map" emptymap
 
 const showmenu_enemies [ if ($tmp_isbotteammode) [ showmenu [team enemies] ] [ showmenu enemies ] ]
 
 newmenu botskill
 
-menuitem (_ Best)           [ tmp_botskill = best; showmenu_enemies ]
-menuitem (_ "Good (default)") [ tmp_botskill = good; showmenu_enemies ]
-menuitem (_ Medium)         [ tmp_botskill = medium; showmenu_enemies ]
-menuitem (_ Worse)          [ tmp_botskill = worse; showmenu_enemies ]
-menuitem (_ Bad)            [ tmp_botskill = bad; showmenu_enemies ]
+menuitem Best             [ tmp_botskill = best; showmenu_enemies ]
+menuitem "Good (default)" [ tmp_botskill = good; showmenu_enemies ]
+menuitem Medium           [ tmp_botskill = medium; showmenu_enemies ]
+menuitem Worse            [ tmp_botskill = worse; showmenu_enemies ]
+menuitem Bad              [ tmp_botskill = bad; showmenu_enemies ]
 
 const genenemyitems [
   loop i (listlen $arg1) [
@@ -117,51 +117,51 @@ newmenu [team enemies]
 genenemyitems [4 8 12 16 24 32] 1
 
 newmenu [Bot settings]
-menuitemslider (_ [Bot match length in minutes: ]) 1 60 "$menuBotGameLength" 1 [] [ menuBotGameLength = $arg1 ]
-menuitemcheckbox (_ [Idle bots?]) "(idlebots 2)" [ idlebots $arg1 ]
-menuitemcheckbox (_ [Bots attack?]) "(botsshoot 2)" [ botsshoot $arg1 ]
+menuitemslider "Bot match length in minutes: " 1 60 "$menuBotGameLength" 1 [] [ menuBotGameLength = $arg1 ]
+menuitemcheckbox "Idle bots?" "(idlebots 2)" [ idlebots $arg1 ]
+menuitemcheckbox "Bots attack?" "(botsshoot 2)" [ botsshoot $arg1 ]
 
 newmenu [Creating bot waypoints]
 
-menuitem (_ [Waypoints...])             [ showmenu Waypoints ]
-menuitem (_ [Paths...])                 [ showmenu Paths ]
-menuitem (_ [Other operations...])      [ showmenu [Other bot operations] ]
-menuitem [] -1
-menuitem (_ [Flood map with waypoints]) wpflood
-menuitem (_ [Save bot waypoints])       wpsave
+menuitem "Waypoints..."             [ showmenu Waypoints ]
+menuitem "Paths..."                 [ showmenu Paths ]
+menuitem "Other operations..."      [ showmenu [Other bot operations] ]
+menuitem "" -1
+menuitem "Flood map with waypoints" wpflood
+menuitem "Save bot waypoints"       wpsave
 
 newmenu Waypoints
 
-menuitem (_ [Add a waypoint])               [ addwp 0 ]
-menuitem (_ [Add auto-connecting waypoint]) [ addwp 1 ]
-menuitem [] -1
-menuitem (_ [Delete nearest waypoint])      delwp
-menuitem (_ [Delete all waypoints])         [ showmenu [Delete all waypoints] ]
+menuitem "Add a waypoint"               [ addwp 0 ]
+menuitem "Add auto-connecting waypoint" [ addwp 1 ]
+menuitem "" -1
+menuitem "Delete nearest waypoint"      delwp
+menuitem "Delete all waypoints"         [ showmenu [Delete all waypoints] ]
 
 newmenu Paths
 
-menuitem (_ [Create Start of 2-way path]) addpath2way1
-menuitem (_ [Create End of 2-way path])   addpath2way2
-menuitem (_ [Delete Start of 2-way path]) delpath2way1
-menuitem (_ [Delete End of 2-way path])   delpath2way2
-menuitem [] -1
-menuitem (_ [Create Start of 1-way path]) addpath1way1
-menuitem (_ [Create End of 1-way path])   addpath1way2
-menuitem (_ [Delete Start of 1-way path]) delpath1way1
-menuitem (_ [Delete End of 1-way path])   delpath1way2
+menuitem "Create Start of 2-way path" addpath2way1
+menuitem "Create End of 2-way path"   addpath2way2
+menuitem "Delete Start of 2-way path" delpath2way1
+menuitem "Delete End of 2-way path"   delpath2way2
+menuitem "" -1
+menuitem "Create Start of 1-way path" addpath1way1
+menuitem "Create End of 1-way path"   addpath1way2
+menuitem "Delete Start of 1-way path" delpath1way1
+menuitem "Delete End of 1-way path"   delpath1way2
 
 newmenu [Other bot operations]
 
-menuitem (_ [Set waypoint as jumpable])     setjumpwp
-menuitem (_ [Unset waypoint as jumpable])   unsetjumpwp
-menuitem (_ "Set waypoint direction (yaw)") setwpyaw
-menuitem [] -1
-menuitemslider (_ [Waypoint visibility: ]) 0 1 [ ] 1 ["Hide waypoints" "Show waypoints"] [ wpvisible $arg1 ]
-menuitemslider (_ [Select/place waypoints by: ]) 0 1 "($xhairwpsel)" 1 ["Your current location" "Clicking a point on the grid"] [ xhairwpsel $arg1 ]
+menuitem "Set waypoint as jumpable"     setjumpwp
+menuitem "Unset waypoint as jumpable"   unsetjumpwp
+menuitem "Set waypoint direction (yaw)" setwpyaw
+menuitem "" -1
+menuitemslider "Waypoint visibility: " 0 1 [ ] 1 ["Hide waypoints" "Show waypoints"] [ wpvisible $arg1 ]
+menuitemslider "Select/place waypoints by: " 0 1 "($xhairwpsel)" 1 ["Your current location" "Clicking a point on the grid"] [ xhairwpsel $arg1 ]
 
 newmenu [Delete all waypoints]
 menuinit [ delallwps = 0 ] // Ensures this menu works correctly.
-menuitemcheckbox (_ [Yes, delete all waypoints: ]) [delallwps = 1] [delallwps = $arg1]
-menuitem (concatword (c 2) [   	   ] (_ Apply!)) [ if $delallwps wpclear [ showmenu [] ] ]
+menuitemcheckbox "Yes, delete all waypoints: " [delallwps = 1] [delallwps = $arg1]
+menuitem "\f2\t\t     Apply!" [ if $delallwps wpclear [ showmenu [] ] ]
 
 persistidents 1
diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index b2bdc673..3796a75c 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -2,113 +2,113 @@ persistidents 0
 
 newmenu editing
 
-menuitem (_ [Mapmodels...])         [ showmenu Mapmodels ]
-menuitem (_ [Lighting...])          [ showmenu Lighting ]
-menuitem (_ [Entities...])          [ showmenu Entities ]
-menuitem (_ [Pickups...])           [ showmenu Pickups ]
-menuitem (_ [Textures...])          [ showmenu textures ]
-menuitem (_ [Skymaps...])           [ showmenu skymaps ]
-menuitem (_ [Ambient sounds...])    [ showmenu [Ambient sounds] ]
-menuitem (_ [Arches and slopes...]) [ showmenu Arches ]
-menuitem (_ [Map operations...])    [ showmenu [Map operations] ]
-menuitem [Map config operations...] [ showmenu [Map config operations] ]
-menuitem (_ [Bots...])              [ showmenu [Creating bot waypoints] ]
-menuitem (_ [Settings...])          [ showmenu [Editing settings] ]
-menuitem [Deleted entities]         [ showmenu "deleted entities" ]
+menuitem "Mapmodels..."             [ showmenu Mapmodels ]
+menuitem "Lighting..."              [ showmenu Lighting ]
+menuitem "Entities..."              [ showmenu Entities ]
+menuitem "Pickups..."               [ showmenu Pickups ]
+menuitem "Textures..."              [ showmenu textures ]
+menuitem "Skymaps..."               [ showmenu skymaps ]
+menuitem "Ambient sounds..."        [ showmenu [Ambient sounds] ]
+menuitem "Arches and slopes..."     [ showmenu Arches ]
+menuitem "Map operations..."        [ showmenu [Map operations] ]
+menuitem "Map config operations..." [ showmenu [Map config operations] ]
+menuitem "Bots..."                  [ showmenu [Creating bot waypoints] ]
+menuitem "Settings..."              [ showmenu [Editing settings] ]
+menuitem "Deleted entities"         [ showmenu "deleted entities" ]
 
-menuitem (_ Help?) [ echo (yellow) (_ [Please read the AssaultCube README which has a detailed guide on mapediting...]) ]
+menuitem "Help?" [ echo "\f2Please read the AssaultCube README which has a detailed guide on mapediting..." ]
 
 tempalias tmp_cradius 12
 
 //Lighting menu.
 newmenu Lighting
 
-menuitem (_ [Add white lights ])   [ showmenu [White light] ]
-menuitem (_ [Add coloured lights ]) [ showmenu [Coloured light] ]
-menuitem [] -1
-menuitemcheckbox (_ [Enable fullbright: ]) "$fullbright" [ fullbright $arg1 ]
-menuitem [] -1
-menuitem (_ [Random coloured light: ]) -1
-menuitemtextinput (_ [Radius: ]) [ result $tmp_cradius ] [ if (&& (! (> $arg1 32)) (! (< $arg1 1))) [ tmp_cradius = $arg1 ] [ echo (red)Error: (yellow) $arg1 (white)is not a valid radius for a light entity. ] ]
-menuitem (_ [Place random light...]) [ gencl $tmp_cradius ]
-menuitem (_ [Update random light...]) gencl
+menuitem "Add white lights "    [ showmenu [White light] ]
+menuitem "Add coloured lights " [ showmenu [Coloured light] ]
+menuitem "" -1
+menuitemcheckbox "Enable fullbright: " "$fullbright" [ fullbright $arg1 ]
+menuitem "" -1
+menuitem "Random coloured light: " -1
+menuitemtextinput "Radius: " [ result $tmp_cradius ] [ if (&& (! (> $arg1 32)) (! (< $arg1 1))) [ tmp_cradius = $arg1 ] [ echo "\f3Error: \f2" $arg1 "\f5is not a valid radius for a light entity." ] ]
+menuitem "Place random light..." [ gencl $tmp_cradius ]
+menuitem "Update random light..." gencl
 
 wlight = 1; wlight1 = 1
 
 newmenu [White light]
 
-menuitemslider (_ [Light radius: ]) 1 32 "$wlight" 1 [] [ wlight = $arg1 ]
-menuitemslider (_ [Brightness: ]) 1 255 "$wlight1" 5 [] [ wlight1 = $arg1 ]
-menuitem [] -1
-menuitem (concatword (c 2) [		    ] "[ OK ]" [		]) [ newent light $wlight $wlight1 ]
+menuitemslider "Light radius: " 1 32 "$wlight" 1 [] [ wlight = $arg1 ]
+menuitemslider "Brightness: " 1 255 "$wlight1" 5 [] [ wlight1 = $arg1 ]
+menuitem "" -1
+menuitem "\f2\t    [ OK ]\t\t" [ newent light $wlight $wlight1 ]
 
 clight = 1; clight1 = 1; clight2 = 1; clight3 = 1
 
 newmenu [Coloured light]
 
-menuitemslider (_ [Light radius: ]) 1 32 "$clight" 1 []  [ clight = $arg1 ]
-menuitem [] -1
-menuitemslider (_ [Red light: ]) 1 255 "$clight1" 5 []   [ clight1 = $arg1 ]
-menuitemslider (_ [Green light: ]) 1 255 "$clight2" 5 [] [ clight2 = $arg1 ]
-menuitemslider (_ [Blue light: ]) 1 255 "$clight3" 5 []  [ clight3 = $arg1 ]
-menuitem [] -1
-menuitem (concatword (c 2) [		    ] "[ OK ]") [ newent light $clight $clight1 $clight2 $clight3 ]
+menuitemslider "Light radius: " 1 32 "$clight" 1 []  [ clight = $arg1 ]
+menuitem "" -1
+menuitemslider "Red light: " 1 255 "$clight1" 5 []   [ clight1 = $arg1 ]
+menuitemslider "Green light: " 1 255 "$clight2" 5 [] [ clight2 = $arg1 ]
+menuitemslider "Blue light: " 1 255 "$clight3" 5 []  [ clight3 = $arg1 ]
+menuitem "" -1
+menuitem "\f2\t\t    [ OK ]" [ newent light $clight $clight1 $clight2 $clight3 ]
 
 //Entities menu
 newmenu Entities
 
-menuitem (_ [RVSF Spawn point])	[ newent playerstart 1 ]
-menuitem (_ [CLA Spawn point])	[ newent playerstart 0 ]
-menuitem (_ [FFA Spawn point])	[ newent playerstart 100 ]
-menuitem [] -1
-menuitem (_ [RVSF CTF Flag])	  [ newent ctf-flag 1 ]
-menuitem (_ [CLA CTF Flag])		  [ newent ctf-flag 0 ]
-menuitem [] -1
-menuitem (_ [Ladder entity]) "saycommand /newent ladder " [ echo "Ensure that you have placed the ladder mapmodel first (found in the mapmodels menu)..." ]
-menuitem (_ [Clip entity])   [ showmenu Clips ] [ echo Clips can be used to block off areas that players shouldn't be able to access... ]
+menuitem "RVSF Spawn point" [ newent playerstart 1 ]
+menuitem "CLA Spawn point"  [ newent playerstart 0 ]
+menuitem "FFA Spawn point"  [ newent playerstart 100 ]
+menuitem "" -1
+menuitem "RVSF CTF Flag"    [ newent ctf-flag 1 ]
+menuitem "CLA CTF Flag"     [ newent ctf-flag 0 ]
+menuitem "" -1
+menuitem "Ladder entity"    "saycommand /newent ladder " [ echo "Ensure that you have placed the ladder mapmodel first (found in the mapmodels menu)..." ]
+menuitem "Clip entity"      [ showmenu Clips ] [ echo Clips can be used to block off areas that players shouldn't be able to access... ]
 
-_clip00 = clip; _clip00status = 0; _clip01 = 0; _clip02 = 1; _clip03 = 1; _clip04 = 1 // Give aliases an initial value.
+tempalias _clip00 clip; tempalias _clip00status 0; tempalias _clip01 0; tempalias _clip02 1; tempalias _clip03 1; tempalias _clip04 1 // Give aliases an initial value.
 
 newmenu Clips
 
-menuitemslider (_ [Clip type: ]) 0 1 "$_clip00status" 1 [ Clip "Player Clip" ] [ _clip00 = (at [clip plclip] $arg1); _clip00status = $arg1 ]
-menuitemslider (_ [Elevation from ground: ]) 0 50 "$_clip01" 1 [] [ _clip01 = $arg1 ]
-menuitemslider (_ "Length of clip	(X): ") 0 50 "$_clip02" 1 []   [ _clip02 = $arg1 ]
-menuitemslider (_ "Width of clip	(Y): ") 0 50 "$_clip03" 1 []     [ _clip03 = $arg1 ]
-menuitemslider (_ "Height of clip	(Z): ") 0 50 "$_clip04" 1 []   [ _clip04 = $arg1 ]
-menuitem [] -1
-menuitem (concatword (c 2) [		     ] "[ OK ]") [ newent $_clip00 $_clip01 $_clip02 $_clip03 $_clip04 ]
+menuitemslider "Clip type: " 0 1 "$_clip00status" 1 [ Clip "Player Clip" ] [ _clip00 = (at [clip plclip] $arg1); _clip00status = $arg1 ]
+menuitemslider "Elevation from ground: " 0 50 "$_clip01" 1 [] [ _clip01 = $arg1 ]
+menuitemslider "Length of clip\t(X): " 0 50 "$_clip02" 1 []   [ _clip02 = $arg1 ]
+menuitemslider "Width of clip\t(Y): " 0 50 "$_clip03" 1 []     [ _clip03 = $arg1 ]
+menuitemslider "Height of clip\t(Z): " 0 50 "$_clip04" 1 []   [ _clip04 = $arg1 ]
+menuitem "" -1
+menuitem "\f2\t\t     [ OK ]" [ newent $_clip00 $_clip01 $_clip02 $_clip03 $_clip04 ]
 
 //Pickups menu
 newmenu Pickups
 
-menuitem (_ Health)            [ newent health ]
-menuitem (_ [Pistol Magazine]) [ newent pistol ]
-menuitem (_ [Box of Ammo])     [ newent ammobox ]
-menuitem (_ [Kevlar Vest])     [ newent armour ]
-menuitem (_ Helmet)            [ newent helmet ]
-menuitem (_ Akimbo)            [ newent akimbo ]
-menuitem (_ Grenades)          [ newent grenades ]
+menuitem "Health"            [ newent health ]
+menuitem "Pistol Magazine"   [ newent pistol ]
+menuitem "Box of Ammo"       [ newent ammobox ]
+menuitem "Kevlar Vest"       [ newent armour ]
+menuitem "Helmet"            [ newent helmet ]
+menuitem "Akimbo"            [ newent akimbo ]
+menuitem "Grenades"          [ newent grenades ]
 
 //Arch and slope menu
 newmenu Arches
 
-menuitem (_ [Arch with no sideways curves]) [ heightfield 2; arch 0 ]
-menuitem (_ [Arch with sideways curves (delta 1)]) [ heightfield 2; arch 1 ]
-menuitem (_ [Arch with sideways curves (delta 2)]) [ heightfield 2; arch 2 ]
-menuitem (_ [Arch with sideways curves (delta 3)]) [ heightfield 2; arch 3 ]
-menuitem (_ [Arch with sideways curves (delta 4)]) [ heightfield 2; arch 4 ]
-menuitem [] -1
-menuitem (_ [Slope increase 2 left-right]) [ heightfield 0; slope 2 0 ]
-menuitem (_ [Slope decrease 2 left-right]) [ heightfield 0; slope -2 0 ]
-menuitem (_ [Slope increase 2 top-bottom]) [ heightfield 0; slope 0 2 ]
-menuitem (_ [Slope decrease 2 top-bottom]) [ heightfield 0; slope 0 -2 ]
-menuitem (_ [Slope increase 1 left-right]) [ heightfield 0; slope 1 0 ]
-menuitem (_ [Slope decrease 1 left-right]) [ heightfield 0; slope -1 0 ]
-menuitem (_ [Slope increase 1 top-bottom]) [ heightfield 0; slope 0 1 ]
-menuitem (_ [Slope decrease 1 top-bottom]) [ heightfield 0; slope 0 -1 ]
-menuitem [] -1
-menuitem (_ [Fix heightfielding]) [ solid 0; slope 0 0 ]
+menuitem "Arch with no sideways curves"        [ heightfield 2; arch 0 ]
+menuitem "Arch with sideways curves (delta 1)" [ heightfield 2; arch 1 ]
+menuitem "Arch with sideways curves (delta 2)" [ heightfield 2; arch 2 ]
+menuitem "Arch with sideways curves (delta 3)" [ heightfield 2; arch 3 ]
+menuitem "Arch with sideways curves (delta 4)" [ heightfield 2; arch 4 ]
+menuitem "" -1
+menuitem "Slope increase 2 left-right" [ heightfield 0; slope 2 0 ]
+menuitem "Slope decrease 2 left-right" [ heightfield 0; slope -2 0 ]
+menuitem "Slope increase 2 top-bottom" [ heightfield 0; slope 0 2 ]
+menuitem "Slope decrease 2 top-bottom" [ heightfield 0; slope 0 -2 ]
+menuitem "Slope increase 1 left-right" [ heightfield 0; slope 1 0 ]
+menuitem "Slope decrease 1 left-right" [ heightfield 0; slope -1 0 ]
+menuitem "Slope increase 1 top-bottom" [ heightfield 0; slope 0 1 ]
+menuitem "Slope decrease 1 top-bottom" [ heightfield 0; slope 0 -1 ]
+menuitem "" -1
+menuitem "Fix heightfielding" [ solid 0; slope 0 0 ]
 
 newmenu skymaps
 menuinit [
@@ -149,34 +149,33 @@ _closestenttypestatus = 0
 //Map operations
 newmenu [Map operations]
 
-menuitem (_ [Newmap (128x128 cubes - recommended)]) [ newmap 7 ]
-menuitem (_ [Newmap (256x256 cubes)])               [ newmap 8 ]
-menuitem (_ [Increase mapsize (2x)])                [ mapenlarge; echo The map size has been increased by 2. However, the new space is solid. To utilize it, you will need to turn it into non-solid space, by selecting it and pressing G. ]
-//menuitem (_ [Edit map message])                     [ showmenu [Edit map message] ]
-menuitem (_ [Edit map message])                     editmapmsg
-menuitem (_ [Change waterlevel])                    [ saycommand [/waterlevel ] ]
-menuitem (_ [Change watercolour])                   [ showmenu [Water colour] ]
-menuitem (_ [Generate a random watercolour])        genwc
-menuitem (_ [Generate a random fogcolour])          [ fogcolour (genhex) ]
-menuitem (_ [Print entity stats])                   entstats
-menuitem (_ [Select the next closest entity])       nextclosestent
-menuitem (_ [Copy the current closest entity])      copyent
-menuitem (_ [Paste a previously copied entity])     pasteent
-menuitemslider (_ [Select only these entities: ]) 0 15 "$_closestenttypestatus" 1 [All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet PlayerClip] [ _closestentslider $arg1 ]
+menuitem "Newmap (128x128 cubes - recommended)" [ newmap 7 ]
+menuitem "Newmap (256x256 cubes)"               [ newmap 8 ]
+menuitem "Increase mapsize (2x)"                [ mapenlarge; echo The map size has been increased by 2. However, the new space is solid. To utilize it, you will need to turn it into non-solid space, by selecting it and pressing G. ]
+menuitem "Edit map message"                     editmapmsg
+menuitem "Change waterlevel"                    [ saycommand [/waterlevel ] ]
+menuitem "Change watercolour"                   [ showmenu [Water colour] ]
+menuitem "Generate a random watercolour"        genwc
+menuitem "Generate a random fogcolour"          [ fogcolour (genhex) ]
+menuitem "Print entity stats"                   entstats
+menuitem "Select the next closest entity"       nextclosestent
+menuitem "Copy the current closest entity"      copyent
+menuitem "Paste a previously copied entity"     pasteent
+menuitemslider "Select only these entities: " 0 15 "$_closestenttypestatus" 1 [All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet PlayerClip] [ _closestentslider $arg1 ]
 
 // Map config operations
 newmenu [Map config operations]
 
-menuitem [Edit mapmodel slot...]          [ showmenu [Edit mapmodel slots] ]
-menuitem [Delete unused mapmodel slot...] [ showmenu [Delete unused mapmodel slot] ]
+menuitem "Edit mapmodel slot..."            [ showmenu [Edit mapmodel slots] ]
+menuitem "Delete unused mapmodel slot..."   [ showmenu [Delete unused mapmodel slot] ]
 menuitem "" -1
-menuitem [Edit texture slot...]           [ showmenu [Edit texture slots] ]
+menuitem "Edit texture slot..."             [ showmenu [Edit texture slots] ]
 menuitem "" -1
-menuitem [Edit mapsound slot...]          [ showmenu [Edit mapsound slots] ]
+menuitem "Edit mapsound slot..."            [ showmenu [Edit mapsound slots] ]
 menuitem "" -1
-menuitem [Delete ALL unused mapmodel slots] [loop ii 256 [ push i (- 255 $ii) ; if (&& (strlen (mapmodelslotname $i)) (strcmp "" (mapmodelslotusage $i))) [deletemapmodelslot $i] ; pop i]]
-menuitem [Delete ALL unused texture slots]  [loop ii 251 [ push i (- 255 $ii) ; if (&& (strlen (edittextureslot $i)) (strcmp "" (textureslotusage $i))) [deletetextureslot $i] ; pop i]]
-menuitem [Delete ALL unused mapsound slots] [loop ii 256 [ push i (- 255 $ii) ; if (&& (strlen (editmapsoundslot $i)) (strcmp "" (mapsoundslotusage $i))) [deletemapsoundslot $i] ; pop i]]
+menuitem "Delete ALL unused mapmodel slots" [loop ii 256 [ push i (- 255 $ii) ; if (&& (strlen (mapmodelslotname $i)) (strcmp "" (mapmodelslotusage $i))) [deletemapmodelslot $i] ; pop i]]
+menuitem "Delete ALL unused texture slots"  [loop ii 251 [ push i (- 255 $ii) ; if (&& (strlen (edittextureslot $i)) (strcmp "" (textureslotusage $i))) [deletetextureslot $i] ; pop i]]
+menuitem "Delete ALL unused mapsound slots" [loop ii 256 [ push i (- 255 $ii) ; if (&& (strlen (editmapsoundslot $i)) (strcmp "" (mapsoundslotusage $i))) [deletemapsoundslot $i] ; pop i]]
 menuitem "" -1
 menuitem "Update mapmodel menus" "mapmodelchanged 1"
 
@@ -487,32 +486,26 @@ menuinit [
 // "closestenttype" slider...
 _closestentslider = [ closestenttype (at ["" light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip helmet plclip] $arg1); _closestenttypestatus = $arg1 ]
 
-// FIXME: menu can be removed, if editmapmsg is used
-newmenu [Edit map message]
-menuinit [ menumapmsgtext = [] ]
-menuitemtextinput (_ [Edit your map message: ])	"result $mapmsg" [ menumapmsgtext = $arg1 ] [] 256
-menuitem (concatword (c 2) [		      ] "[ OK ]") [ mapmsg $menumapmsgtext ]
-
 redw = 1; greenw = 1; bluew = 1
 
 newmenu [Water colour]
 
-menuitemslider (_ [Red pigment: ]) 1 255 "$redw" 5 []     [ redw = $arg1 ]
-menuitemslider (_ [Green pigment: ]) 1 255 "$greenw" 5 [] [ greenw = $arg1 ]
-menuitemslider (_ [Blue pigment: ]) 1 255 "$bluew" 5 []   [ bluew = $arg1 ]
-menuitem [] -1
-menuitem (concatword (c 2) [		     ] "[ OK ]") [ watercolour $redw $greenw $bluew ]
+menuitemslider "Red pigment: "   1 255 "$redw" 5 []   [ redw = $arg1 ]
+menuitemslider "Green pigment: " 1 255 "$greenw" 5 [] [ greenw = $arg1 ]
+menuitemslider "Blue pigment: "  1 255 "$bluew" 5 []  [ bluew = $arg1 ]
+menuitem "" -1
+menuitem "\f2\t\t     [ OK ]" [ watercolour $redw $greenw $bluew ]
 
 showedBAKinfo = 0
 
 newmenu [Editing settings]
-menuitemslider (_ [Grid/Selection style: ]) 0 1 "$oldselstyle" 1 [triangles "squares (default)"] [ oldselstyle $arg1 ]
-menuitemcheckbox (_ [Show mapmodel clippings: ]) "$showmodelclipping" [ showmodelclipping $arg1 ]
-menuitemcheckbox (_ [Show all playerstarts: ]) "$showplayerstarts" [ showplayerstarts $arg1 ]
-menuitemslider (_ [Fly speeds multiplier: ]) 1 5 "$flyspeed" 1 [] [ flyspeed $arg1 ]
-menuitemcheckbox (_ [Enable auto save map: ]) "$autosavemap" [ autosavemap = $arg1 ]
-menuitemslider (_ [Time between auto saves (in minutes): ]) 2 60 "(div $timeBetAutoSaves 60000)" 1 [] [ timeBetAutoSaves = (* $arg1 60000) ]
-menuitemtextinput (_ [Make a map backup (.BAK) every: ]) "$numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [ if (! $showedBAKinfo) [ echo This setting effects the number of autosavemaps between making a map backup file. "(.BAK)"; showedBAKinfo = 1 ] ] 4
+menuitemslider    "Grid/Selection style: " 0 1 "$oldselstyle" 1 [triangles "squares (default)"] [ oldselstyle $arg1 ]
+menuitemcheckbox  "Show mapmodel clippings: " "$showmodelclipping" [ showmodelclipping $arg1 ]
+menuitemcheckbox  "Show all playerstarts: " "$showplayerstarts" [ showplayerstarts $arg1 ]
+menuitemslider    "Fly speeds multiplier: " 1 5 "$flyspeed" 1 [] [ flyspeed $arg1 ]
+menuitemcheckbox  "Enable auto save map: " "$autosavemap" [ autosavemap = $arg1 ]
+menuitemslider    "Time between auto saves (in minutes): " 2 60 "(div $timeBetAutoSaves 60000)" 1 [] [ timeBetAutoSaves = (* $arg1 60000) ]
+menuitemtextinput "Make a map backup (.BAK) every: " "$numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [ if (! $showedBAKinfo) [ echo This setting effects the number of autosavemaps between making a map backup file. "(.BAK)"; showedBAKinfo = 1 ] ] 4
 
 // deleted entities
 newmenu "deleted entities"
diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index 69a10347..fcee6b8a 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -30,10 +30,10 @@ menuitem [Adjust teams...]    [ showmenu [Team adjustment] ]
 menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ]
 menuitem [Get additional server information] [ showmenu serverinfo ]
 menuitem [] -1
-menuitem "4Main menu..."           [ closecurmenu; showmenu main ]
-menuitem "4Browse servers..."      [ closecurmenu; joinservermenu ]
-menuitem "3Disconnect from server" disconnect
-menuitem "3Quit AssaultCube"       savequit
+menuitem "\f4Main menu..."           [ closecurmenu; showmenu main ]
+menuitem "\f4Browse servers..."      [ closecurmenu; joinservermenu ]
+menuitem "\f3Disconnect from server" disconnect
+menuitem "\f3Quit AssaultCube"       savequit
 menuinitselection 13
 
 const __ingamemenu_showmodel [
@@ -62,10 +62,10 @@ menuitemvar [result (concat [Change to] (if (> (player1 team) 1) [ result active
 menuitem [Change player skin...]                 [ showmenu (at [CLA RVSF] (player1 team)) ] [ __ingamemenu_showmodel [In-game admin] 1 ]
 menuitem [Download a demo...]                    [ listdemos; showmenu [Download demo] ]
 menuitem [] -1
-menuitem "4Main menu..."           [ closecurmenu; showmenu main ]
-menuitem "4Browse servers..."      [ closecurmenu; joinservermenu ]
-menuitem "3Disconnect from server" disconnect
-menuitem "3Quit AssaultCube"       savequit
+menuitem "\f4Main menu..."           [ closecurmenu; showmenu main ]
+menuitem "\f4Browse servers..."      [ closecurmenu; joinservermenu ]
+menuitem "\f3Disconnect from server" disconnect
+menuitem "\f3Quit AssaultCube"       savequit
 menuinitselection 16
 
 // Multiplayer menu only opens through the main menu (when disconnected).
@@ -82,21 +82,21 @@ menuitem [Force serverlist update] [ updatefrommaster 1; joinservermenu ]
 newmenu [Custom connect]
 
 menuinit [ tempalias cc1 []; tempalias cc2 []; tempalias cc3 [] ]	// Resets the aliases
-menuitemtextinput [Server IP/DNS: 		] []           [ cc1 = $arg1 ] [] 255
-menuitemtextinput [Server port (optional): 	] []     [ cc2 = $arg1 ] [] 6
-menuitemtextinput [Server password (optional): 	] [] [ cc3 = $arg1 ] [] 128 1
-menuitem [] -1
-menuitem "2		     [ Connect ]			" [ connect $cc1 $cc2 $cc3 ]
+menuitemtextinput "Server IP/DNS: \t\t" []           [ cc1 = $arg1 ] [] 255
+menuitemtextinput "Server port (optional): \t" []     [ cc2 = $arg1 ] [] 6
+menuitemtextinput "Server password (optional): \t" [] [ cc3 = $arg1 ] [] 128 1
+menuitem "" -1
+menuitem "\f2\t\t     [ Connect ]\t\t\t" [ connect $cc1 $cc2 $cc3 ]
 
 // Connect to a menu as admin.
 newmenu [Admin connect]
 
 menuinit [ tempalias acc1 []; tempalias acc2 []; tempalias acc3 []; echo (red)To use this menu to connect as administrator, you will need to know the admin password for the server. ] // Resets the aliases
-menuitemtextinput [Server IP/DNS: 		] []       [ acc1 = $arg1 ] [] 255
-menuitemtextinput [Server port (optional):	] [] [ acc2 = $arg1 ] [] 6
-menuitemtextinput [Server admin password: 	] [] [ acc3 = $arg1 ] [] 128 1
-menuitem [] -1
-menuitem "2		  [ Admin connect ]		" [ connectadmin $acc1 $acc2 $acc3 ]
+menuitemtextinput "Server IP/DNS: \t\t" []       [ acc1 = $arg1 ] [] 255
+menuitemtextinput "Server port (optional):\t" [] [ acc2 = $arg1 ] [] 6
+menuitemtextinput "Server admin password: \t" [] [ acc3 = $arg1 ] [] 128 1
+menuitem "" -1
+menuitem "\f2\t\t  [ Admin connect ]\t\t" [ connectadmin $acc1 $acc2 $acc3 ]
 
 _kickbanaction = kick
 newmenu reason
@@ -104,8 +104,6 @@ menuinit [ _kickbanreason = None; if (! (strcmp $_kickbanaction kick)) [ if (! (
 menuitem [intentional TK]    [ _kickbanreason = [intentional TK]; showmenu (concat $_kickbanaction player) ]
 menuitem [abusive behaviour] [ _kickbanreason = [abusive behaviour]; showmenu (concat $_kickbanaction player) ]
 menuitem [bad language]      [ _kickbanreason = [bad language]; showmenu (concat $_kickbanaction player) ]
-// TODO: more reasons
-//menuitem "" [ _kickbanreason = ""; showmenu (concat $_kickbanaction player) ]
 menuitemtextinput [Reason: ] [] [ _kickbanreason = $arg1 ] [] 255
 menuitem $_kickbanaction [ showmenu (concat $_kickbanaction player) ]
 menuinitselection 2
@@ -122,7 +120,7 @@ newmenu [Team adjustment]
 menuitem [Initiate shuffleteams] shuffleteams
 menuitem [Force a team change]   [ showmenu [force team] ]
 menuitem [Force yourself to enemy team] forceme
-menuitem [Initiate autoteam]		 [ showmenu Auto-team ]
+menuitem [Initiate autoteam] [ showmenu Auto-team ]
 
 newmenu Gamemode
 
@@ -149,8 +147,8 @@ menuitem [Lock the server (match mode)] [ mastermode 2 ]
 
 newmenu Auto-team
 
-menuitem [Turn auto-team on]	[ autoteam 1 ]
-menuitem [Turn auto-team off]	[ autoteam 0 ]
+menuitem [Turn auto-team on]  [ autoteam 1 ]
+menuitem [Turn auto-team off] [ autoteam 0 ]
 
 newmenu [serverbrowser help]
 
@@ -168,23 +166,23 @@ menuitemcheckbox [F7: Only show good servers:] "$showonlygoodservers"    [ showo
 menuitemcheckbox [F8: Show minutes remaining:] "$showminremain"          [ showminremain $arg1 ]
 menuitemcheckbox [Sort official maps ontop:] "$serversortpreferofficial" [ serversortpreferofficial $arg1 ]
 menuitemcheckbox [Use gamemode acronyms:] "$modeacronyms"                [ modeacronyms $arg1 ]
-menuitemslider [Favourites tag column:	] 0 2 "$serverbrowserhidefavtag" 1 ["Show always" "Show when used" "Hide always"] [ serverbrowserhidefavtag $arg1 ]
-menuitemslider [Server IP & port:		] 0 2 "$serverbrowserhideip" 1 [Show "Show in grey" Hide] [ serverbrowserhideip $arg1 ]
-menuitemslider [Sort servers by:		] 0 7 "$serversort" 1 [Ping "Number of players" "Max players" "Minutes remaining" "Map name" Gamemode "IP address" "Server description"] [ serversort $arg1 ]
+menuitemslider "Favourites tag column:\t" 0 2 "$serverbrowserhidefavtag" 1 ["Show always" "Show when used" "Hide always"] [ serverbrowserhidefavtag $arg1 ]
+menuitemslider "Server IP & port:\t\t" 0 2 "$serverbrowserhideip" 1 [Show "Show in grey" Hide] [ serverbrowserhideip $arg1 ]
+menuitemslider "Sort servers by:\t\t" 0 7 "$serversort" 1 [Ping "Number of players" "Max players" "Minutes remaining" "Map name" Gamemode "IP address" "Server description"] [ serversort $arg1 ]
 menuinitselection 1
 
 // connecting from the serverbrowser to a password-protected server
 // called by sbconnect
 newmenu [password required]
 
-menuinit [ sbpwd = [] ]	// Resets the aliases
+menuinit [ sbpwd = [] ] // Resets the aliases
 menuitemvar [result $sbmsg]
 menuitem [You need a password to join it.] -1
 menuitem [] -1
 menuitemtextinput [Password: 	] [] [ sbpwd = $arg1 ] [] 128 1
 menuitem [] -1
-menuitem "2		  [ Connect ]		" [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ]
-menuitem "2		  [ Connect without password ]		" [ echo connecting to $sbdesc ; connect $sbdns $sbport ]
+menuitem "\f2\t\t  [ Connect ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ]
+menuitem "\f2\t\t  [ Connect without password ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport ]
 menuinitselection 3
 
 const addfavcatmenu [
@@ -228,12 +226,12 @@ lastsearchname = []
 newmenu [search player]
 
 menuitemtextinput [Search servers for a player: ] "result $lastsearchname" [ lastsearchname = $arg1 ]
-menuitem "2		       [ Search ]" [ closecurmenu; searchnickname $lastsearchname]
+menuitem "\f2\t\t       [ Search ]" [ closecurmenu; searchnickname $lastsearchname]
 menuinitselection 1
 
 newmenu [search server]
 menuitemtextinput [ Search for server: ] "result $sbfavourite_SEARCH_keys" [ sbfavourite_SEARCH_keys = $arg1 ]
-menuitem "2		[ Search ]" [ showonlyfavourites (addfavcategory SEARCH); showmenu server ] [ showonlyfavourites 0 ]
+menuitem "\f2\t\t[ Search ]" [ showonlyfavourites (addfavcategory SEARCH); showmenu server ] [ showonlyfavourites 0 ]
 menuinitselection 1
 
 newmenu [serverbrowser alternative views]
@@ -248,8 +246,8 @@ menuitem [      This server is using a different version of this map...] -1
 menuitem [] -1
 menuitemvar "result $__getmaprevisions"
 menuitem [] -1
-menuitem "2    [ Download the servers map version and join the game ]"     [ getmap ]
-menuitem "3 [ Keep the local map version and disconnect from the server ]" [ showmenu ""; disconnect ]
+menuitem "\f2    [ Download the servers map version and join the game ]"     [ getmap ]
+menuitem "\f3 [ Keep the local map version and disconnect from the server ]" [ showmenu ""; disconnect ]
 menuinitselection 4
 
 persistidents 1
diff --git a/config/opt/survival.cfg b/config/opt/survival.cfg
index 162af3cb..02c74db0 100644
--- a/config/opt/survival.cfg
+++ b/config/opt/survival.cfg
@@ -36,20 +36,20 @@ const survDifList ["6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 4
 const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo (c 3)Error: (c 5)invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
 
 newmenu [Survival Mode]
-menuitemslider (_ [Map: ]) 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk] [ survMap = $arg1 ]
-menuitemslider (_ [Difficulty: ]) 0 3 "$survDifficulty" 1 [easy intermediate hard impossible] [ survSetDif $arg1 ]
+menuitemslider "Map: " 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk] [ survMap = $arg1 ]
+menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [easy intermediate hard impossible] [ survSetDif $arg1 ]
 menuitem [] -1
-menuitem (concatword [                       ] (_ Customize)) [ showmenu [Survival Mode - Customize] ]
-menuitem (concatword [                         ] (_ Start!))  [ survival (at $defaultmaps $survMap) ]
+menuitem "\t\t\tCustomize" [ showmenu [Survival Mode - Customize] ]
+menuitem "\t\t\tStart!"    [ survival (at $defaultmaps $survMap) ]
 
 newmenu [Survival Mode - Customize]
-menuitemcheckbox (_ [Enable survival damage effects (uses gamespeed/gamma)]) "$survDamageEffects" [ survDamageEffects = $arg1 ]
-menuitemslider (_ [# of bots to spawn on start: ]) 6 20 "$survNumBots" 1 []         [ survNumBots = $arg1; nonSurvDefaults = 1 ]
-menuitemslider (_ [# of bots to spawn at checkpoints: ]) 1 5 "$survBotsToAdd" 1 []  [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ]
-menuitemslider (_ [# of milliseconds between checkpoints: ]) 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ]
-menuitemslider (_ [# of milliseconds before teleporting: ]) 10000 180000 "$timeUntilTele" 10000 []  [ timeUntilTele = $arg1; nonSurvDefaults = 1 ]
-menuitemslider (_ [Maximum # of bots in survival mode: ]) 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
-menuitemslider (_ [Spam survival mode messages: ]) 0 1 "$spamSurvMsgs" 1 [ no yes ] [ spamSurvMsgs = $arg1 ]
+menuitemcheckbox "Enable survival damage effects (uses gamespeed/gamma)" "$survDamageEffects" [ survDamageEffects = $arg1 ]
+menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 []         [ survNumBots = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 []  [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 []  [ timeUntilTele = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
+menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ no yes ] [ spamSurvMsgs = $arg1 ]
 menuitem [] -1
 menuitem [                                   Back] [ closecurmenu ]