theme: backporting changes from manual repo