Revert "Improve theme"

This reverts commit 1fe44955184c3ed8f6502fd34139a7ead5fcbcc4.