Revert "Framework: CustomToggle Improvements (!Advanced)"

This reverts commit 7ee59ff7dc46544835ae56b33323e4c485a75c2c.