Revert "Revert all theme changes"

This reverts commit b2b0858c4b7358765bae7c0e10e300b21131de84.