Change theme background color and bug fix