Moved various custom cvar options around.