Fix + update theme