hl-mode, hl-s-mode, and theme update