Added compatibility for both night and day themes