diff --git a/config/defaults.cfg b/config/defaults.cfg
index 15bdad0e..cb018121 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -9,9 +9,6 @@ skin_cla (rnd 4)                    // Change your look.
 skin_rvsf (rnd 6)
 setfont default                     // Choose your font
 
-ofc_gamma_list = []
-loop ogl (listlen $defaultmaps) [ add2list ofc_gamma_list $gamma ]
-
 gfxqualityalias = 3   // Default GFX is medium.
 soundqualityalias = 3 // Default sound is best.
 menuBotGameLength = 15
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index e18bc61a..dd922143 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -311,6 +311,8 @@ menuinit [ resetbindsyes = 0 ] // Ensures this menu works correctly.
 menuitemcheckbox [Yes, reset all binds: ] [ resetbindsyes = 1 ] [ resetbindsyes = $arg1 ]
 menuitem "\f2         [ Apply! ]        " [ if $resetbindsyes resetbinds [ showmenu [] ] ]
 
+alias defaultgamma 100
+
 newmenu video
 
 menuitemtextinput [Screen width:                 ] "$scr_w" [ scr_w $arg1 ] [] 11
@@ -320,10 +322,13 @@ menuitem [] -1
 menuitemslider [Graphics detail: ] 1 6 "$gfxqualityalias" 1 [Horrible Low Medium Good High "INSANE! (May perform slowly on older gfx)"] [ new_gfx_quality $arg1 ]
 menuitem [] -1
 menuitemslider [Field of view: ] 75 120 "$fov" 2 []                 [ fov $arg1 ]
-menuitemslider [Gamma: ] 30 300 "$gamma" 5 []                       [ gamma $arg1 ]
 menuitemcheckbox [Fullscreen: ] "$fullscreen"                       [ fullscreen $arg1 ]
 menuitemslider [Vsync: ] -1 1 "$vsync" 1 [Default Disabled Enabled] [ vsync $arg1 ]
 menuitem [] -1
+menuitemslider [Set temporary gamma for this map: ] 30 300 "$gamma" 5 [] [ gamma $arg1 ]
+menuitemtextinput [Set default gamma for this map: ] [$gamma]            [setgamma $arg1]
+menuitemtextinput [Set default gamma for maps without own default: ]     [$defaultgamma] [ defaultgamma = $arg1 ]
+menuitem [] -1
 menuitem [Advanced video settings...] [ showmenu [Advanced video settings] ]
 menuitem [] -1
 menuitem "\f2\t\t\t  [ Apply now! ]"   [ resetgl ]
@@ -443,7 +448,6 @@ alias askquit 1
 alias showmenuonstartup 1
 alias menufilesort_cgz 0
 alias menufilesort_dmo 0
-alias defaultgamma 100
 
 newmenu Misc
 menuitemcheckbox [Auto map download: ] "$autogetmap"                 [ autogetmap $arg1 ]
@@ -460,8 +464,6 @@ menuitemslider [Console size: ] 0 20 "$consize" 1 [] [ consize $arg1 ]
 menuitemslider [Font type: ] 0 2 "$__fontsetting" 1 [Default Serif Monospace] [ if (= $arg1 1) [ setfont serif ] [ if (= $arg1 2) [ setfont mono ] [ setfont default ] ] ]
 menuitemslider [Mini-map background style: ] 0 2 "$showmapbackdrop" 1 ["Fully Transparent" Black White/Transparent] [ showmapbackdrop $arg1 ]
 menuitemcheckbox [Enable compatibility with older cubescripts: ] "$compatibilitymode" [ compatibilitymode $arg1; echo (c 3) This setting requires a restart to take effect. ]
-menuitemtextinput [Set default gamma for this map: ] [$gamma] [setgamma $arg1]
-menuitemtextinput [Set default gamma for maps without own default: ] [$defaultgamma] [ defaultgamma = $arg1 ]
 menuitemslider [Menu map file sort order: ] 0 (- (listlen (listoptions menufilesortorders)) 1) "$menufilesort_cgz" 1 (listoptions menufilesortorders) [menufilesort_cgz = $arg1]
 menuitemslider [Menu demo file sort order: ] 0 (- (listlen (listoptions menufilesortorders)) 1) "$menufilesort_dmo" 1 (listoptions menufilesortorders) [menufilesort_dmo = $arg1]
 
diff --git a/config/opt/survival.cfg b/config/opt/survival.cfg
index 02c74db0..b2681377 100644
--- a/config/opt/survival.cfg
+++ b/config/opt/survival.cfg
@@ -277,7 +277,7 @@ const endSurvival [
   if (! $survIsFinished) [
     tempalias tmp_survstr $arg1; tempalias tmp_nargs $numargs; tempalias survIsFinished 1; tempalias startedSurvival 0; tempalias survNumBots (at $tmpSurvSets 0)
     checkinit mapstartonce [
-      if (! $dyngamma) [ gamma (at $survOrigSets 0) ]; gamespeed 100
+      gamespeed 100
       if (< $tmp_nargs 2) [
         echo (green)Bot Survival results for map: (white) (at $tmpSurvSets 1)
         if (!= (at $tmpSurvSets 2) (at $tmpSurvSets 3)) [