Added toggles and hyphenation