Update custom checkbox style, plus a few other fixes

See commit messages for what is included.
What syntax is this with the dashes?