Sync with upstream and some theme fixes#45

syntaxerror247 merged 1 commit intomainsyntaxerror247/VectorTouch:mainfrom

update-from-upstreamsyntaxerror247/VectorTouch:update-from-upstreamCopy head branch name to clipboard