fixes #10744: back to solid borders on carets
fixes #11449: use menlo over monaco
Fix some weird indents
Merge pull request #11509 from ZDroid/fix-indents

Fix some weird indents