Bring rest of toggle options

Change-Id: Id3f1e06fbc6893c6a2dfde09aa51a32018571111
Signed-off-by: kecinzer <kecinzer@gmail.com>