No more brackets for toggles (fises #1804)

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1909 from live627/dev

No more brackets for toggles (fises #1804)