Revert "Revert "Revert "Modify theme colors to fit new scheme"""

This reverts commit c58b5443e4ed558158af82852c183d640af9b8ff.