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

This reverts commit 66f4204f63a72754667cd7e35885ecfc28955f93.