Made theme based changes