Revert some theme changes#1503

deadlyjack wants to merge 2 commits intomainAcode-Foundation/Acode:mainfrom

revert-some-theme-changesAcode-Foundation/Acode:revert-some-theme-changesCopy head branch name to clipboard