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

This reverts commit b25db0d4aae1b9f9c8bf998fa012ee34e0bd9079.