Add themes & Change icon