[PATCH] Change timeout to runtime and rearrange option entries