theme: Another minor fixes and cleanups after the refactor

This merge request is another bunch of minor theme fixes, cleanups, and refactors after the big Sass rewrite. Please see each commit for details.

Fixes: #2129 (closed)
Probably can close: #2120 (closed)